8000 Prepare for Rails 7.2 · activeadmin/activeadmin@c13a163 · GitHub
[go: up one dir, main page]
Skip to content

Commit c13a163

Browse files
taglialatagliala
committed
Prepare for Rails 7.2
1 parent 59a8627 commit c13a163

File tree

8 files changed

+582
-97
lines changed

8 files changed

+582
-97
lines changed

‎.github/workflows/ci.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ jobs:
2525
os:
2626
- ubuntu-latest
2727
rails:
28+
- rails_72
2829
- rails_71
2930
- rails_70
3031
- rails_61
@@ -37,11 +38,11 @@ jobs:
3738
- name: Configure bundler (default)
3839
run: |
3940
echo "BUNDLE_GEMFILE=Gemfile" >> "$GITHUB_ENV"
40-
if: matrix.rails == 'rails_71'
41+
if: matrix.rails == 'rails_72'
4142
- name: Configure bundler (alternative)
4243
run: |
4344
echo "BUNDLE_GEMFILE=gemfiles/${{ matrix.rails }}/Gemfile" >> "$GITHUB_ENV"
44-
if: matrix.rails != 'rails_71'
45+
if: matrix.rails != 'rails_72'
4546
- uses: ruby/setup-ruby@v1
4647
with:
4748
ruby-version: ${{ matrix.ruby }}

‎Gemfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ group :development, :test do
1010
gem "draper"
1111
gem "devise"
1212

13-
gem "rails", "~> 7.1.0"
13+
gem "rails", "~> 7.2.0.rc1"
1414

1515
gem "sprockets-rails"
16-
gem "ransack", ">= 4.1.0"
16+
gem "ransack", ">= 4.2.0"
1717
gem "formtastic", ">= 5.0.0"
1818

1919
gem "cssbundling-rails"
@@ -33,7 +33,7 @@ group :test do
3333
gem "launchy"
3434
gem "parallel_tests"
3535
gem "rspec-rails"
36-
gem "sqlite3", "~> 1.7", platform: :mri # FIXME: relax this dependency when rails/rails#51636 will be released
36+
gem "sqlite3", platform: :mri
3737

3838
# Translations
3939
gem "i18n-tasks"

‎Gemfile.lock

