From 65cb82b2ebe22ab3ddd402b7e8e7fd7ff59c64ab Mon Sep 17 00:00:00 2001 From: Gabe Berke-Williams Date: Fri, 13 Apr 2012 09:59:10 -0400 Subject: [PATCH] Bump Rails versions for appraisal. --- Appraisals | 8 ++--- gemfiles/3.0.gemfile | 2 +- gemfiles/3.0.gemfile.lock | 52 ++++++++++++++++---------------- gemfiles/3.1.gemfile | 2 +- gemfiles/3.1.gemfile.lock | 62 +++++++++++++++++++-------------------- 5 files changed, 62 insertions(+), 64 deletions(-) diff --git a/Appraisals b/Appraisals index f0ade48e..a6c1391b 100644 --- a/Appraisals +++ b/Appraisals @@ -1,9 +1,9 @@ -appraise "3.0" do - gem "rails", "3.0.10" +appraise '3.0' do + gem 'rails', '3.0.12' end -appraise "3.1" do - gem "rails", "3.1.0" +appraise '3.1' do + gem 'rails', '3.1.4' gem 'jquery-rails' gem 'sass-rails' end diff --git a/gemfiles/3.0.gemfile b/gemfiles/3.0.gemfile index 1fc8a012..ce850ba8 100644 --- a/gemfiles/3.0.gemfile +++ b/gemfiles/3.0.gemfile @@ -8,6 +8,6 @@ gem "activerecord-jdbc-adapter", :platform=>:jruby gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby gem "jdbc-sqlite3", :platform=>:jruby gem "jruby-openssl", :platform=>:jruby -gem "rails", "3.0.10" +gem "rails", "3.0.12" gemspec :path=>"../" \ No newline at end of file diff --git a/gemfiles/3.0.gemfile.lock b/gemfiles/3.0.gemfile.lock index a69ec19a..657c30e8 100644 --- a/gemfiles/3.0.gemfile.lock +++ b/gemfiles/3.0.gemfile.lock @@ -8,32 +8,32 @@ GEM remote: http://rubygems.org/ specs: abstract (1.0.0) - actionmailer (3.0.10) - actionpack (= 3.0.10) + actionmailer (3.0.12) + actionpack (= 3.0.12) mail (~> 2.2.19) - actionpack (3.0.10) - activemodel (= 3.0.10) - activesupport (= 3.0.10) + actionpack (3.0.12) + activemodel (= 3.0.12) + activesupport (= 3.0.12) builder (~> 2.1.2) erubis (~> 2.6.6) i18n (~> 0.5.0) - rack (~> 1.2.1) + rack (~> 1.2.5) rack-mount (~> 0.6.14) rack-test (~> 0.5.7) tzinfo (~> 0.3.23) - activemodel (3.0.10) - activesupport (= 3.0.10) + activemodel (3.0.12) + activesupport (= 3.0.12) builder (~> 2.1.2) i18n (~> 0.5.0) - activerecord (3.0.10) - activemodel (= 3.0.10) - activesupport (= 3.0.10) + activerecord (3.0.12) + activemodel (= 3.0.12) + activesupport (= 3.0.12) arel (~> 2.0.10) tzinfo (~> 0.3.23) - activeresource (3.0.10) - activemodel (= 3.0.10) - activesupport (= 3.0.10) - activesupport (3.0.10) + activeresource (3.0.12) + activemodel (= 3.0.12) + activesupport (= 3.0.12) + activesupport (3.0.12) appraisal (0.4.1) bundler rake @@ -80,17 +80,17 @@ GEM rack (>= 1.0.0) rack-test (0.5.7) rack (>= 1.0) - rails (3.0.10) - actionmailer (= 3.0.10) - actionpack (= 3.0.10) - activerecord (= 3.0.10) - activeresource (= 3.0.10) - activesupport (= 3.0.10) + rails (3.0.12) + actionmailer (= 3.0.12) + actionpack (= 3.0.12) + activerecord (= 3.0.12) + activeresource (= 3.0.12) + activesupport (= 3.0.12) bundler (~> 1.0) - railties (= 3.0.10) - railties (3.0.10) - actionpack (= 3.0.10) - activesupport (= 3.0.10) + railties (= 3.0.12) + railties (3.0.12) + actionpack (= 3.0.12) + activesupport (= 3.0.12) rake (>= 0.8.7) rdoc (~> 3.4) thor (~> 0.14.4) @@ -133,7 +133,7 @@ DEPENDENCIES cucumber (~> 1.1.9) jdbc-sqlite3 jruby-openssl - rails (= 3.0.10) + rails (= 3.0.12) rake (~> 0.9.2) rspec-rails (~> 2.6.1) shoulda-context (~> 1.0.0) diff --git a/gemfiles/3.1.gemfile b/gemfiles/3.1.gemfile index c9ac121c..825818bc 100644 --- a/gemfiles/3.1.gemfile +++ b/gemfiles/3.1.gemfile @@ -8,7 +8,7 @@ gem "activerecord-jdbc-adapter", :platform=>:jruby gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby gem "jdbc-sqlite3", :platform=>:jruby gem "jruby-openssl", :platform=>:jruby -gem "rails", "3.1.0" +gem "rails", "3.1.4" gem "jquery-rails" gem "sass-rails" diff --git a/gemfiles/3.1.gemfile.lock b/gemfiles/3.1.gemfile.lock index 547f96c6..0dd8b441 100644 --- a/gemfiles/3.1.gemfile.lock +++ b/gemfiles/3.1.gemfile.lock @@ -7,34 +7,33 @@ PATH GEM remote: http://rubygems.org/ specs: - actionmailer (3.1.0) - actionpack (= 3.1.0) + actionmailer (3.1.4) + actionpack (= 3.1.4) mail (~> 2.3.0) - actionpack (3.1.0) - activemodel (= 3.1.0) - activesupport (= 3.1.0) + actionpack (3.1.4) + activemodel (= 3.1.4) + activesupport (= 3.1.4) builder (~> 3.0.0) erubis (~> 2.7.0) i18n (~> 0.6) - rack (~> 1.3.2) - rack-cache (~> 1.0.3) + rack (~> 1.3.6) + rack-cache (~> 1.1) rack-mount (~> 0.8.2) rack-test (~> 0.6.1) - sprockets (~> 2.0.0) - activemodel (3.1.0) - activesupport (= 3.1.0) - bcrypt-ruby (~> 3.0.0) + sprockets (~> 2.0.3) + activemodel (3.1.4) + activesupport (= 3.1.4) builder (~> 3.0.0) i18n (~> 0.6) - activerecord (3.1.0) - activemodel (= 3.1.0) - activesupport (= 3.1.0) - arel (~> 2.2.1) + activerecord (3.1.4) + activemodel (= 3.1.4) + activesupport (= 3.1.4) + arel (~> 2.2.3) tzinfo (~> 0.3.29) - activeresource (3.1.0) - activemodel (= 3.1.0) - activesupport (= 3.1.0) - activesupport (3.1.0) + activeresource (3.1.4) + activemodel (= 3.1.4) + activesupport (= 3.1.4) + activesupport (3.1.4) multi_json (~> 1.0) appraisal (0.4.1) bundler @@ -48,7 +47,6 @@ GEM rspec (>= 2.6.0) bcat (0.6.2) rack (~> 1.0) - bcrypt-ruby (3.0.1) bourne (1.1.2) mocha (= 0.10.5) builder (3.0.0) @@ -82,7 +80,7 @@ GEM multi_json (1.2.0) polyglot (0.3.3) rack (1.3.6) - rack-cache (1.0.3) + rack-cache (1.2) rack (>= 0.4) rack-mount (0.8.3) rack (>= 1.0.0) @@ -90,17 +88,17 @@ GEM rack rack-test (0.6.1) rack (>= 1.0) - rails (3.1.0) - actionmailer (= 3.1.0) - actionpack (= 3.1.0) - activerecord (= 3.1.0) - activeresource (= 3.1.0) - activesupport (= 3.1.0) + rails (3.1.4) + actionmailer (= 3.1.4) + actionpack (= 3.1.4) + activerecord (= 3.1.4) + activeresource (= 3.1.4) + activesupport (= 3.1.4) bundler (~> 1.0) - railties (= 3.1.0) - railties (3.1.0) - actionpack (= 3.1.0) - activesupport (= 3.1.0) + railties (= 3.1.4) + railties (3.1.4) + actionpack (= 3.1.4) + activesupport (= 3.1.4) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) @@ -156,7 +154,7 @@ DEPENDENCIES jdbc-sqlite3 jquery-rails jruby-openssl - rails (= 3.1.0) + rails (= 3.1.4) rake (~> 0.9.2) rspec-rails (~> 2.6.1) sass-rails