we seem to fail with appraisal 1.0.0

jruby · Apr 14, 2014 · d4e7358 · d4e7358
1 parent f6ae887
commit d4e7358
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 17 deletions.
diff --git a/Gemfile b/Gemfile
@@ -24,7 +24,7 @@ if RUBY_VERSION < '1.9'
 else
   gem 'rake', :require => nil
 end
-gem 'appraisal', :require => nil
+gem 'appraisal', '~> 0.5.2', :require => nil
 
 # appraisal ignores group block declarations :
 

diff --git a/gemfiles/rails23.gemfile b/gemfiles/rails23.gemfile
@@ -4,7 +4,7 @@ source "https://rubygems.org"
 
 gem "thread_safe", :require=>nil
 gem "rake", :require=>nil
-gem "appraisal", :require=>nil
+gem "appraisal", "~> 0.5.2", :require=>nil
 gem "test-unit", "~> 2.5.4", :group=>:test
 gem "test-unit-context", ">= 0.4.0", :group=>:test
 gem "mocha", "~> 0.13.1", :require=>nil, :group=>:test

diff --git a/gemfiles/rails23.gemfile.lock b/gemfiles/rails23.gemfile.lock
@@ -46,7 +46,7 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord (~> 2.3.18)
-  appraisal
+  appraisal (~> 0.5.2)
   bcrypt-ruby (~> 3.0.0)
   mocha (~> 0.13.1)
   mysql2

diff --git a/gemfiles/rails30.gemfile b/gemfiles/rails30.gemfile
@@ -4,7 +4,7 @@ source "https://rubygems.org"
 
 gem "thread_safe", :require=>nil
 gem "rake", :require=>nil
-gem "appraisal", :require=>nil
+gem "appraisal", "~> 0.5.2", :require=>nil
 gem "test-unit", "~> 2.5.4", :group=>:test
 gem "test-unit-context", ">= 0.4.0", :group=>:test
 gem "mocha", "~> 0.13.1", :require=>nil, :group=>:test

diff --git a/gemfiles/rails30.gemfile.lock b/gemfiles/rails30.gemfile.lock
@@ -42,7 +42,7 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord (~> 3.0.20)
-  appraisal
+  appraisal (~> 0.5.2)
   bcrypt-ruby (~> 3.0.0)
   mocha (~> 0.13.1)
   mysql2

diff --git a/gemfiles/rails31.gemfile b/gemfiles/rails31.gemfile
@@ -4,7 +4,7 @@ source "https://rubygems.org"
 
 gem "thread_safe", :require=>nil
 gem "rake", :require=>nil
-gem "appraisal", :require=>nil
+gem "appraisal", "~> 0.5.2", :require=>nil
 gem "test-unit", "~> 2.5.4", :group=>:test
 gem "test-unit-context", ">= 0.4.0", :group=>:test
 gem "mocha", "~> 0.13.1", :require=>nil, :group=>:test

diff --git a/gemfiles/rails31.gemfile.lock b/gemfiles/rails31.gemfile.lock
@@ -43,7 +43,7 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord (~> 3.1.12)
-  appraisal
+  appraisal (~> 0.5.2)
   bcrypt-ruby (~> 3.0.0)
   mocha (~> 0.13.1)
   mysql2

diff --git a/gemfiles/rails32.gemfile b/gemfiles/rails32.gemfile
@@ -4,7 +4,7 @@ source "https://rubygems.org"
 
 gem "thread_safe", :require=>nil
 gem "rake", :require=>nil
-gem "appraisal", :require=>nil
+gem "appraisal", "~> 0.5.2", :require=>nil
 gem "test-unit", "~> 2.5.4", :group=>:test
 gem "test-unit-context", ">= 0.4.0", :group=>:test
 gem "mocha", "~> 0.13.1", :require=>nil, :group=>:test

diff --git a/gemfiles/rails32.gemfile.lock b/gemfiles/rails32.gemfile.lock
@@ -43,7 +43,7 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord (~> 3.2.17)
-  appraisal
+  appraisal (~> 0.5.2)
   bcrypt-ruby (~> 3.0.0)
   mocha (~> 0.13.1)
   mysql2

diff --git a/gemfiles/rails40.gemfile b/gemfiles/rails40.gemfile
@@ -4,7 +4,7 @@ source "https://rubygems.org"
 
 gem "thread_safe", :require=>nil
 gem "rake", :require=>nil
-gem "appraisal", :require=>nil
+gem "appraisal", "~> 0.5.2", :require=>nil
 gem "test-unit", "~> 2.5.4", :group=>:test
 gem "test-unit-context", ">= 0.4.0", :group=>:test
 gem "mocha", "~> 0.13.1", :require=>nil, :group=>:test

diff --git a/gemfiles/rails40.gemfile.lock b/gemfiles/rails40.gemfile.lock
@@ -20,9 +20,7 @@ GEM
       bundler
       rake
     arel (4.0.2)
-    atomic (1.1.15)
     atomic (1.1.15-java)
-    bcrypt-ruby (3.0.1)
     bcrypt-ruby (3.0.1-java)
     builder (3.1.4)
     docile (1.1.3)
@@ -41,8 +39,6 @@ GEM
     test-unit (2.5.5)
     test-unit-context (0.4.0)
       test-unit (>= 2.4.0)
-    thread_safe (0.2.0)
-      atomic (>= 1.1.7, < 2)
     thread_safe (0.2.0-java)
       atomic (>= 1.1.7, < 2)
     tzinfo (0.3.39)
@@ -52,7 +48,7 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord (~> 4.0.4)
-  appraisal
+  appraisal (~> 0.5.2)
   bcrypt-ruby (~> 3.0.0)
   mocha (~> 0.13.1)
   mysql2

diff --git a/gemfiles/rails41.gemfile b/gemfiles/rails41.gemfile
@@ -4,7 +4,7 @@ source "https://rubygems.org"
 
 gem "thread_safe", :require=>nil
 gem "rake", :require=>nil
-gem "appraisal", :require=>nil
+gem "appraisal", "~> 0.5.2", :require=>nil
 gem "test-unit", "~> 2.5.4", :group=>:test
 gem "test-unit-context", ">= 0.4.0", :group=>:test
 gem "mocha", "~> 0.13.1", :require=>nil, :group=>:test

diff --git a/gemfiles/rails41.gemfile.lock b/gemfiles/rails41.gemfile.lock
@@ -48,7 +48,7 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord (= 4.1.0.rc1)
-  appraisal
+  appraisal (~> 0.5.2)
   bcrypt-ruby (~> 3.0.0)
   mocha (~> 0.13.1)
   mysql2