Skip to content

Commit d3efc91

Browse files
committed
update + test with latest release-candidates for AR 4.x
1 parent bdcd906 commit d3efc91

15 files changed

+65
-58
lines changed

Appraisals

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ end
1717

1818
appraise "rails40" do
1919
# NOTE: make sure you're using --1.9 with AR-4.0
20-
gem "activerecord", "~> 4.0.5", :require => false
20+
gem "activerecord", "4.0.6.rc2", :require => false
2121
end
2222

2323
appraise "rails41" do
2424
# NOTE: make sure you're using --1.9 with AR-4.0
25-
gem "activerecord", "~> 4.1.1", :require => false
25+
gem "activerecord", "4.1.2.rc2", :require => false
2626
end
2727

2828
appraise "rails42" do
@@ -34,4 +34,4 @@ appraise "rails42" do
3434
else
3535
# gem "activerecord", '4.2.0.rc1', :require => false
3636
end
37-
end
37+
end

gemfiles/rails23.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
source "https://rubygems.org"
44

55
gem "thread_safe", :require=>nil
6-
gem "rake", :require=>nil
6+
gem "rake", "~> 10.3.2", :require=>nil
77
gem "appraisal", "~> 0.5.2", :require=>nil
88
gem "test-unit", "~> 2.5.4", :group=>:test
99
gem "test-unit-context", ">= 0.4.0", :group=>:test

gemfiles/rails23.gemfile.lock

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ GEM
1414
appraisal (0.5.2)
1515
bundler
1616
rake
17+
bcrypt-ruby (3.0.1)
1718
bcrypt-ruby (3.0.1-java)
1819
docile (1.1.3)
1920
metaclass (0.0.4)
@@ -28,7 +29,7 @@ GEM
2829
activeresource (= 2.3.18)
2930
activesupport (= 2.3.18)
3031
rake (>= 0.8.3)
31-
rake (10.3.1)
32+
rake (10.3.2)
3233
simplecov (0.8.2)
3334
docile (~> 1.1.0)
3435
multi_json
@@ -37,6 +38,7 @@ GEM
3738
test-unit (2.5.5)
3839
test-unit-context (0.4.0)
3940
test-unit (>= 2.4.0)
41+
thread_safe (0.3.3)
4042
thread_safe (0.3.3-java)
4143

4244
PLATFORMS
@@ -50,7 +52,7 @@ DEPENDENCIES
5052
mysql2
5153
pg
5254
rails (~> 2.3.18)
53-
rake
55+
rake (~> 10.3.2)
5456
simplecov
5557
sqlite3
5658
test-unit (~> 2.5.4)

gemfiles/rails30.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
source "https://rubygems.org"
44

55
gem "thread_safe", :require=>nil
6-
gem "rake", :require=>nil
6+
gem "rake", "~> 10.3.2", :require=>nil
77
gem "appraisal", "~> 0.5.2", :require=>nil
88
gem "test-unit", "~> 2.5.4", :group=>:test
99
gem "test-unit-context", ">= 0.4.0", :group=>:test

gemfiles/rails30.gemfile.lock

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ GEM
1515
bundler
1616
rake
1717
arel (2.0.10)
18+
bcrypt-ruby (3.0.1)
1819
bcrypt-ruby (3.0.1-java)
1920
builder (2.1.2)
2021
docile (1.1.3)
@@ -23,7 +24,7 @@ GEM
2324
mocha (0.13.3)
2425
metaclass (~> 0.0.1)
2526
multi_json (1.10.0)
26-
rake (10.3.1)
27+
rake (10.3.2)
2728
simplecov (0.8.2)
2829
docile (~> 1.1.0)
2930
multi_json
@@ -32,6 +33,7 @@ GEM
3233
test-unit (2.5.5)
3334
test-unit-context (0.4.0)
3435
test-unit (>= 2.4.0)
36+
thread_safe (0.3.3)
3537
thread_safe (0.3.3-java)
3638
tzinfo (0.3.39)
3739

@@ -45,7 +47,7 @@ DEPENDENCIES
4547
mocha (~> 0.13.1)
4648
mysql2
4749
pg
48-
rake
50+
rake (~> 10.3.2)
4951
simplecov
5052
sqlite3
5153
test-unit (~> 2.5.4)

