1
0
Fork 0
mirror of https://github.com/aasm/aasm synced 2023-03-27 23:22:41 -04:00

use Ruby 2.2.5 for Rails 5

This commit is contained in:
Thorsten Böttger 2016-05-08 13:15:26 +12:00
parent 21cf5769f0
commit 0f081849f3
2 changed files with 2 additions and 5 deletions

View file

@ -4,7 +4,7 @@ cache: bundler
rvm: rvm:
- 1.9.3 - 1.9.3
- 2.2 - 2.2.5
- 2.3 - 2.3
- jruby-1.7 # JRuby in 1.9 mode - jruby-1.7 # JRuby in 1.9 mode
- jruby-9.0.4.0 - jruby-9.0.4.0
@ -41,7 +41,7 @@ matrix:
gemfile: gemfiles/rails_4.1.gemfile gemfile: gemfiles/rails_4.1.gemfile
- rvm: 1.9.3 - rvm: 1.9.3
gemfile: gemfiles/rails_5.0.gemfile gemfile: gemfiles/rails_5.0.gemfile
- rvm: 2.2 - rvm: 2.2.5
gemfile: gemfiles/rails_3.2_stable.gemfile gemfile: gemfiles/rails_3.2_stable.gemfile
- rvm: 2.3 - rvm: 2.3
gemfile: gemfiles/rails_3.2_stable.gemfile gemfile: gemfiles/rails_3.2_stable.gemfile

View file

@ -6,9 +6,6 @@ gem 'rubinius-developer_tools', :platforms => :rbx
gem "jruby-openssl", :platforms => :jruby gem "jruby-openssl", :platforms => :jruby
gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
gem "rack", "~> 1" if Gem::Version.create(RUBY_VERSION.dup) <= Gem::Version.create('2.2.2')
gem "mime-types", "~> 2" if Gem::Version.create(RUBY_VERSION.dup) <= Gem::Version.create('1.9.3')
gem "rails", "5.0.0.beta4" gem "rails", "5.0.0.beta4"
# mongoid is not yet Rails 5 compatible # mongoid is not yet Rails 5 compatible