Skip to content

Commit

Permalink
update gemfiles
Browse files Browse the repository at this point in the history
  • Loading branch information
nabeta committed Jun 26, 2016
1 parent 03ee350 commit 2a8192d
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 23 deletions.
15 changes: 4 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -21,17 +20,11 @@ env:
- DB=postgresql
matrix:
exclude:
- 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
notifications:
slack:
Expand Down
7 changes: 3 additions & 4 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,22 +1,21 @@
appraise "rails-3.2" do
gem "rails", "3.2.22"
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
7 changes: 3 additions & 4 deletions enju_flower.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,10 @@ Gem::Specification.new do |s|
s.add_development_dependency "rspec-rails", "~> 3.4"
s.add_development_dependency "simplecov"
s.add_development_dependency "factory_girl_rails"
s.add_development_dependency "sunspot_rails", "2.2.0"
s.add_development_dependency "sunspot_solr", "2.2.0"
s.add_development_dependency "enju_leaf", "~> 1.1.2"
s.add_development_dependency "enju_manifestation_viewer", "~> 0.1.0"
s.add_development_dependency "enju_circulation", "~> 0.1.1"
s.add_development_dependency "enju_leaf", "~> 1.1.3"
s.add_development_dependency "enju_manifestation_viewer", "~> 0.1.1"
s.add_development_dependency "enju_circulation", "~> 0.1.2"
s.add_development_dependency "enju_bookmark", "~> 0.1.2"
s.add_development_dependency "enju_subject", "~> 0.1.1"
s.add_development_dependency "mobylette"
Expand Down
3 changes: 1 addition & 2 deletions gemfiles/rails_3.2.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@

source "https://rubygems.org"

gem "rails", "3.2.22"
gem "rails", "~> 3.2.22"
gem "jquery-rails"
gem "cancancan", "~> 1.12.0"
gem "strong_parameters"
gem "cache_digests"
gem "foreigner"
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails_4.1.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails_4.2.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 2a8192d

Please sign in to comment.