Skip to content

Commit 0afcafd

Browse files
committed
update appraised gemfiles - so that we have a working jossl 4all
1 parent 1e81098 commit 0afcafd

15 files changed

+141
-124
lines changed

Appraisals

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,23 @@ appraise "rails40" do
2121
end
2222

2323
appraise "rails41" do
24-
gem "rails", "~> 4.1.11"
24+
gem "rails", "~> 4.1.16"
2525
end
2626

2727
appraise "rails42" do
28-
gem "rails", "~> 4.2.5"
28+
gem "mime-types", "< 3", :require => false
29+
gem "rails", "~> 4.2.9"
30+
end
31+
32+
appraise "rails50" do
33+
gem "rails", "~> 5.0.5"
34+
end
35+
36+
appraise "rails51" do
37+
gem "rails", "~> 5.1.2"
2938
end
3039

3140
appraise "railsNG" do
32-
gem 'rails', "5.0.0.beta1"
33-
#gem 'rails', :github => 'rails/rails', :branch => 'master'
34-
#gem 'arel', :github => 'rails/arel', :branch => 'master'
41+
gem 'rails', :github => 'rails/rails', :branch => 'master'
42+
gem 'arel', :github => 'rails/arel', :branch => 'master'
3543
end

gemfiles/rails23.gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@ source "https://rubygems.org"
44

55
gem "rake", "~> 10.4.2", :group=>:test, :require=>nil
66
gem "rspec", "~> 2.14.1", :group=>:test
7+
gem "jruby-openssl", "~> 0.9.20", :group=>:test
78
gem "rails", "~> 2.3.18"
89

gemfiles/rails23.gemfile.lock

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ GEM
1212
activesupport (= 2.3.18)
1313
activesupport (2.3.18)
1414
diff-lcs (1.2.5)
15+
jruby-openssl (0.9.21-java)
1516
rack (1.1.6)
1617
rails (2.3.18)
1718
actionmailer (= 2.3.18)
@@ -34,6 +35,10 @@ PLATFORMS
3435
java
3536

3637
DEPENDENCIES
38+
jruby-openssl (~> 0.9.20)
3739
rails (~> 2.3.18)
3840
rake (~> 10.4.2)
3941
rspec (~> 2.14.1)
42+
43+
BUNDLED WITH
44+
1.14.6

gemfiles/rails30.gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@ source "https://rubygems.org"
44

55
gem "rake", "~> 10.4.2", :group=>:test, :require=>nil
66
gem "rspec", "~> 2.14.1", :group=>:test
7+
gem "jruby-openssl", "~> 0.9.20", :group=>:test
78
gem "rails", "~> 3.0.20"
89

gemfiles/rails30.gemfile.lock

Lines changed: 5 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ GEM
3434
erubis (2.6.6)
3535
abstract (>= 1.0.0)
3636
i18n (0.5.4)
37+
jruby-openssl (0.9.21-java)
3738
json (1.8.1-java)
3839
mail (2.2.20)
3940
activesupport (>= 2.3.6)
@@ -75,36 +76,17 @@ GEM
7576
thor (0.14.6)
7677
treetop (1.4.15)
7778
polyglot
78-
polyglot
79-
polyglot
80-
polyglot
81-
polyglot
82-
polyglot
83-
polyglot
84-
polyglot
85-
polyglot
86-
polyglot
87-
polyglot
88-
polyglot
89-
polyglot (>= 0.3.1)
90-
polyglot (>= 0.3.1)
91-
polyglot (>= 0.3.1)
92-
polyglot (>= 0.3.1)
93-
polyglot (>= 0.3.1)
94-
polyglot (>= 0.3.1)
95-
polyglot (>= 0.3.1)
96-
polyglot (>= 0.3.1)
97-
polyglot (>= 0.3.1)
98-
polyglot (>= 0.3.1)
99-
polyglot (>= 0.3.1)
100-
polyglot (>= 0.3.1)
10179
polyglot (>= 0.3.1)
10280
tzinfo (0.3.40)
10381

10482
PLATFORMS
10583
java
10684

10785
DEPENDENCIES
86+
jruby-openssl (~> 0.9.20)
10887
rails (~> 3.0.20)
10988
rake (~> 10.4.2)
11089
rspec (~> 2.14.1)
90+
91+
BUNDLED WITH
92+
1.14.6

gemfiles/rails31.gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ source "https://rubygems.org"
44

55
gem "rake", "~> 10.4.2", :group=>:test, :require=>nil
66
gem "rspec", "~> 2.14.1", :group=>:test
7+
gem "jruby-openssl", "~> 0.9.20", :group=>:test
78
gem "i18n", "< 0.7"
89
gem "rails", "~> 3.1.12"
910

gemfiles/rails31.gemfile.lock

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ GEM
3535
erubis (2.7.0)
3636
hike (1.2.3)
3737
i18n (0.6.11)
38+
jruby-openssl (0.9.21-java)
3839
json (1.8.2-java)
3940
mail (2.4.4)
4041
i18n (>= 0.4.0)
@@ -94,6 +95,10 @@ PLATFORMS
9495

9596
DEPENDENCIES
9697
i18n (< 0.7)
98+
jruby-openssl (~> 0.9.20)
9799
rails (~> 3.1.12)
98100
rake (~> 10.4.2)
99101
rspec (~> 2.14.1)
102+
103+
BUNDLED WITH
104+
1.14.6

gemfiles/rails32.gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ source "https://rubygems.org"
44

55
gem "rake", "~> 10.4.2", :group=>:test, :require=>nil
66
gem "rspec", "~> 2.14.1", :group=>:test
7+
gem "jruby-openssl", "~> 0.9.20", :group=>:test
78
gem "i18n", "< 0.7"
89
gem "rails", "~> 3.2.21"
910

gemfiles/rails32.gemfile.lock

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ GEM
3535
hike (1.2.3)
3636
i18n (0.6.11)
3737
journey (1.0.4)
38+
jruby-openssl (0.9.21-java)
3839
json (1.8.3-java)
3940
mail (2.5.4)
4041
mime-types (~> 1.16)
@@ -92,9 +93,10 @@ PLATFORMS
9293

9394
DEPENDENCIES
9495
i18n (< 0.7)
96+
jruby-openssl (~> 0.9.20)
9597
rails (~> 3.2.21)
9698
rake (~> 10.4.2)
9799
rspec (~> 2.14.1)
98100

99101
BUNDLED WITH
100-
1.10.2
102+
1.14.6

gemfiles/rails40.gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@ source "https://rubygems.org"
44

55
gem "rake", "~> 10.4.2", :group=>:test, :require=>nil
66
gem "rspec", "~> 2.14.1", :group=>:test
7+
gem "jruby-openssl", "~> 0.9.20", :group=>:test
78
gem "rails", "~> 4.0.13"
89

0 commit comments

Comments
 (0)