Skip to content

Commit 44243b1

Browse files
committed
Fix CI and update dependencies
Ref: rails/rails#54260
1 parent f9b6fb7 commit 44243b1

File tree

5 files changed

+107
-100
lines changed

5 files changed

+107
-100
lines changed

Gemfile.lock

+77-73
Original file line numberDiff line numberDiff line change
@@ -10,65 +10,65 @@ PATH
1010
GEM
1111
remote: https://rubygems.org/
1212
specs:
13-
actioncable (8.0.1)
14-
actionpack (= 8.0.1)
15-
activesupport (= 8.0.1)
13+
actioncable (8.0.2)
14+
actionpack (= 8.0.2)
15+
activesupport (= 8.0.2)
1616
nio4r (~> 2.0)
1717
websocket-driver (>= 0.6.1)
1818
zeitwerk (~> 2.6)
19-
actionmailbox (8.0.1)
20-
actionpack (= 8.0.1)
21-
activejob (= 8.0.1)
22-
activerecord (= 8.0.1)
23-
activestorage (= 8.0.1)
24-
activesupport (= 8.0.1)
19+
actionmailbox (8.0.2)
20+
actionpack (= 8.0.2)
21+
activejob (= 8.0.2)
22+
activerecord (= 8.0.2)
23+
activestorage (= 8.0.2)
24+
activesupport (= 8.0.2)
2525
mail (>= 2.8.0)
26-
actionmailer (8.0.1)
27-
actionpack (= 8.0.1)
28-
actionview (= 8.0.1)
29-
activejob (= 8.0.1)
30-
activesupport (= 8.0.1)
26+
actionmailer (8.0.2)
27+
actionpack (= 8.0.2)
28+
actionview (= 8.0.2)
29+
activejob (= 8.0.2)
30+
activesupport (= 8.0.2)
3131
mail (>= 2.8.0)
3232
rails-dom-testing (~> 2.2)
33-
actionpack (8.0.1)
34-
actionview (= 8.0.1)
35-
activesupport (= 8.0.1)
33+
actionpack (8.0.2)
34+
actionview (= 8.0.2)
35+
activesupport (= 8.0.2)
3636
nokogiri (>= 1.8.5)
3737
rack (>= 2.2.4)
3838
rack-session (>= 1.0.1)
3939
rack-test (>= 0.6.3)
4040
rails-dom-testing (~> 2.2)
4141
rails-html-sanitizer (~> 1.6)
4242
useragent (~> 0.16)
43-
actiontext (8.0.1)
44-
actionpack (= 8.0.1)
45-
activerecord (= 8.0.1)
46-
activestorage (= 8.0.1)
47-
activesupport (= 8.0.1)
43+
actiontext (8.0.2)
44+
actionpack (= 8.0.2)
45+
activerecord (= 8.0.2)
46+
activestorage (= 8.0.2)
47+
activesupport (= 8.0.2)
4848
globalid (>= 0.6.0)
4949
nokogiri (>= 1.8.5)
50-
actionview (8.0.1)
51-
activesupport (= 8.0.1)
50+
actionview (8.0.2)
51+
activesupport (= 8.0.2)
5252
builder (~> 3.1)
5353
erubi (~> 1.11)
5454
rails-dom-testing (~> 2.2)
5555
rails-html-sanitizer (~> 1.6)
56-
activejob (8.0.1)
57-
activesupport (= 8.0.1)
56+
activejob (8.0.2)
57+
activesupport (= 8.0.2)
5858
globalid (>= 0.3.6)
59-
activemodel (8.0.1)
60-
activesupport (= 8.0.1)
61-
activerecord (8.0.1)
62-
activemodel (= 8.0.1)
63-
activesupport (= 8.0.1)
59+
activemodel (8.0.2)
60+
activesupport (= 8.0.2)
61+
activerecord (8.0.2)
62+
activemodel (= 8.0.2)
63+
activesupport (= 8.0.2)
6464
timeout (>= 0.4.0)
65-
activestorage (8.0.1)
66-
actionpack (= 8.0.1)
67-
activejob (= 8.0.1)
68-
activerecord (= 8.0.1)
69-
activesupport (= 8.0.1)
65+
activestorage (8.0.2)
66+
actionpack (= 8.0.2)
67+
activejob (= 8.0.2)
68+
activerecord (= 8.0.2)
69+
activesupport (= 8.0.2)
7070
marcel (~> 1.0)
71-
activesupport (8.0.1)
71+
activesupport (8.0.2)
7272
base64
7373
benchmark (>= 0.3)
7474
bigdecimal
@@ -106,8 +106,9 @@ GEM
106106
pp (>= 0.6.0)
107107
rdoc (>= 4.0.0)
108108
reline (>= 0.4.2)
109-
json (2.10.1)
109+
json (2.10.2)
110110
language_server-protocol (3.17.0.4)
111+
lint_roller (1.1.0)
111112
logger (1.6.6)
112113
loofah (2.24.0)
113114
crass (~> 1.0.2)
@@ -120,7 +121,7 @@ GEM
120121
marcel (1.0.4)
121122
mini_mime (1.1.5)
122123
mini_portile2 (2.8.8)
123-
minitest (5.25.4)
124+
minitest (5.25.5)
124125
minitest-reporters (1.7.1)
125126
ansi
126127
builder
@@ -138,16 +139,16 @@ GEM
138139
net-smtp (0.5.1)
139140
net-protocol
140141
nio4r (2.7.4)
141-
nokogiri (1.18.3)
142+
nokogiri (1.18.4)
142143
mini_portile2 (~> 2.8.2)
143144
racc (~> 1.4)
144-
nokogiri (1.18.3-aarch64-linux-gnu)
145+
nokogiri (1.18.4-aarch64-linux-gnu)
145146
racc (~> 1.4)
146-
nokogiri (1.18.3-arm64-darwin)
147+
nokogiri (1.18.4-arm64-darwin)
147148
racc (~> 1.4)
148-
nokogiri (1.18.3-x86_64-darwin)
149+
nokogiri (1.18.4-x86_64-darwin)
149150
racc (~> 1.4)
150-
nokogiri (1.18.3-x86_64-linux-gnu)
151+
nokogiri (1.18.4-x86_64-linux-gnu)
151152
racc (~> 1.4)
152153
parallel (1.26.3)
153154
parser (3.3.7.1)
@@ -160,28 +161,28 @@ GEM
160161
date
161162
stringio
162163
racc (1.8.1)
163-
rack (3.1.10)
164+
rack (3.1.12)
164165
rack-session (2.1.0)
165166
base64 (>= 0.1.0)
166167
rack (>= 3.0.0)
167168
rack-test (2.2.0)
168169
rack (>= 1.3)
169170
rackup (2.2.1)
170171
rack (>= 3)
171-
rails (8.0.1)
172-
actioncable (= 8.0.1)
173-
actionmailbox (= 8.0.1)
174-
actionmailer (= 8.0.1)
175-
actionpack (= 8.0.1)
176-
actiontext (= 8.0.1)
177-
actionview (= 8.0.1)
178-
activejob (= 8.0.1)
179-
activemodel (= 8.0.1)
180-
activerecord (= 8.0.1)
181-
activestorage (= 8.0.1)
182-
activesupport (= 8.0.1)
172+
rails (8.0.2)
173+
actioncable (= 8.0.2)
174+
actionmailbox (= 8.0.2)
175+
actionmailer (= 8.0.2)
176+
actionpack (= 8.0.2)
177+
actiontext (= 8.0.2)
178+
actionview (= 8.0.2)
179+
activejob (= 8.0.2)
180+
activemodel (= 8.0.2)
181+
activerecord (= 8.0.2)
182+
activestorage (= 8.0.2)
183+
activesupport (= 8.0.2)
183184
bundler (>= 1.15.0)
184-
railties (= 8.0.1)
185+
railties (= 8.0.2)
185186
rails-controller-testing (1.0.5)
186187
actionpack (>= 5.0.1.rc1)
187188
actionview (>= 5.0.1.rc1)
@@ -193,9 +194,9 @@ GEM
193194
rails-html-sanitizer (1.6.2)
194195
loofah (~> 2.21)
195196
nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
196-
railties (8.0.1)
197-
actionpack (= 8.0.1)
198-
activesupport (= 8.0.1)
197+
railties (8.0.2)
198+
actionpack (= 8.0.2)
199+
activesupport (= 8.0.2)
199200
irb (~> 1.13)
200201
rackup (>= 1.0.0)
201202
rake (>= 12.2)
@@ -212,26 +213,29 @@ GEM
212213
actionpack (>= 5.2)
213214
railties (>= 5.2)
214215
rexml (3.4.1)
215-
rubocop (1.71.2)
216+
rubocop (1.74.0)
216217
json (~> 2.3)
217-
language_server-protocol (>= 3.17.0)
218+
language_server-protocol (~> 3.17.0.2)
219+
lint_roller (~> 1.1.0)
218220
parallel (~> 1.10)
219221
parser (>= 3.3.0.2)
220222
rainbow (>= 2.2.2, < 4.0)
221223
regexp_parser (>= 2.9.3, < 3.0)
222224
rubocop-ast (>= 1.38.0, < 2.0)
223225
ruby-progressbar (~> 1.7)
224226
unicode-display_width (>= 2.4.0, < 4.0)
225-
rubocop-ast (1.38.0)
227+
rubocop-ast (1.39.0)
226228
parser (>= 3.3.1.0)
227-
rubocop-minitest (0.36.0)
228-
rubocop (>= 1.61, < 2.0)
229-
rubocop-ast (>= 1.31.1, < 2.0)
229+
rubocop-minitest (0.37.1)
230+
lint_roller (~> 1.1)
231+
rubocop (>= 1.72.1, < 2.0)
232+
rubocop-ast (>= 1.38.0, < 2.0)
230233
rubocop-packaging (0.5.2)
231234
rubocop (>= 1.33, < 2.0)
232-
rubocop-performance (1.23.1)
233-
rubocop (>= 1.48.1, < 2.0)
234-
rubocop-ast (>= 1.31.1, < 2.0)
235+
rubocop-performance (1.24.0)
236+
lint_roller (~> 1.1)
237+
rubocop (>= 1.72.1, < 2.0)
238+
rubocop-ast (>= 1.38.0, < 2.0)
235239
ruby-progressbar (1.13.0)
236240
ruby2_keywords (0.0.5)
237241
securerandom (0.4.1)
@@ -244,15 +248,15 @@ GEM
244248
simplecov (~> 0.19)
245249
simplecov-html (0.13.1)
246250
simplecov_json_formatter (0.1.4)
247-
stringio (3.1.3)
251+
stringio (3.1.5)
248252
thor (1.3.2)
249253
timeout (0.4.3)
250254
tzinfo (2.0.6)
251255
concurrent-ruby (~> 1.0)
252256
unicode-display_width (3.1.4)
253257
unicode-emoji (~> 4.0, >= 4.0.4)
254258
unicode-emoji (4.0.4)
255-
uri (1.0.2)
259+
uri (1.0.3)
256260
useragent (0.16.11)
257261
warning (1.5.0)
258262
websocket-driver (0.7.7)
@@ -284,4 +288,4 @@ DEPENDENCIES
284288
warning
285289