gemfiles/rails31.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
source "https://rubygems.org"
44

55
gem "thread_safe", :require=>nil
6-
gem "rake", :require=>nil
6+
gem "rake", "~> 10.3.2", :require=>nil
77
gem "appraisal", "~> 0.5.2", :require=>nil
88
gem "test-unit", "~> 2.5.4", :group=>:test
99
gem "test-unit-context", ">= 0.4.0", :group=>:test

gemfiles/rails31.gemfile.lock

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ GEM
1616
bundler
1717
rake
1818
arel (2.2.3)
19+
bcrypt-ruby (3.0.1)
1920
bcrypt-ruby (3.0.1-java)
2021
builder (3.0.4)
2122
docile (1.1.3)
@@ -24,7 +25,7 @@ GEM
2425
mocha (0.13.3)
2526
metaclass (~> 0.0.1)
2627
multi_json (1.10.0)
27-
rake (10.3.1)
28+
rake (10.3.2)
2829
simplecov (0.8.2)
2930
docile (~> 1.1.0)
3031
multi_json
@@ -33,6 +34,7 @@ GEM
3334
test-unit (2.5.5)
3435
test-unit-context (0.4.0)
3536
test-unit (>= 2.4.0)
37+
thread_safe (0.3.3)
3638
thread_safe (0.3.3-java)
3739
tzinfo (0.3.39)
3840

@@ -46,7 +48,7 @@ DEPENDENCIES
4648
mocha (~> 0.13.1)
4749
mysql2
4850
pg
49-
rake
51+
rake (~> 10.3.2)
5052
simplecov
5153
sqlite3
5254
test-unit (~> 2.5.4)

gemfiles/rails32.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
source "https://rubygems.org"
44

55
gem "thread_safe", :require=>nil
6-
gem "rake", :require=>nil
6+
gem "rake", "~> 10.3.2", :require=>nil
77
gem "appraisal", "~> 0.5.2", :require=>nil
88
gem "test-unit", "~> 2.5.4", :group=>:test
99
gem "test-unit-context", ">= 0.4.0", :group=>:test

gemfiles/rails32.gemfile.lock

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ GEM
1616
bundler
1717
rake
1818
arel (3.0.3)
19+
bcrypt-ruby (3.0.1)
1920
bcrypt-ruby (3.0.1-java)
2021
builder (3.0.4)
2122
docile (1.1.3)
@@ -24,7 +25,7 @@ GEM
2425
mocha (0.13.3)
2526
metaclass (~> 0.0.1)
2627
multi_json (1.10.0)
27-
rake (10.3.1)
28+
rake (10.3.2)
2829
simplecov (0.8.2)
2930
docile (~> 1.1.0)
3031
multi_json
@@ -33,6 +34,7 @@ GEM
3334
test-unit (2.5.5)
3435
test-unit-context (0.4.0)
3536
test-unit (>= 2.4.0)
37+
thread_safe (0.3.3)
3638
thread_safe (0.3.3-java)
3739
tzinfo (0.3.39)
3840

@@ -46,7 +48,7 @@ DEPENDENCIES
4648
mocha (~> 0.13.1)
4749
mysql2
4850
pg
49-
rake
51+
rake (~> 10.3.2)
5052
simplecov
5153
sqlite3
5254
test-unit (~> 2.5.4)

gemfiles/rails40.gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
source "https://rubygems.org"
44

55
gem "thread_safe", :require=>nil
6-
gem "rake", :require=>nil
6+
gem "rake", "~> 10.3.2", :require=>nil
77
gem "appraisal", "~> 0.5.2", :require=>nil
88
gem "test-unit", "~> 2.5.4", :group=>:test
99
gem "test-unit-context", ">= 0.4.0", :group=>:test
@@ -13,5 +13,5 @@ gem "bcrypt-ruby", "~> 3.0.0", :require=>nil, :group=>:test
1313
gem "mysql2", :require=>nil, :platform=>:mri, :group=>:test
1414
gem "pg", :require=>nil, :platform=>:mri, :group=>:test
1515
gem "sqlite3", :require=>nil, :platform=>:mri, :group=>:test
16-
gem "activerecord", "~> 4.0.5", :require=>false
16+
gem "activerecord", "4.0.6.rc2", :require=>false
1717

0 commit comments

Comments
 (0)