gemfiles/Gemfile.rails-3.2 in rolify-3.4.0 vs gemfiles/Gemfile.rails-3.2 in rolify-3.4.1

- old
+ new

@@ -1,28 +1,27 @@ -source "https://rubygems.org" +source 'https://rubygems.org' platforms :rbx do - gem 'racc' - gem 'rubysl', '~> 2.0' gem 'psych' - gem 'json' gem 'rubinius-coverage', '~> 2.0' - gem 'rubysl-test-unit' end group :test do - case ENV["ADAPTER"] - when nil, "active_record" - gem "activerecord-jdbcsqlite3-adapter", ">= 1.3.0.rc", :platform => "jruby" - gem "sqlite3", :platform => "ruby" - gem "activerecord", ">= 3.2.0", :require => "active_record" - when "mongoid" - gem "mongoid", ">= 3.1" - gem "bson_ext", :platform => "ruby" + gem 'railties', '~> 3.2', '< 4.0' + case ENV['ADAPTER'] + when nil, 'active_record' + gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0.rc', :platform => 'jruby' + #Fix sqlite3 version for rbx until rubinus is updated + #https://github.com/travis-ci/travis-ci/issues/2006 + gem 'sqlite3', '1.3.8', :platform => 'ruby' + gem 'activerecord', '~> 3.2.0', :require => 'active_record' + when 'mongoid' + gem 'mongoid', '>= 3.1' + gem 'bson_ext', :platform => 'ruby' else - raise "Unknown model adapter: #{ENV["ADAPTER"]}" + raise "Unknown model adapter: #{ENV['ADAPTER']}" end - + gem 'coveralls', :require => false end gemspec :path => '../'