Lines changed: 80 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -14,84 +14,80 @@ PATH
1414
GEM
1515
remote: https://rubygems.org/
1616
specs:
17-
actioncable (7.1.3.4)
18-
actionpack (= 7.1.3.4)
19-
activesupport (= 7.1.3.4)
17+
actioncable (7.2.0.rc1)
18+
actionpack (= 7.2.0.rc1)
19+
activesupport (= 7.2.0.rc1)
2020
nio4r (~> 2.0)
2121
websocket-driver (>= 0.6.1)
2222
zeitwerk (~> 2.6)
23-
actionmailbox (7.1.3.4)
24-
actionpack (= 7.1.3.4)
25-
activejob (= 7.1.3.4)
26-
activerecord (= 7.1.3.4)
27-
activestorage (= 7.1.3.4)
28-
activesupport (= 7.1.3.4)
29-
mail (>= 2.7.1)
30-
net-imap
31-
net-pop
32-
net-smtp
33-
actionmailer (7.1.3.4)
34-
actionpack (= 7.1.3.4)
35-
actionview (= 7.1.3.4)
36-
activejob (= 7.1.3.4)
37-
activesupport (= 7.1.3.4)
38-
mail (~> 2.5, >= 2.5.4)
39-
net-imap
40-
net-pop
41-
net-smtp
23+
actionmailbox (7.2.0.rc1)
24+
actionpack (= 7.2.0.rc1)
25+
activejob (= 7.2.0.rc1)
26+
activerecord (= 7.2.0.rc1)
27+
activestorage (= 7.2.0.rc1)
28+
activesupport (= 7.2.0.rc1)
29+
mail (>= 2.8.0)
30+
actionmailer (7.2.0.rc1)
31+
actionpack (= 7.2.0.rc1)
32+
actionview (= 7.2.0.rc1)
33+
activejob (= 7.2.0.rc1)
34+
activesupport (= 7.2.0.rc1)
35+
mail (>= 2.8.0)
4236
rails-dom-testing (~> 2.2)
43-
actionpack (7.1.3.4)
44-
actionview (= 7.1.3.4)
45-
activesupport (= 7.1.3.4)
37+
actionpack (7.2.0.rc1)
38+
actionview (= 7.2.0.rc1)
39+
activesupport (= 7.2.0.rc1)
4640
nokogiri (>= 1.8.5)
4741
racc
48-
rack (>= 2.2.4)
42+
rack (>= 2.2.4, < 3.2)
4943
rack-session (>= 1.0.1)
5044
rack-test (>= 0.6.3)
5145
rails-dom-testing (~> 2.2)
5246
rails-html-sanitizer (~> 1.6)
53-
actiontext (7.1.3.4)
54-
actionpack (= 7.1.3.4)
55-
activerecord (= 7.1.3.4)
56-
activestorage (= 7.1.3.4)
57-
activesupport (= 7.1.3.4)
47+
useragent (~> 0.16)
48+
actiontext (7.2.0.rc1)
49+
actionpack (= 7.2.0.rc1)
50+
activerecord (= 7.2.0.rc1)
51+
activestorage (= 7.2.0.rc1)
52+
activesupport (= 7.2.0.rc1)
5853
globalid (>= 0.6.0)
5954
nokogiri (>= 1.8.5)
60-
actionview (7.1.3.4)
61-
activesupport (= 7.1.3.4)
55+
actionview (7.2.0.rc1)
56+
activesupport (= 7.2.0.rc1)
6257
builder (~> 3.1)
6358
erubi (~> 1.11)
6459
rails-dom-testing (~> 2.2)
6560
rails-html-sanitizer (~> 1.6)
66-
activejob (7.1.3.4)
67-
activesupport (= 7.1.3.4)
61+
activejob (7.2.0.rc1)
62+
activesupport (= 7.2.0.rc1)
6863
globalid (>= 0.3.6)
69-
activemodel (7.1.3.4)
70-
activesupport (= 7.1.3.4)
64+
activemodel (7.2.0.rc1)
65+
activesupport (= 7.2.0.rc1)
7166
activemodel-serializers-xml (1.0.2)
7267
activemodel (> 5.x)
7368
activesupport (> 5.x)
7469
builder (~> 3.1)
75-
activerecord (7.1.3.4)
76-
activemodel (= 7.1.3.4)
77-
activesupport (= 7.1.3.4)
70+
activerecord (7.2.0.rc1)
71+
activemodel (= 7.2.0.rc1)
72+
activesupport (= 7.2.0.rc1)
7873
timeout (>= 0.4.0)
79-
activestorage (7.1.3.4)
80-
actionpack (= 7.1.3.4)
81-
activejob (= 7.1.3.4)
82-
activerecord (= 7.1.3.4)
83-
activesupport (= 7.1.3.4)
74+
activestorage (7.2.0.rc1)
75+
actionpack (= 7.2.0.rc1)
76+
activejob (= 7.2.0.rc1)
77+
activerecord (= 7.2.0.rc1)
78+
activesupport (= 7.2.0.rc1)
8479
marcel (~> 1.0)
85-
activesupport (7.1.3.4)
80+
activesupport (7.2.0.rc1)
8681
base64
8782
bigdecimal
88-
concurrent-ruby (~> 1.0, >= 1.0.2)
83+
concurrent-ruby (~> 1.0, >= 1.3.1)
8984
connection_pool (>= 2.2.5)
9085
drb
9186
i18n (>= 1.6, < 2)
87+
logger (>= 1.4.2)
9288
minitest (>= 5.1)
93-
mutex_m
94-
tzinfo (~> 2.0)
89+
securerandom (>= 0.3)
90+
tzinfo (~> 2.0, >= 2.0.5)
9591
addressable (2.8.7)
9692
public_suffix (>= 2.0.2, < 7.0)
9793
arbre (2.0.0)
@@ -112,7 +108,8 @@ GEM
112108
rack-test (>= 0.6.3)
113109
regexp_parser (>= 1.5, < 3.0)
114110
xpath (~> 3.2)
115-
childprocess (5.0.0)
111+
childprocess (5.1.0)
112+
logger (~> 1.5)
116113
concurrent-ruby (1.3.3)
117114
connection_pool (2.4.1)
118115
crass (1.0.6)
@@ -140,7 +137,7 @@ GEM
140137
bigdecimal
141138
cucumber-gherkin (27.0.0)
142139
cucumber-messages (>= 19.1.4, < 23)
143-
cucumber-html-formatter (21.4.1)
140+
cucumber-html-formatter (21.6.0)
144141
cucumber-messages (> 19, < 25)
145142
cucumber-messages (22.0.0)
146143
cucumber-rails (3.0.0)
@@ -240,6 +237,7 @@ GEM
240237
launchy (3.0.1)
241238
addressable (~> 2.8)
242239
childprocess (~> 5.0)
240+
logger (1.6.0)
243241
loofah (2.22.0)
244242
crass (~> 1.0.2)
245243
nokogiri (>= 1.12.0)
@@ -253,7 +251,6 @@ GEM
253251
mini_mime (1.1.5)
254252
minitest (5.24.1)
255253
multi_test (1.1.0)
256-
mutex_m (0.2.0)
257254
net-imap (0.4.14)
258255
date
259256
net-protocol
@@ -273,10 +270,10 @@ GEM
273270
nokogiri (1.16.7-x86_64-linux)
274271
racc (~> 1.4)
275272
orm_adapter (0.5.0)
276-
parallel (1.25.1)
273+
parallel (1.26.1)
277274
parallel_tests (4.7.1)
278275
parallel
279-
parser (3.3.4.0)
276+
parser (3.3.4.2)
280277
ast (~> 2.4.1)
281278
racc
282279
psych (5.1.2)
@@ -293,20 +290,20 @@ GEM
293290
rackup (2.1.0)
294291
rack (>= 3)
295292
webrick (~> 1.8)
296-
rails (7.1.3.4)
297-
actioncable (= 7.1.3.4)
298-
actionmailbox (= 7.1.3.4)
299-
actionmailer (= 7.1.3.4)
300-
actionpack (= 7.1.3.4)
301-
actiontext (= 7.1.3.4)
302-
actionview (= 7.1.3.4)
303-
activejob (= 7.1.3.4)
304-
activemodel (= 7.1.3.4)
305-
activerecord (= 7.1.3.4)
306-
activestorage (= 7.1.3.4)
307-
activesupport (= 7.1.3.4)
293+
rails (7.2.0.rc1)
294+
actioncable (= 7.2.0.rc1)
295+
actionmailbox (= 7.2.0.rc1)
296+
actionmailer (= 7.2.0.rc1)
297+
actionpack (= 7.2.0.rc1)
298+
actiontext (= 7.2.0.rc1)
299+
actionview (= 7.2.0.rc1)
300+
activejob (= 7.2.0.rc1)
301+
activemodel (= 7.2.0.rc1)
302+
activerecord (= 7.2.0.rc1)
303+
activestorage (= 7.2.0.rc1)
304+
activesupport (= 7.2.0.rc1)
308305
bundler (>= 1.15.0)
309-
railties (= 7.1.3.4)
306+
railties (= 7.2.0.rc1)
310307
rails-dom-testing (2.2.0)
311308
activesupport (>= 5.0.0)
312309
minitest
@@ -317,10 +314,10 @@ GEM
317314
rails-i18n (7.0.9)
318315
i18n (>= 0.7, < 2)
319316
railties (>= 6.0.0, < 8)
320-
railties (7.1.3.4)
321-
actionpack (= 7.1.3.4)
322-
activesupport (= 7.1.3.4)
323-
irb
317+
railties (7.2.0.rc1)
318+
actionpack (= 7.2.0.rc1)
319+
activesupport (= 7.2.0.rc1)
320+
irb (~> 1.13)
324321
rackup (>= 1.0.0)
325322
rake (>= 12.2)
326323
thor (~> 1.0, >= 1.2.2)
@@ -371,7 +368,7 @@ GEM
371368
rubocop-ast (>= 1.31.1, < 2.0)
372369
ruby-progressbar (~> 1.7)
373370
unicode-display_width (>= 2.4.0, < 3.0)
374-
rubocop-ast (1.31.3)
371+
rubocop-ast (1.32.0)
375372
parser (>= 3.3.1.0)
376373
rubocop-capybara (2.21.0)
377374
rubocop (~> 1.41)
@@ -385,10 +382,11 @@ GEM
385382
rack (>= 1.1)
386383
rubocop (>= 1.33.0, < 2.0)
387384
rubocop-ast (>= 1.31.1, < 2.0)
388-
rubocop-rspec (3.0.3)
385+
rubocop-rspec (3.0.4)
389386
rubocop (~> 1.61)
390387
ruby-progressbar (1.13.0)
391388
ruby2_keywords (0.0.5)
389+
securerandom (0.3.1)
392390
simplecov (0.22.0)
393391
docile (~> 1.1)
394392
simplecov-html (~> 0.11)
@@ -405,10 +403,10 @@ GEM
405403
actionpack (>= 6.1)
406404
activesupport (>= 6.1)
407405
sprockets (>= 3.0.0)
408-
sqlite3 (1.7.3-aarch64-linux)
409-
sqlite3 (1.7.3-arm64-darwin)
410-
sqlite3 (1.7.3-x86_64-darwin)
411-
sqlite3 (1.7.3-x86_64-linux)
406+
sqlite3 (2.0.3-aarch64-linux-gnu)
407+
sqlite3 (2.0.3-arm64-darwin)
408+
sqlite3 (2.0.3-x86_64-darwin)
409+
sqlite3 (2.0.3-x86_64-linux-gnu)
412410
stringio (3.1.1)
413411
strscan (3.1.0)
414412
sys-uname (1.3.0)
@@ -420,6 +418,7 @@ GEM
420418
tzinfo (2.0.6)
421419
concurrent-ruby (~> 1.0)
422420
unicode-display_width (2.5.0)
421+
useragent (0.16.10)
423422
warden (1.2.9)
424423
rack (>= 2.0.9)
425424
webrick (1.8.1)
@@ -456,10 +455,10 @@ DEPENDENCIES
456455
launchy
457456
parallel_tests
458457
pundit
459-
rails (~> 7.1.0)
458+
rails (~> 7.2.0.rc1)
460459
rails-i18n
461460
rake
462-
ransack (>= 4.1.0)
461+
ransack (>= 4.2.0)
463462
rspec-rails
464463
rubocop
465464
rubocop-capybara
@@ -470,9 +469,9 @@ DEPENDENCIES
470469
simplecov
471470
simplecov-cobertura
472471
sprockets-rails
473-
sqlite3 (~> 1.7)
472+
sqlite3
474473
webrick
475474
yard
476475