286290
BUNDLED WITH
287-
2.6.3
291+
2.6.6

gemfiles/rails_70/Gemfile

+2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ group :development do
1414
gem 'simplecov-cobertura'
1515
gem 'warning'
1616

17+
gem "concurrent-ruby", "1.3.4" # Ref: rails/rails#54260
18+
1719
# FIXME: relax this dependency when Ruby 3.1 support will be dropped
1820
gem "zeitwerk", "~> 2.6.18"
1921
end

gemfiles/rails_70/Gemfile.lock

+10-9
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ GEM
7878
ansi (1.5.0)
7979
base64 (0.2.0)
8080
builder (3.3.0)
81-
concurrent-ruby (1.3.5)
81+
concurrent-ruby (1.3.4)
8282
crass (1.0.6)
8383
date (3.4.1)
8484
docile (1.4.1)
@@ -102,7 +102,7 @@ GEM
102102
method_source (1.1.0)
103103
mini_mime (1.1.5)
104104
mini_portile2 (2.8.8)
105-
minitest (5.25.4)
105+
minitest (5.25.5)
106106
minitest-reporters (1.7.1)
107107
ansi
108108
builder
@@ -120,19 +120,19 @@ GEM
120120
net-smtp (0.5.1)
121121
net-protocol
122122
nio4r (2.7.4)
123-
nokogiri (1.18.3)
123+
nokogiri (1.18.4)
124124
mini_portile2 (~> 2.8.2)
125125
racc (~> 1.4)
126-
nokogiri (1.18.3-aarch64-linux-gnu)
126+
nokogiri (1.18.4-aarch64-linux-gnu)
127127
racc (~> 1.4)
128-
nokogiri (1.18.3-arm64-darwin)
128+
nokogiri (1.18.4-arm64-darwin)
129129
racc (~> 1.4)
130-
nokogiri (1.18.3-x86_64-darwin)
130+
nokogiri (1.18.4-x86_64-darwin)
131131
racc (~> 1.4)
132-
nokogiri (1.18.3-x86_64-linux-gnu)
132+
nokogiri (1.18.4-x86_64-linux-gnu)
133133
racc (~> 1.4)
134134
racc (1.8.1)
135-
rack (2.2.11)
135+
rack (2.2.13)
136136
rack-test (2.2.0)
137137
rack (>= 1.3)
138138
rails (7.0.8.7)
@@ -202,6 +202,7 @@ PLATFORMS
202202
x86_64-linux
203203

