update gemfiles

next-l · Jun 25, 2016 · 3288d5e · 3288d5e
1 parent 982f6b6
commit 3288d5e
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 24 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,10 +1,9 @@
 language: ruby
 cache: bundler
 rvm:
-  - 1.9.3
   - 2.0.0
-  - 2.1.8
-  - 2.2.4
+  - 2.1.9
+  - 2.2.5
 before_script:
   - mysql -e 'create database enju_test'
   - psql -c 'create database enju_test;' -U postgres
@@ -25,24 +24,18 @@ matrix:
   exclude:
   - gemfile: gemfiles/rails_4.2_ndl.gemfile
   - gemfile: gemfiles/rails_4.2_nii.gemfile
-  - rvm: 1.9.3
-    gemfile: gemfiles/rails_4.1.gemfile
-  - rvm: 1.9.3
-    gemfile: gemfiles/rails_4.2.gemfile
-  - rvm: 2.0.0
-    gemfile: gemfiles/rails_3.2.gemfile
   - rvm: 2.0.0
     gemfile: gemfiles/rails_4.2.gemfile
-  - rvm: 2.1.8
+  - rvm: 2.1.9
     gemfile: gemfiles/rails_3.2.gemfile
-  - rvm: 2.2.4
+  - rvm: 2.2.5
     gemfile: gemfiles/rails_3.2.gemfile
   include:
   - gemfile: gemfiles/rails_4.2_ndl.gemfile
-    rvm: 2.2.4
+    rvm: 2.2.5
     env: DB=postgresql
   - gemfile: gemfiles/rails_4.2_nii.gemfile
-    rvm: 2.2.4
+    rvm: 2.2.5
     env: DB=postgresql
 notifications:
   slack:

diff --git a/Appraisals b/Appraisals
@@ -1,35 +1,34 @@
 appraise "rails-3.2" do
   gem "rails", "3.2.22"
   gem "jquery-rails"
-  gem "cancancan", "~> 1.12.0"
   gem "strong_parameters"
   gem "cache_digests"
   gem "foreigner"
   gem "coveralls", require: false
 end
 
 appraise "rails-4.1" do
-  gem "rails", "4.1.14"
+  gem "rails", "4.1.15"
   gem "jquery-rails"
   gem "foreigner"
   gem "coveralls", require: false
 end
 
 appraise "rails-4.2" do
-  gem "rails", "4.2.5"
+  gem "rails", "4.2.6"
   gem "jquery-rails"
   gem "coveralls", require: false
 end
 
 appraise "rails-4.2-nii" do
-  gem "rails", "4.2.5"
+  gem "rails", "4.2.6"
   gem "jquery-rails"
   gem "coveralls", require: false
   gem "enju_nii", "~> 0.1.1"
 end
 
 appraise "rails-4.2-ndl" do
-  gem "rails", "4.2.5"
+  gem "rails", "4.2.6"
   gem "jquery-rails"
   gem "coveralls", require: false
   gem "enju_ndl", "~> 0.1.1"

diff --git a/enju_loc.gemspec b/enju_loc.gemspec
@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec-rails", "~> 3.4"
   s.add_development_dependency "vcr", "~> 3.0"
   s.add_development_dependency "webmock"
-  s.add_development_dependency "enju_leaf", "~> 1.1.2"
+  s.add_development_dependency "enju_leaf", "~> 1.1.3"
   s.add_development_dependency "sunspot_solr", "2.2.0"
   s.add_development_dependency "simplecov"
   s.add_development_dependency "enju_subject", "~> 0.1.1"

diff --git a/gemfiles/rails_3.2.gemfile b/gemfiles/rails_3.2.gemfile
@@ -4,7 +4,6 @@ source "https://rubygems.org"
 
 gem "rails", "3.2.22"
 gem "jquery-rails"
-gem "cancancan", "~> 1.12.0"
 gem "strong_parameters"
 gem "cache_digests"
 gem "foreigner"

diff --git a/gemfiles/rails_4.1.gemfile b/gemfiles/rails_4.1.gemfile
@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "rails", "4.1.14"
+gem "rails", "4.1.15"
 gem "jquery-rails"
 gem "foreigner"
 gem "coveralls", :require => false

diff --git a/gemfiles/rails_4.2.gemfile b/gemfiles/rails_4.2.gemfile
@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "rails", "4.2.5"
+gem "rails", "4.2.6"
 gem "jquery-rails"
 gem "coveralls", :require => false
 

diff --git a/gemfiles/rails_4.2_ndl.gemfile b/gemfiles/rails_4.2_ndl.gemfile
@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "rails", "4.2.5"
+gem "rails", "4.2.6"
 gem "jquery-rails"
 gem "coveralls", :require => false
 gem "enju_ndl", "~> 0.1.1"

diff --git a/gemfiles/rails_4.2_nii.gemfile b/gemfiles/rails_4.2_nii.gemfile
@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "rails", "4.2.5"
+gem "rails", "4.2.6"
 gem "jquery-rails"
 gem "coveralls", :require => false
 gem "enju_nii", "~> 0.1.1"