Skip to content

Commit a56e180

Browse files
kareskares
committed
bundle update + appraise latest 2.3/3.x
1 parent 51b86c2 commit a56e180

File tree

10 files changed

+168
-168
lines changed

10 files changed

+168
-168
lines changed

‎Gemfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ end
99
gem "appraisal"
1010

1111
gem 'rake', :group => :test
12-
gem 'rspec', '~> 2.11', :group => :test
13-
gem 'jruby-openssl', :group => :test
12+
gem 'rspec', '~> 2.13.0', :group => :test
13+
gem 'jruby-openssl', '>= 0.8.2', :group => :test

‎Gemfile.lock‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,31 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
appraisal (0.5.1)
4+
appraisal (0.5.2)
55
bundler
66
rake
7-
bouncy-castle-java (1.5.0146.1)
8-
diff-lcs (1.1.3)
9-
jruby-openssl (0.8.2)
10-
bouncy-castle-java (>= 1.5.0146.1)
7+
bouncy-castle-java (1.5.0147)
8+
diff-lcs (1.2.4)
9+
jruby-openssl (0.8.8)
10+
bouncy-castle-java (>= 1.5.0147)
1111
rack (1.5.2)
12-
rake (10.0.3)
13-
rspec (2.12.0)
14-
rspec-core (~> 2.12.0)
15-
rspec-expectations (~> 2.12.0)
16-
rspec-mocks (~> 2.12.0)
17-
rspec-core (2.12.2)
18-
rspec-expectations (2.12.1)
19-
diff-lcs (~> 1.1.3)
20-
rspec-mocks (2.12.2)
12+
rake (10.1.0)
13+
rspec (2.13.0)
14+
rspec-core (~> 2.13.0)
15+
rspec-expectations (~> 2.13.0)
16+
rspec-mocks (~> 2.13.0)
17+
rspec-core (2.13.1)
18+
rspec-expectations (2.13.0)
19+
diff-lcs (>= 1.1.3, < 2.0)
20+
rspec-mocks (2.13.1)
2121

2222
PLATFORMS
2323
java
24+
ruby
2425

2526
DEPENDENCIES
2627
appraisal
27-
jruby-openssl
28+
jruby-openssl (>= 0.8.2)
2829
rack
2930
rake
30-
rspec (~> 2.11)
31+
rspec (~> 2.13.0)

‎gemfiles/rails23.gemfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ source "https://rubygems.org"
55
gem "rack"
66
gem "appraisal"
77
gem "rake", :group=>:test
8-
gem "rspec", "~> 2.11", :group=>:test
9-
gem "jruby-openssl", :group=>:test
10-
gem "rails", "~> 2.3.17"
8+
gem "rspec", "~> 2.13.0", :group=>:test
9+
gem "jruby-openssl", ">= 0.8.2", :group=>:test
10+
gem "rails", "~> 2.3.18"
1111

‎gemfiles/rails23.gemfile.lock‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,48 @@
11
GEM
2-
remote: http://rubygems.org/
2+
remote: https://rubygems.org/
33
specs:
4-
actionmailer (2.3.17)
5-
actionpack (= 2.3.17)
6-
actionpack (2.3.17)
7-
activesupport (= 2.3.17)
4+
actionmailer (2.3.18)
5+
actionpack (= 2.3.18)
6+
actionpack (2.3.18)
7+
activesupport (= 2.3.18)
88
rack (~> 1.1.0)
9-
activerecord (2.3.17)
10-
activesupport (= 2.3.17)
11-
activeresource (2.3.17)
12-
activesupport (= 2.3.17)
13-
activesupport (2.3.17)
9+
activerecord (2.3.18)
10+
activesupport (= 2.3.18)
11+
activeresource (2.3.18)
12+
activesupport (= 2.3.18)
13+
activesupport (2.3.18)
1414
appraisal (0.5.1)
1515
bundler
1616
rake
1717
bouncy-castle-java (1.5.0146.1)
18-
diff-lcs (1.1.3)
18+
diff-lcs (1.2.4)
1919
jruby-openssl (0.8.2)
2020
bouncy-castle-java (>= 1.5.0146.1)
2121
rack (1.1.3)
22-
rails (2.3.17)
23-
actionmailer (= 2.3.17)
24-
actionpack (= 2.3.17)
25-
activerecord (= 2.3.17)
26-
activeresource (= 2.3.17)
27-
activesupport (= 2.3.17)
22+
rails (2.3.18)
23+
actionmailer (= 2.3.18)
24+
actionpack (= 2.3.18)
25+
activerecord (= 2.3.18)
26+
activeresource (= 2.3.18)
27+
activesupport (= 2.3.18)
2828
rake (>= 0.8.3)
2929
rake (10.0.3)
30-
rspec (2.12.0)
31-
rspec-core (~> 2.12.0)
32-
rspec-expectations (~> 2.12.0)
33-
rspec-mocks (~> 2.12.0)
34-
rspec-core (2.12.2)
35-
rspec-expectations (2.12.1)
36-
diff-lcs (~> 1.1.3)
37-
rspec-mocks (2.12.2)
30+
rspec (2.13.0)
31+
rspec-core (~> 2.13.0)
32+
rspec-expectations (~> 2.13.0)
33+
rspec-mocks (~> 2.13.0)
34+
rspec-core (2.13.1)
35+
rspec-expectations (2.13.0)
36+
diff-lcs (>= 1.1.3, < 2.0)
37+
rspec-mocks (2.13.1)
3838

