diff --git a/.travis.yml b/.travis.yml index f0df8ef3..913fe9d9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ rvm: - 2.1.0 - ruby-head - jruby - - rbx + - rbx-2 gemfile: - Gemfile - Gemfile.rails3 diff --git a/Gemfile b/Gemfile index bc6d7817..a5b2c5f7 100644 --- a/Gemfile +++ b/Gemfile @@ -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' diff --git a/Gemfile.edge b/Gemfile.edge index 1e06dc48..684de332 100644 --- a/Gemfile.edge +++ b/Gemfile.edge @@ -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' diff --git a/Gemfile.rails3 b/Gemfile.rails3 index d90af577..ac98e974 100644 --- a/Gemfile.rails3 +++ b/Gemfile.rails3 @@ -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'