From b55484bf8cb061748bd3448ad806bb338fbdb091 Mon Sep 17 00:00:00 2001 From: Florent Monbillard Date: Mon, 11 Mar 2013 14:13:01 -0400 Subject: [PATCH] dropped compatibility with Rails 3.1 --- .travis.yml | 1 - gemfiles/Gemfile.rails-3.1 | 17 ----------------- gemfiles/Gemfile.rails-4.0 | 21 +++++++++++++++------ 3 files changed, 15 insertions(+), 24 deletions(-) delete mode 100644 gemfiles/Gemfile.rails-3.1 diff --git a/.travis.yml b/.travis.yml index 319cf690..26a73b4b 100644 --- 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 deleted file mode 100644 index 5aa6635f..00000000 --- a/gemfiles/Gemfile.rails-3.1 +++ /dev/null @@ -1,17 +0,0 @@ -source :rubygems - -case ENV["ADAPTER"] -when nil, "active_record" - group :test do - gem "activerecord-jdbcsqlite3-adapter", :platform => "jruby" - gem "sqlite3", :platform => "ruby" - end - gem "activerecord", "~> 3.1.0", :require => "active_record" -when "mongoid" - gem "mongoid", "~> 3.0" - gem "bson_ext", :platform => "ruby" -else - raise "Unknown model adapter: #{ENV["ADAPTER"]}" -end - -gemspec :path => '../' \ No newline at end of file diff --git a/gemfiles/Gemfile.rails-4.0 b/gemfiles/Gemfile.rails-4.0 index 396d56a8..9eb31d73 100644 --- 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 => '../' \ No newline at end of file +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 \ No newline at end of file