8000 v3: Update dependencies and test against Ruby 3.4 (#8614) · activeadmin/activeadmin@73b88e1 · GitHub
[go: up one dir, main page]
Skip to content

Commit 73b88e1

Browse files
taglialatagliala
authored
v3: Update dependencies and test against Ruby 3.4 (#8614)
Update dependencies and test against Ruby 3.4 Additionally, in order to allow CI to run against all supported Ruby versions: - Lock net-imap to ~> 0.4.18 on Rails 6.1 - Lock nokogiri to ~> 1.17.2 on Rails 6.1 and Rails 7.0 - Lock securerandom to ~> 0.3.2 on Rails 6.1 and Rails 7.0 - Do not test Rails 7.1 against Ruby 3.0, change it to the oldest supported Rails version, 6.1
1 parent 8045939 commit 73b88e1

File tree

9 files changed

+152
-109
lines changed

9 files changed

+152
-109
lines changed

‎.github/workflows/ci.yaml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ jobs:
1919
fail-fast: false
2020
matrix:
2121
ruby:
22+
- 3.4
2223
- 3.3
2324
- 3.2
2425
- 3.1
@@ -33,11 +34,17 @@ jobs:
3334
include:
3435
- ruby: '3.0'
3536
os: ubuntu-latest
36-
deps: rails_71
37+
deps: rails_61
3738
exclude:
3839
- ruby: '3.1'
3940
os: ubuntu-latest
4041
deps: rails_80
42+
- ruby: '3.4'
43+
os: ubuntu-latest
44+
deps: rails_61
45+
- ruby: '3.4'
46+
os: ubuntu-latest
47+
deps: rails_70
4148
steps:
4249
- uses: actions/checkout@v4
4350
- name: Configure bundler (default)

‎Gemfile.lock

Lines changed: 27 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -116,11 +116,11 @@ GEM
116116
octokit (>= 2.2.0)
117117
childprocess (5.1.0)
118118
logger (~> 1.5)
119-
concurrent-ruby (1.3.4)
120-
connection_pool (2.4.1)
119+
concurrent-ruby (1.3.5)
120+
connection_pool (2.5.0)
121121
crass (1.0.6)
122122
csv (3.3.2)
123-
cucumber (9.2.0)
123+
cucumber (9.2.1)
124124
builder (~> 3.2)
125125
cucumber-ci-environment (> 9, < 11)
126126
cucumber-core (> 13, < 14)
@@ -141,7 +141,7 @@ GEM
141141
bigdecimal
142142
cucumber-gherkin (27.0.0)
143143
cucumber-messages (>= 19.1.4, < 23)
144-
cucumber-html-formatter (21.7.0)
144+
cucumber-html-formatter (21.8.0)
145145
cucumber-messages (> 19, < 27)
146146
cucumber-messages (22.0.0)
147147
cucumber-rails (3.1.0)
@@ -196,9 +196,9 @@ GEM
196196
has_scope (0.8.2)
197197
actionpack (>= 5.2)
198198
activesupport (>= 5.2)
199-
highline (3.1.1)
199+
highline (3.1.2)
200200
reline
201-
i18n (1.14.6)
201+
i18n (1.14.7)
202202
concurrent-ruby (~> 1.0)
203203
i18n-spec (0.6.0)
204204
iso
@@ -218,7 +218,8 @@ GEM
218218
railties (>= 6.0)
219219
responders (>= 2)
220220
io-console (0.8.0)
221-
irb (1.14.3)
221+
irb (1.15.1)
222+
pp (>= 0.6.0)
222223
rdoc (>= 4.0.0)
223224
reline (>= 0.4.2)
224225
iso (0.4.0)
@@ -242,11 +243,12 @@ GEM
242243
kaminari-core (1.2.2)
243244
kramdown (2.5.1)
244245
rexml (>= 3.3.9)
245-
language_server-protocol (3.17.0.3)
246-
launchy (3.0.1)
246+
language_server-protocol (3.17.0.4)
247+
launchy (3.1.0)
247248
addressable (~> 2.8)
248249
childprocess (~> 5.0)
249-
logger (1.6.4)
250+
logger (~> 1.6)
251+
logger (1.6.5)
250252
loofah (2.24.0)
251253
crass (~> 1.0.2)
252254
nokogiri (>= 1.12.0)
@@ -271,27 +273,29 @@ GEM
271273
net-protocol (0.2.2)
272274
timeout
273275
net-smtp (0.5.0)
274-
net-protocol
275276
netrc (0.11.0)
276277
nio4r (2.7.4)
277-
nokogiri (1.18.1)
278+
nokogiri (1.18.2)
278279
mini_portile2 (~> 2.8.2)
279280
racc (~> 1.4)
280-
nokogiri (1.18.1-arm64-darwin)
281+
nokogiri (1.18.2-arm64-darwin)
281282
racc (~> 1.4)
282-
nokogiri (1.18.1-x86_64-linux-gnu)
283+
nokogiri (1.18.2-x86_64-linux-gnu)
283284
racc (~> 1.4)
284285
octokit (9.2.0)
285286
faraday (>= 1, < 3)
286287
sawyer (~> 0.9)
287288
orm_adapter (0.5.0)
288289
parallel (1.26.3)
289-
parallel_tests (4.8.0)
290+
parallel_tests (4.9.0)
290291
parallel
291-
parser (3.3.6.0)
292+
parser (3.3.7.0)
292293
ast (~> 2.4.1)
293294
racc
294-
psych (5.2.2)
295+
pp (0.6.2)
296+
prettyprint
297+
prettyprint (0.2.0)
298+
psych (5.2.3)
295299
date
296300
stringio
297301
public_suffix (6.0.1)
@@ -344,7 +348,7 @@ GEM
344348
activerecord (>= 6.1.5)
345349
activesupport (>= 6.1.5)
346350
i18n
347-
rdoc (6.10.0)
351+
rdoc (6.11.0)
348352
psych (>= 4.0.0)
349353
regexp_parser (2.10.0)
350354
reline (0.6.0)
@@ -372,7 +376,7 @@ GEM
372376
rspec-mocks (~> 3.13)
373377
rspec-support (~> 3.13)
374378
rspec-support (3.13.2)
375-
rubocop (1.69.2)
379+
rubocop (1.71.0)
376380
json (~> 2.3)
377381
language_server-protocol (>= 3.17.0)
378382
parallel (~> 1.10)
@@ -386,12 +390,12 @@ GEM
386390
parser (>= 3.3.1.0)
387391
rubocop-packaging (0.5.2)
388392
rubocop (>= 1.33, < 2.0)
389-
rubocop-rails (2.28.0)
393+
rubocop-rails (2.29.1)
390394
activesupport (>= 4.2.0)
391395
rack (>= 1.1)
392396
rubocop (>= 1.52.0, < 2.0)
393397
rubocop-ast (>= 1.31.1, < 2.0)
394-
rubocop-rspec (3.3.0)
398+
rubocop-rspec (3.4.0)
395399
rubocop (~> 1.61)
396400
ruby-progressbar (1.13.0)
397401
ruby2_keywords (0.0.5)
@@ -433,7 +437,7 @@ GEM
433437
terminal-table (3.0.2)
434438
unicode-display_width (>= 1.1.1, < 3)
435439
thor (1.3.2)
436-
tilt (2.5.0)
440+
tilt (2.6.0)
437441
timeout (0.4.3)
438442
tzinfo (2.0.6)
439443
concurrent-ruby (~> 1.0)
@@ -494,4 +498,4 @@ DEPENDENCIES
494498
yard
495499

496500
BUNDLED WITH
497-
2.6.2
501+
2.6.3

‎docs/Gemfile.lock

Lines changed: 7 additions & 7 deletions
237
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ GEM
2525
coffee-script-source (1.12.2)
2626
colorator (1.1.0)
2727
commonmarker (0.23.11)
28-
concurrent-ruby (1.3.4)
29-
connection_pool (2.4.1)
28+
concurrent-ruby (1.3.5)
29+
connection_pool (2.5.0)
3030
csv (3.3.2)
3131
dnsruby (1.72.3)
3232
base64 (~> 0.2.0)
@@ -104,7 +104,7 @@ GEM
104104
activesupport (>= 2)
105105
nokogiri (>= 1.4)
106106
http_parser.rb (0.8.0)
107-
i18n (1.14.6)
107+
i18n (1.14.7)
108108
concurrent-ruby (~> 1.0)
109109
jekyll (3.10.0)
110110
addressable (~> 2.4)
@@ -225,7 +225,7 @@ GEM
225225
listen (3.9.0)
226226
rb-fsevent (~> 0.10, >= 0.10.3)
227227
rb-inotify (~> 0.9, >= 0.9.10)
228-
logger (1.6.4)
228+
logger (1.6.5)
229229
mercenary (0.3.6)
230230
mini_portile2 (2.8.8)
231231
minima (2.5.1)
@@ -235,7 +235,7 @@ GEM
235235
minitest (5.25.4)
236236
net-http (0.6.0)
237
uri
238-
nokogiri (1.18.1)
238+
nokogiri (1.18.2)
239239
mini_portile2 (~> 2.8.2)
240240
racc (~> 1.4)
241241
octokit (4.25.1)
@@ -250,7 +250,7 @@ GEM
250250
ffi (~> 1.0)
251251
rexml (3.4.0)
252252
rouge (3.30.0)
253-
rubyzip (2.4)
253+
rubyzip (2.4.1)
254254
safe_yaml (1.0.5)
255255
sass (3.7.4)
256256
sass-listen (~> 4.0.0)
@@ -279,4 +279,4 @@ DEPENDENCIES
279279
github-pages
280280

281281
BUNDLED WITH
282-
2.6.2
282+
2.6.3

‎gemfiles/rails_61/Gemfile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,13 @@ group :development, :test do
1717
gem "sprockets-rails"
1818
gem "sassc-rails"
1919

20+
gem "concurrent-ruby", "1.3.4" # Ref: rails/rails#54260
21+
22+
# FIXME: relax these dependencies when Ruby 3.0 support will be dropped
23+
gem "net-imap", "~> 0.4.18"
24+
gem "nokogiri", "~> 1.17.2"
25+
gem "securerandom", "~> 0.3.2"
26+
2027
# FIXME: relax this dependency when Ruby 3.1 support will be dropped
2128
gem "zeitwerk", "~> 2.6.18"
2229
end

‎gemfiles/rails_61/Gemfile.lock

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ GEM
110110
concurrent-ruby (1.3.4)
111111
crass (1.0.6)
112112
csv (3.3.2)
113-
cucumber (9.2.0)
113+
cucumber (9.2.1)
114114
builder (~> 3.2)
115115
cucumber-ci-environment (> 9, < 11)
116116
cucumber-core (> 13, < 14)
@@ -131,7 +131,7 @@ GEM
131131
bigdecimal
132132
cucumber-gherkin (27.0.0)
133133
cucumber-messages (>= 19.1.4, < 23)
134-
cucumber-html-formatter (21.7.0)
134+
cucumber-html-formatter (21.8.0)
135135
cucumber-messages (> 19, < 27)
136136
cucumber-messages (22.0.0)
137137
cucumber-rails (3.1.0)
@@ -181,9 +181,9 @@ GEM
181181
has_scope (0.8.2)
182182
actionpack (>= 5.2)
183183
activesupport (>= 5.2)
184-
highline (3.1.1)
184+
highline (3.1.2)
185185
reline
186-
i18n (1.14.6)
186+
i18n (1.14.7)
187187
concurrent-ruby (~> 1.0)
188188
i18n-spec (0.6.0)
189189
iso
@@ -211,7 +211,7 @@ GEM
211211
rails-dom-testing (>= 1, < 3)
212212
railties (>= 4.2.0)
213213
thor (>= 0.14, < 2.0)
214-
jruby-openssl (0.15.2-java)
214+
jruby-openssl (0.15.3-java)
215215
kaminari (1.2.2)
216216
activesupport (>= 4.1.0)
217217
kaminari-actionview (= 1.2.2)
@@ -224,10 +224,11 @@ GEM
224224
activerecord
225225
kaminari-core (= 1.2.2)
226226
kaminari-core (1.2.2)
227-
launchy (3.0.1)
227+
launchy (3.1.0)
228228
addressable (~> 2.8)
229229
childprocess (~> 5.0)
230-
logger (1.6.4)
230+
logger (~> 1.6)
231+
logger (1.6.5)
231232
loofah (2.24.0)
232233
crass (~> 1.0.2)
233234
nokogiri (>= 1.12.0)
@@ -243,7 +244,7 @@ GEM
243244
mini_portile2 (2.8.8)
244245
minitest (5.25.4)
245246
multi_test (1.1.0)
246-
net-imap (0.5.5)
247+
net-imap (0.4.18)
247248
date
248249
net-protocol
249250
net-pop (0.1.2)
@@ -254,20 +255,20 @@ GEM
254255
net-protocol
255256
nio4r (2.7.4)
256257
nio4r (2.7.4-java)
257-
nokogiri (1.18.1)
258+
nokogiri (1.17.2)
258259
mini_portile2 (~> 2.8.2)
259260
racc (~> 1.4)
260-
nokogiri (1.18.1-arm64-darwin)
261+
nokogiri (1.17.2-arm64-darwin)
261262
racc (~> 1.4)
262-
nokogiri (1.18.1-java)
263+
nokogiri (1.17.2-java)
263264
racc (~> 1.4)
264-
nokogiri (1.18.1-x86_64-linux-gnu)
265+
nokogiri (1.17.2-x86_64-linux)
265266
racc (~> 1.4)
266267
orm_adapter (0.5.0)
267268
parallel (1.26.3)
268-
parallel_tests (4.8.0)
269+
parallel_ 37BF tests (4.9.0)
269270
parallel
270-
parser (3.3.6.0)
271+
parser (3.3.7.0)
271272
ast (~> 2.4.1)
272273
racc
273274
public_suffix (6.0.1)
@@ -350,6 +351,7 @@ GEM
350351
sprockets (> 3.0)
351352
sprockets-rails
352353
tilt
354+
securerandom (0.3.2)
353355
simplecov (0.22.0)
354356
docile (~> 1.1)
355357
simplecov-html (~> 0.11)
@@ -375,7 +377,7 @@ GEM
375377
terminal-table (3.0.2)
376378
unicode-display_width (>= 1.1.1, < 3)
377379
thor (1.3.2)
378-
tilt (2.5.0)
380+
tilt (2.6.0)
379381
timeout (0.4.3)
380382
tzinfo (2.0.6)
381383
concurrent-ruby (~> 1.0)
@@ -405,6 +407,7 @@ DEPENDENCIES
405407
activerecord-jdbcsqlite3-adapter
406408
cancancan
407409
capybara
410+
concurrent-ruby (= 1.3.4)
408411
cucumber
409412
cucumber-rails
410413
cuprite
@@ -415,13 +418,16 @@ DEPENDENCIES
415418
i18n-tasks
416419
jruby-openssl
417420
launchy
421+
net-imap (~> 0.4.18)
422+
nokogiri (~> 1.17.2)
418423
parallel_tests
419424
pundit
420425
rails (~> 6.1.0)
421426
rails-i18n
422427
rake
423428
rspec-rails
424429
sassc-rails
430+
securerandom (~> 0.3.2)
425431
simplecov
426432
simplecov-cobertura
427433
sprockets-rails
@@ -430,4 +436,4 @@ DEPENDENCIES
430436
zeitwerk (~> 2.6.18)
431437

432438
BUNDLED WITH
433-
2.6.2
439+
2.5.23

‎gemfiles/rails_70/Gemfile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,12 @@ group :development, :test do
1515
gem "sprockets-rails"
1616
gem "sassc-rails"
1717

18+
gem "concurrent-ruby", "1.3.4" # Ref: rails/rails#54260
19+
20+
# FIXME: relax these dependencies when Ruby 3.0 support will be dropped
21+
gem "nokogiri", "~> 1.17.2"
22+
gem "securerandom", "~> 0.3.2"
23+
1824
# FIXME: relax this dependency when Ruby 3.1 support will be dropped
1925
gem "zeitwerk", "~> 2.6.18"
2026
end

0 commit comments

Comments
 (0)
0