Merge pull request #522 from teeparham/rubinius_2

Update Rubinius Gemfiles, Travis
This commit is contained in:
Arthur Nogueira Neves 2014-02-28 17:17:40 -05:00
commit 97f7914107
4 changed files with 6 additions and 24 deletions

View File

@ -5,7 +5,7 @@ rvm:
- 2.1.0
- ruby-head
- jruby
- rbx
- rbx-2
gemfile:
- Gemfile
- Gemfile.rails3

10
Gemfile
View File

@ -3,7 +3,9 @@ source 'https://rubygems.org'
gemspec
platforms :ruby do
gem 'sqlite3'
# sqlite3 1.3.9 does not work with rubinius 2.2.5:
# https://github.com/sparklemotion/sqlite3-ruby/issues/122
gem 'sqlite3', '1.3.8'
end
platforms :mri do
@ -15,10 +17,4 @@ platforms :jruby do
gem 'activerecord-jdbcsqlite3-adapter'
end
platforms :rbx do
gem 'json'
gem 'rubysl', '~> 2.0'
gem 'racc', '~> 1.4.10'
end
gem 'rails', '~> 4.0.0'

View File

@ -3,7 +3,7 @@ source 'https://rubygems.org'
gemspec
platforms :ruby do
gem 'sqlite3'
gem 'sqlite3', '1.3.8'
end
platforms :mri do
@ -15,12 +15,6 @@ platforms :jruby do
gem 'activerecord-jdbcsqlite3-adapter'
end
platforms :rbx do
gem 'json'
gem 'rubysl', '~> 2.0'
gem 'racc', '~> 1.4.10'
end
# Use Rails master + current dependencies
gem 'rails', github: 'rails/rails'
gem 'arel', github: 'rails/arel'

View File

@ -2,9 +2,8 @@ source 'https://rubygems.org'
gemspec
platforms :ruby do
gem 'sqlite3'
gem 'sqlite3', '1.3.8'
end
platforms :mri do
@ -16,12 +15,5 @@ platforms :jruby do
gem 'activerecord-jdbcsqlite3-adapter'
end
platforms :rbx do
gem 'json'
gem 'rubysl', '~> 2.0'
gem 'rubysl-test-unit', '~> 2.0'
gem 'racc', '~> 1.4.10'
end
gem 'minitest', '~> 4.0'
gem 'rails', '~> 3.2'