From 58a707ef9d659a318e3bf911a8348aac7eee7805 Mon Sep 17 00:00:00 2001 From: Ryan McGeary Date: Mon, 26 Feb 2018 13:58:37 -0700 Subject: [PATCH 1/3] Update ruby versions in build matrix ...avoiding versions that have been end-of-lifed --- .travis.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 429adb4..21aa10f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,12 +3,10 @@ script: "bundle exec rspec spec" language: ruby rvm: - - 1.9.3 - - 2.0.0 - - 2.1.0 - - 2.1.1 - - 2.1.2 - - jruby-19mode + - 2.2.9 + - 2.3.6 + - 2.4.3 + - 2.5.0 services: - mongodb From 0864e1c0dae6037c1f9c831428819c051b662d0f Mon Sep 17 00:00:00 2001 From: Ryan McGeary Date: Mon, 26 Feb 2018 14:05:21 -0700 Subject: [PATCH 2/3] Add support for Mongoid 6 Still supports Mongoid 5 --- mongoid-enum.gemspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mongoid-enum.gemspec b/mongoid-enum.gemspec index bd9465d..3afc5ad 100644 --- a/mongoid-enum.gemspec +++ b/mongoid-enum.gemspec @@ -18,11 +18,11 @@ Gem::Specification.new do |spec| spec.test_files = spec.files.grep(%r{^(test|spec|features)/}) spec.require_paths = ["lib"] - spec.add_runtime_dependency "mongoid", "~> 5.0" + spec.add_runtime_dependency "mongoid", "> 5.0", "< 7.0" spec.add_development_dependency "bundler", "~> 1.3" spec.add_development_dependency "rake" spec.add_development_dependency "rspec", "~> 3.1" spec.add_development_dependency "guard-rspec", "~> 4.6.2" - spec.add_development_dependency "mongoid-rspec", "~> 3.0" + spec.add_development_dependency "mongoid-rspec", "~> 4.0" end From b332ee280945a432134cc80f75160f4c8ab2dc37 Mon Sep 17 00:00:00 2001 From: Ryan McGeary Date: Mon, 26 Feb 2018 14:16:39 -0700 Subject: [PATCH 3/3] Improve build matrix to test both Mongoid 5 and Mongoid 6 --- .travis.yml | 3 +++ gemfiles/mongoid-5.gemfile | 4 ++++ 2 files changed, 7 insertions(+) create mode 100644 gemfiles/mongoid-5.gemfile diff --git a/.travis.yml b/.travis.yml index 21aa10f..c88d0b1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,9 @@ rvm: - 2.3.6 - 2.4.3 - 2.5.0 +gemfile: + - Gemfile + - gemfiles/mongoid-5.gemfile services: - mongodb diff --git a/gemfiles/mongoid-5.gemfile b/gemfiles/mongoid-5.gemfile new file mode 100644 index 0000000..a5bacfc --- /dev/null +++ b/gemfiles/mongoid-5.gemfile @@ -0,0 +1,4 @@ +source 'https://rubygems.org' + +gemspec path: "../" +gem "mongoid", "~> 5.2"