dropped compatibility with Rails 3.1

zlotnika · Mar 11, 2013 · b55484b · b55484b
1 parent f6ae86f
commit b55484b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 24 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,6 @@ rvm:
   - jruby-19mode
 
 gemfile:
-  - gemfiles/Gemfile.rails-3.1
   - gemfiles/Gemfile.rails-3.2
   - gemfiles/Gemfile.rails-4.0
 

diff --git a/gemfiles/Gemfile.rails-3.1 b/gemfiles/Gemfile.rails-3.1
diff --git a/gemfiles/Gemfile.rails-4.0 b/gemfiles/Gemfile.rails-4.0
@@ -2,16 +2,25 @@ source "https://rubygems.org"
 
 case ENV["ADAPTER"]
 when nil, "active_record"
-  group :test do
-    gem "activerecord-jdbcsqlite3-adapter", :platform => "jruby"
-    gem "sqlite3", :platform => "ruby"
-  end
   gem "activerecord", "~> 4.0.0.beta1", :require => "active_record"
 when "mongoid"
-  gem "mongoid", "~> 3.1"
+  gem "mongoid", :git => "git://github.com/mongoid/mongoid.git"
   gem "bson_ext", :platform => "ruby"
 else
   raise "Unknown model adapter: #{ENV["ADAPTER"]}"
 end
 
-gemspec :path => '../'
+group :test do
+  gem "rails", "~> 4.0.0.beta1"
+  gem "ammeter"
+  gem "rake"
+  gem "rspec"
+  gem "rspec-rails"
+  gem "fuubar"
+  gem "bundler"
+
+  gem "activerecord-jdbcsqlite3-adapter", :platform => "jruby"
+  gem "sqlite3", :platform => "ruby"
+  gem "activerecord", "~> 4.0.0.beta1", :require => "active_record"
+  gem "mongoid", :git => "git://github.com/mongoid/mongoid.git"
+end