Skip to content

Commit f23e23a

Browse files
committed
[chore] Ensure jruby-rack is locked via warbler
1 parent a916bb1 commit f23e23a

File tree

4 files changed

+42
-6
lines changed

4 files changed

+42
-6
lines changed

examples/rails7/Gemfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
source "https://rubygems.org"
1+
source 'https://rubygems.org'
22

33
ruby '~> 3.1.0'
44

5-
gem "rails", "~> 7.2.2", ">= 7.2.2.2"
6-
gem "rack", "~> 2.2.0"
5+
gem 'rails', '~> 7.2.2', '>= 7.2.2.2'
6+
gem 'rack', '~> 2.2.18'
77
gem "sprockets-rails"
88

99
group :development do
10+
gem 'warbler', github: 'jruby/warbler', branch: 'master'
1011
gem 'jruby-jars', '< 10'
1112
end

examples/rails7/Gemfile.lock

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
GIT
2+
remote: https://github.com/jruby/warbler.git
3+
revision: 523237b6d931efcd6f13a79692f6aa46ad997443
4+
branch: master
5+
specs:
6+
warbler (2.0.5)
7+
jruby-jars (>= 9.0.0)
8+
jruby-rack (>= 1.1.1, < 1.3)
9+
ostruct (= 0.6.2)
10+
rake (>= 13.0.3)
11+
rexml (~> 3.0)
12+
rubyzip (>= 3.0.0)
13+
114
GEM
215
remote: https://rubygems.org/
316
specs:
@@ -96,6 +109,7 @@ GEM
96109
reline (>= 0.4.2)
97110
jar-dependencies (0.5.5)
98111
jruby-jars (9.4.14.0)
112+
jruby-rack (1.2.5)
99113
logger (1.7.0)
100114
loofah (2.24.1)
101115
crass (~> 1.0.2)
@@ -120,6 +134,7 @@ GEM
120134
nio4r (2.7.4-java)
121135
nokogiri (1.18.9-java)
122136
racc (~> 1.4)
137+
ostruct (0.6.2)
123138
pp (0.6.2)
124139
prettyprint
125140
prettyprint (0.2.0)
@@ -170,6 +185,8 @@ GEM
170185
psych (>= 4.0.0)
171186
reline (0.6.2)
172187
io-console (~> 0.5)
188+
rexml (3.4.4)
189+
rubyzip (3.1.1)
173190
securerandom (0.4.1)
174191
sprockets (4.2.2)
175192
concurrent-ruby (~> 1.0)
@@ -196,9 +213,10 @@ PLATFORMS
196213

197214
DEPENDENCIES
198215
jruby-jars (< 10)
199-
rack (~> 2.2.0)
216+
rack (~> 2.2.18)
200217
rails (~> 7.2.2, >= 7.2.2.2)
201218
sprockets-rails
219+
warbler!
202220

203221
RUBY VERSION
204222
ruby 3.1.7p0 (jruby 9.4.14.0)

examples/sinatra/Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ ruby '~> 3.1.0'
44

55
gem 'sinatra'
66
gem 'webrick'
7-
gem 'jruby-rack', '~> 1.2.4'
87
gem 'rack', '~> 2.2.0'
98

109
group :development do
10+
gem 'warbler', github: 'jruby/warbler', branch: 'master'
1111
gem 'jruby-jars', '< 10'
1212
end

examples/sinatra/Gemfile.lock

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
GIT
2+
remote: https://github.com/jruby/warbler.git
3+
revision: 523237b6d931efcd6f13a79692f6aa46ad997443
4+
branch: master
5+
specs:
6+
warbler (2.0.5)
7+
jruby-jars (>= 9.0.0)
8+
jruby-rack (>= 1.1.1, < 1.3)
9+
ostruct (= 0.6.2)
10+
rake (>= 13.0.3)
11+
rexml (~> 3.0)
12+
rubyzip (>= 3.0.0)
13+
114
GEM
215
remote: https://rubygems.org/
316
specs:
@@ -6,11 +19,15 @@ GEM
619
jruby-rack (1.2.5)
720
mustermann (3.0.4)
821
ruby2_keywords (~> 0.0.1)
22+
ostruct (0.6.2)
923
rack (2.2.18)
1024
rack-protection (3.2.0)
1125
base64 (>= 0.1.0)
1226
rack (~> 2.2, >= 2.2.4)
27+
rake (13.3.0)
28+
rexml (3.4.4)
1329
ruby2_keywords (0.0.5)
30+
rubyzip (3.1.1)
1431
sinatra (3.2.0)
1532
mustermann (~> 3.0)
1633
rack (~> 2.2, >= 2.2.4)
@@ -25,9 +42,9 @@ PLATFORMS
2542

2643
DEPENDENCIES
2744
jruby-jars (< 10)
28-
jruby-rack (~> 1.2.4)
2945
rack (~> 2.2.0)
3046
sinatra
47+
warbler!
3148
webrick
3249

3350
RUBY VERSION

0 commit comments

Comments
 (0)