3939
PLATFORMS
4040
java
4141

4242
DEPENDENCIES
4343
appraisal
44-
jruby-openssl
44+
jruby-openssl (>= 0.8.2)
4545
rack
46-
rails (~> 2.3.17)
46+
rails (~> 2.3.18)
4747
rake
48-
rspec (~> 2.11)
48+
rspec (~> 2.13.0)

‎gemfiles/rails30.gemfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ source "https://rubygems.org"
55
gem "rack"
66
gem "appraisal"
77
gem "rake", :group=>:test
8-
gem "rspec", "~> 2.11", :group=>:test
9-
gem "jruby-openssl", :group=>:test
8+
gem "rspec", "~> 2.13.0", :group=>:test
9+
gem "jruby-openssl", ">= 0.8.2", :group=>:test
1010
gem "rails", "~> 3.0.20"
1111

‎gemfiles/rails30.gemfile.lock‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
GEM
2-
remote: http://rubygems.org/
2+
remote: https://rubygems.org/
33
specs:
44
abstract (1.0.0)
55
actionmailer (3.0.20)
@@ -34,7 +34,7 @@ GEM
3434
arel (2.0.10)
3535
bouncy-castle-java (1.5.0146.1)
3636
builder (2.1.2)
37-
diff-lcs (1.1.3)
37+
diff-lcs (1.2.4)
3838
erubis (2.6.6)
3939
abstract (>= 1.0.0)
4040
i18n (0.5.0)
@@ -70,14 +70,14 @@ GEM
7070
rake (10.0.3)
7171
rdoc (3.12.1)
7272
json (~> 1.4)
73-
rspec (2.12.0)
74-
rspec-core (~> 2.12.0)
75-
rspec-expectations (~> 2.12.0)
76-
rspec-mocks (~> 2.12.0)
77-
rspec-core (2.12.2)
78-
rspec-expectations (2.12.1)
79-
diff-lcs (~> 1.1.3)
80-
rspec-mocks (2.12.2)
73+
rspec (2.13.0)
74+
rspec-core (~> 2.13.0)
75+
rspec-expectations (~> 2.13.0)
76+
rspec-mocks (~> 2.13.0)
77+
rspec-core (2.13.1)
78+
rspec-expectations (2.13.0)
79+
diff-lcs (>= 1.1.3, < 2.0)
80+
rspec-mocks (2.13.1)
8181
thor (0.14.6)
8282
treetop (1.4.12)
8383
polyglot
@@ -89,8 +89,8 @@ PLATFORMS
8989

9090
DEPENDENCIES
9191
appraisal
92-
jruby-openssl
92+
jruby-openssl (>= 0.8.2)
9393
rack
9494
rails (~> 3.0.20)
9595
rake
96-
rspec (~> 2.11)
96+
rspec (~> 2.13.0)

‎gemfiles/rails31.gemfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ source "https://rubygems.org"
55
gem "rack"
66
gem "appraisal"
77
gem "rake", :group=>:test
8-
gem "rspec", "~> 2.11", :group=>:test
9-
gem "jruby-openssl", :group=>:test
10-
gem "rails", "~> 3.1.11"
8+
gem "rspec", "~> 2.13.0", :group=>:test
9+
gem "jruby-openssl", ">= 0.8.2", :group=>:test
10+
gem "rails", "~> 3.1.12"
1111