204204
DEPENDENCIES
205+
concurrent-ruby (= 1.3.4)
205206
inherited_resources!
206207
minitest
207208
minitest-reporters
@@ -214,4 +215,4 @@ DEPENDENCIES
214215
zeitwerk (~> 2.6.18)
215216

216217
BUNDLED WITH
217-
2.6.3
218+
2.6.6

gemfiles/rails_71/Gemfile.lock

+9-9
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ GEM
123123
marcel (1.0.4)
124124
mini_mime (1.1.5)
125125
mini_portile2 (2.8.8)
126-
minitest (5.25.4)
126+
minitest (5.25.5)
127127
minitest-reporters (1.7.1)
128128
ansi
129129
builder
@@ -142,16 +142,16 @@ GEM
142142
net-smtp (0.5.1)
143143
net-protocol
144144
nio4r (2.7.4)
145-
nokogiri (1.18.3)
145+
nokogiri (1.18.4)
146146
mini_portile2 (~> 2.8.2)
147147
racc (~> 1.4)
148-
nokogiri (1.18.3-aarch64-linux-gnu)
148+
nokogiri (1.18.4-aarch64-linux-gnu)
149149
racc (~> 1.4)
150-
nokogiri (1.18.3-arm64-darwin)
150+
nokogiri (1.18.4-arm64-darwin)
151151
racc (~> 1.4)
152-
nokogiri (1.18.3-x86_64-darwin)
152+
nokogiri (1.18.4-x86_64-darwin)
153153
racc (~> 1.4)
154-
nokogiri (1.18.3-x86_64-linux-gnu)
154+
nokogiri (1.18.4-x86_64-linux-gnu)
155155
racc (~> 1.4)
156156
pp (0.6.2)
157157
prettyprint
@@ -160,7 +160,7 @@ GEM
160160
date
161161
stringio
162162
racc (1.8.1)
163-
rack (3.1.10)
163+
rack (3.1.12)
164164
rack-session (2.1.0)
165165
base64 (>= 0.1.0)
166166
rack (>= 3.0.0)
@@ -222,7 +222,7 @@ GEM
222222
simplecov (~> 0.19)
223223
simplecov-html (0.13.1)
224224
simplecov_json_formatter (0.1.4)
225-
stringio (3.1.3)
225+
stringio (3.1.5)
226226
thor (1.3.2)
227227
timeout (0.4.3)
228228
tzinfo (2.0.6)
@@ -254,4 +254,4 @@ DEPENDENCIES
254254
zeitwerk (~> 2.6.18)
255255

256256
BUNDLED WITH
257-
2.6.3
257+
2.6.6

0 commit comments

Comments
 (0)