477476
BUNDLED WITH
478-
2.5.15
477+
2.5.17

‎gemfiles/rails_61/Gemfile.lock

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,8 @@ GEM
9696
rack-test (>= 0.6.3)
9797
regexp_parser (>= 1.5, < 3.0)
9898
xpath (~> 3.2)
99-
childprocess (5.0.0)
99+
childprocess (5.1.0)
100+
logger (~> 1.5)
100101
concurrent-ruby (1.3.3)
101102
crass (1.0.6)
102103
cssbundling-rails (1.4.1)
@@ -123,7 +124,7 @@ GEM
123124
bigdecimal
124125
cucumber-gherkin (27.0.0)
125126
cucumber-messages (>= 19.1.4, < 23)
126-
cucumber-html-formatter (21.4.1)
127+
cucumber-html-formatter (21.6.0)
127128
cucumber-messages (> 19, < 25)
128129
cucumber-messages (22.0.0)
129130
cucumber-rails (3.0.0)
@@ -214,6 +215,7 @@ GEM
214215
launchy (3.0.1)
215216
addressable (~> 2.8)
216217
childprocess (~> 5.0)
218+
logger (1.6.0)
217219
loofah (2.22.0)
218220
crass (~> 1.0.2)
219221
nokogiri (>= 1.12.0)
@@ -247,10 +249,10 @@ GEM
247249
nokogiri (1.16.7-x86_64-linux)
248250
racc (~> 1.4)
249251
orm_adapter (0.5.0)
250-
parallel (1.25.1)
252+
parallel (1.26.1)
251253
parallel_tests (4.7.1)
252254
parallel
253-
parser (3.3.4.0)
255+
parser (3.3.4.2)
254256
ast (~> 2.4.1)
255257
racc
256258
public_suffix (6.0.1)
@@ -400,4 +402,4 @@ DEPENDENCIES
400402
webrick
401403

402404
BUNDLED WITH
403-
2.5.15
405+
2.5.17

0 commit comments

Comments
 (0)
0