‎gemfiles/rails31.gemfile.lock‎

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
GEM
2-
remote: http://rubygems.org/
2+
remote: https://rubygems.org/
33
specs:
4-
actionmailer (3.1.11)
5-
actionpack (= 3.1.11)
6-
mail (~> 2.3.3)
7-
actionpack (3.1.11)
8-
activemodel (= 3.1.11)
9-
activesupport (= 3.1.11)
4+
actionmailer (3.1.12)
5+
actionpack (= 3.1.12)
6+
mail (~> 2.4.4)
7+
actionpack (3.1.12)
8+
activemodel (= 3.1.12)
9+
activesupport (= 3.1.12)
1010
builder (~> 3.0.0)
1111
erubis (~> 2.7.0)
1212
i18n (~> 0.6)
@@ -15,39 +15,39 @@ GEM
1515
rack-mount (~> 0.8.2)
1616
rack-test (~> 0.6.1)
1717
sprockets (~> 2.0.4)
18-
activemodel (3.1.11)
19-
activesupport (= 3.1.11)
18+
activemodel (3.1.12)
19+
activesupport (= 3.1.12)
2020
builder (~> 3.0.0)
2121
i18n (~> 0.6)
22-
activerecord (3.1.11)
23-
activemodel (= 3.1.11)
24-
activesupport (= 3.1.11)
22+
activerecord (3.1.12)
23+
activemodel (= 3.1.12)
24+
activesupport (= 3.1.12)
2525
arel (~> 2.2.3)
2626
tzinfo (~> 0.3.29)
27-
activeresource (3.1.11)
28-
activemodel (= 3.1.11)
29-
activesupport (= 3.1.11)
30-
activesupport (3.1.11)
27+
activeresource (3.1.12)
28+
activemodel (= 3.1.12)
29+
activesupport (= 3.1.12)
30+
activesupport (3.1.12)
3131
multi_json (~> 1.0)
3232
appraisal (0.5.1)
3333
bundler
3434
rake
3535
arel (2.2.3)
3636
bouncy-castle-java (1.5.0146.1)
3737
builder (3.0.4)
38-
diff-lcs (1.1.3)
38+
diff-lcs (1.2.4)
3939
erubis (2.7.0)
40-
hike (1.2.1)
41-
i18n (0.6.1)
40+
hike (1.2.3)
41+
i18n (0.6.5)
4242
jruby-openssl (0.8.2)
4343
bouncy-castle-java (>= 1.5.0146.1)
44-
json (1.7.7-java)
45-
mail (2.3.3)
44+
json (1.8.0-java)
45+
mail (2.4.4)
4646
i18n (>= 0.4.0)
4747
mime-types (~> 1.16)
4848
treetop (~> 1.4.8)
49-
mime-types (1.21)
50-
multi_json (1.6.1)
49+
mime-types (1.25)
50+
multi_json (1.7.9)
5151
polyglot (0.3.3)
5252
rack (1.3.6)
5353
rack-cache (1.2)
@@ -58,50 +58,50 @@ GEM
5858
rack
5959
rack-test (0.6.2)
6060
rack (>= 1.0)
61-
rails (3.1.11)
62-
actionmailer (= 3.1.11)
63-
actionpack (= 3.1.11)
64-
activerecord (= 3.1.11)
65-
activeresource (= 3.1.11)
66-
activesupport (= 3.1.11)
61+
rails (3.1.12)
62+
actionmailer (= 3.1.12)
63+
actionpack (= 3.1.12)
64+
activerecord (= 3.1.12)
65+
activeresource (= 3.1.12)
66+
activesupport (= 3.1.12)
6767
bundler (~> 1.0)
68-
railties (= 3.1.11)
69-
railties (3.1.11)
70-
actionpack (= 3.1.11)
71-
activesupport (= 3.1.11)
68+
railties (= 3.1.12)
69+
railties (3.1.12)
70+
actionpack (= 3.1.12)
71+
activesupport (= 3.1.12)
7272
rack-ssl (~> 1.3.2)
7373
rake (>= 0.8.7)
7474
rdoc (~> 3.4)
7575
thor (~> 0.14.6)
7676
rake (10.0.3)
77-
rdoc (3.12.1)
77+
rdoc (3.12.2)
7878
json (~> 1.4)
79-
rspec (2.12.0)
80-
rspec-core (~> 2.12.0)
81-
rspec-expectations (~> 2.12.0)
82-
rspec-mocks (~> 2.12.0)
83-
rspec-core (2.12.2)
84-
rspec-expectations (2.12.1)
85-
diff-lcs (~> 1.1.3)
86-
rspec-mocks (2.12.2)
79+
rspec (2.13.0)
80+
rspec-core (~> 2.13.0)
81+
rspec-expectations (~> 2.13.0)
82+
rspec-mocks (~> 2.13.0)
83+
rspec-core (2.13.1)
84+
rspec-expectations (2.13.0)
85+
diff-lcs (>= 1.1.3, < 2.0)
86+
rspec-mocks (2.13.1)
8787
sprockets (2.0.4)
8888
hike (~> 1.2)
8989
rack (~> 1.0)
9090
tilt (~> 1.1, != 1.3.0)
9191
thor (0.14.6)
92-
tilt (1.3.3)
93-
treetop (1.4.12)
92+
tilt (1.4.1)
93+
treetop (1.4.15)
9494
polyglot
9595
polyglot (>= 0.3.1)
96-
tzinfo (0.3.35)
96+
tzinfo (0.3.37)
9797

9898
PLATFORMS
9999
java
100100

101101
DEPENDENCIES
102102
appraisal
103-
jruby-openssl
103+
jruby-openssl (>= 0.8.2)
104104
rack
105-
rails (~> 3.1.11)
105+
rails (~> 3.1.12)
106106
rake
107-
rspec (~> 2.11)
107+
rspec (~> 2.13.0)

‎gemfiles/rails32.gemfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ source "https://rubygems.org"
55
gem "rack"
66
gem "appraisal"
77
gem "rake", :group=>:test
8-
gem "rspec", "~> 2.11", :group=>:test
9-
gem "jruby-openssl", :group=>:test
10-
gem "rails", "~> 3.2.12"
8+
gem "rspec", "~> 2.13.0", :group=>:test
9+
gem "jruby-openssl", ">= 0.8.2", :group=>:test
10+
gem "rails", "~> 3.2.14"
1111

0 commit comments

Comments
 (0)