Update MongoDB versions, target on Rails 5.0.0.rc1

mongodb · Jun 9, 2016 · b1965b1 · b1965b1
1 parent 7c2ff52
commit b1965b1
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 27 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -0,0 +1,2 @@
+AllCops:
+  TargetRubyVersion: 2.3.1
diff --git a/.ruby-gemset b/.ruby-gemset
diff --git a/.ruby-version b/.ruby-version
diff --git a/.travis.yml b/.travis.yml
@@ -6,23 +6,23 @@ bundler_args: --without development
 
 rvm:
   - 2.2.2
-  - 2.3.0
-  - jruby-9.0.5.0
+  - 2.3.1
+  - jruby-9.1.2.0
 
 gemfile:
   - Gemfile
-  - gemfiles/rails5master.gemfile
   - gemfiles/rails5rc1.gemfile
+  - gemfiles/rails5master.gemfile
 
 env:
   global:
     - CI="travis"
     - JRUBY_OPTS="--server -J-Xms512m -J-Xmx1024m"
   matrix:
     - MONGODB=2.4.14
-    - MONGODB=2.6.11
-    - MONGODB=3.0.7
-    - MONGODB=3.2.0
+    - MONGODB=2.6.12
+    - MONGODB=3.0.12
+    - MONGODB=3.2.7
 
 before_script:
   - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz -O /tmp/mongodb.tgz

diff --git a/.versions.conf b/.versions.conf
@@ -0,0 +1,2 @@
+ruby=ruby-2.3.1
+ruby-gemset=mongoid
diff --git a/Gemfile b/Gemfile
@@ -1,13 +1,10 @@
-source "https://rubygems.org"
-
+source 'https://rubygems.org'
 gemspec
 
-gem "rake"
-#gem "actionpack",  github: "rails/rails"
-gem "actionpack",  '5.0.0.rc1'
-#gem "activemodel", github: "rails/rails"
-gem "activemodel", '5.0.0.rc1'
+gem 'rake'
+gem 'actionpack', '5.0.0.rc1'
+gem 'activemodel', '5.0.0.rc1'
 
 group :test do
-  gem "rspec", "~> 3.4.0"
+  gem 'rspec', '~> 3.4.0'
 end
diff --git a/gemfiles/rails5master.gemfile b/gemfiles/rails5master.gemfile
@@ -1,10 +1,10 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 gemspec path: '..'
 
-gem "rake"
-gem "actionpack",  github: "rails/rails"
-gem "activemodel", github: "rails/rails"
+gem 'rake'
+gem 'actionpack', github: 'rails/rails'
+gem 'activemodel', github: 'rails/rails'
 
 group :test do
-  gem "rspec", "~> 3.4.0"
+  gem 'rspec', '~> 3.4.0'
 end
diff --git a/gemfiles/rails5rc1.gemfile b/gemfiles/rails5rc1.gemfile
@@ -1,10 +1,10 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 gemspec path: '..'
 
-gem "rake"
-gem "actionpack",  '5.0.0.rc1'
-gem "activemodel", '5.0.0.rc1'
+gem 'rake'
+gem 'actionpack', '5.0.0.rc1'
+gem 'activemodel', '5.0.0.rc1'
 
 group :test do
-  gem "rspec", "~> 3.4.0"
+  gem 'rspec', '~> 3.4.0'
 end
diff --git a/mongoid.gemspec b/mongoid.gemspec
@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project         = "mongoid"
 
-  s.add_dependency("activemodel", ["= 5.0.0.rc1"])
+  s.add_dependency("activemodel", [">= 5.0.0.rc1"])
   s.add_dependency("tzinfo", [">= 0.3.37"])
   s.add_dependency("mongo", ["~> 2.2"])