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

Commit 2209995

Browse files
taglialatagliala
committed
Prepare for Rails 7.2
1 parent b5da5ab commit 2209995

File tree

6 files changed

+576
-93
lines changed

6 files changed

+576
-93
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: 5 additions & 4 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.beta2"
1414

1515
gem "sprockets-rails"
16-
gem "ransack", ">= 4.1.0"
16+
gem 'ransack', github: 'saltlabsinc/ransack', branch: 'delegate-alias-tracker-to-relation-1491' # TODO: activerecord-hackery/ransack#1493
1717
gem "formtastic", ">= 5.0.0"
1818

1919
gem "cssbundling-rails"
@@ -29,11 +29,12 @@ group :test do
2929
gem "simplecov-cobertura", require: false
3030
gem "cucumber-rails", require: false
3131
gem "cucumber"
32-
gem "database_cleaner-active_record"
32+
# TODO: use stable when DatabaseCleaner/database_cleaner-active_record#102 will be released
33+
gem 'database_cleaner-active_record', github: 'DatabaseCleaner/database_cleaner-active_record'
3334
gem "launchy"
3435
gem "parallel_tests"
3536
gem "rspec-rails"
36-
gem "sqlite3", "~> 1.7", platform: :mri # FIXME: relax this dependency when rails/rails#51636 will be released
37+
gem "sqlite3", platform: :mri
3738

3839
# Translations
3940
gem "i18n-tasks"

‎Gemfile.lock

Lines changed: 91 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
GIT
2+
remote: https://github.com/DatabaseCleaner/database_cleaner-active_record.git
3+
revision: 0b0bfc4175c228aa8e83990dfb24ea48dedd59f3
4+
specs:
5+
database_cleaner-active_record (2.1.0)
6+
activerecord (>= 5.a)
7+
database_cleaner-core (~> 2.0.0)
8+
9+
GIT
10+
remote: https://github.com/saltlabsinc/ransack.git
11+
revision: f32aedc8d557bd33685d3fad0c4e11e23e6ad914
12+
branch: delegate-alias-tracker-to-relation-1491
13+
specs:
14+
ransack (4.1.1)
15+
activerecord (>= 6.1.5)
16+
activesupport (>= 6.1.5)
17+
i18n
18+
119
PATH
220
remote: .
321
specs:
@@ -14,86 +32,80 @@ PATH
1432
GEM
1533
remote: https://rubygems.org/
1634
specs:
17-
actioncable (7.1.3.4)
18-
actionpack (= 7.1.3.4)
19-
activesupport (= 7.1.3.4)
35+
actioncable (7.2.0.beta2)
36+
actionpack (= 7.2.0.beta2)
37+
activesupport (= 7.2.0.beta2)
2038
nio4r (~> 2.0)
2139
websocket-driver (>= 0.6.1)
2240
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
41+
actionmailbox (7.2.0.beta2)
42+
actionpack (= 7.2.0.beta2)
43+
activejob (= 7.2.0.beta2)
44+
activerecord (= 7.2.0.beta2)
45+
activestorage (= 7.2.0.beta2)
46+
activesupport (= 7.2.0.beta2)
47+
mail (>= 2.8.0)
48+
actionmailer (7.2.0.beta2)
49+
actionpack (= 7.2.0.beta2)
50+
actionview (= 7.2.0.beta2)
51+
activejob (= 7.2.0.beta2)
52+
activesupport (= 7.2.0.beta2)
53+
mail (>= 2.8.0)
4254
rails-dom-testing (~> 2.2)
43-
actionpack (7.1.3.4)
44-
actionview (= 7.1.3.4)
45-
activesupport (= 7.1.3.4)
55+
actionpack (7.2.0.beta2)
56+
actionview (= 7.2.0.beta2)
57+
activesupport (= 7.2.0.beta2)
4658
nokogiri (>= 1.8.5)
4759
racc
4860
rack (>= 2.2.4)
4961
rack-session (>= 1.0.1)
5062
rack-test (>= 0.6.3)
5163
rails-dom-testing (~> 2.2)
5264
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)
65+
useragent (~> 0.16)
66+
actiontext (7.2.0.beta2)
67+
actionpack (= 7.2.0.beta2)
68+
activerecord (= 7.2.0.beta2)
69+
activestorage (= 7.2.0.beta2)
70+
activesupport (= 7.2.0.beta2)
5871
globalid (>= 0.6.0)
5972
nokogiri (>= 1.8.5)
60-
actionview (7.1.3.4)
61-
activesupport (= 7.1.3.4)
73+
actionview (7.2.0.beta2)
74+
activesupport (= 7.2.0.beta2)
6275
builder (~> 3.1)
6376
erubi (~> 1.11)
6477
rails-dom-testing (~> 2.2)
6578
rails-html-sanitizer (~> 1.6)
66-
activejob (7.1.3.4)
67-
activesupport (= 7.1.3.4)
79+
activejob (7.2.0.beta2)
80+
activesupport (= 7.2.0.beta2)
6881
globalid (>= 0.3.6)
69-
activemodel (7.1.3.4)
70-
activesupport (= 7.1.3.4)
82+
activemodel (7.2.0.beta2)
83+
activesupport (= 7.2.0.beta2)
7184
activemodel-serializers-xml (1.0.2)
7285
activemodel (> 5.x)
7386
activesupport (> 5.x)
7487
builder (~> 3.1)
75-
activerecord (7.1.3.4)
76-
activemodel (= 7.1.3.4)
77-
activesupport (= 7.1.3.4)
88+
activerecord (7.2.0.beta2)
89+
activemodel (= 7.2.0.beta2)
90+
activesupport (= 7.2.0.beta2)
7891
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)
92+
activestorage (7.2.0.beta2)
93+
actionpack (= 7.2.0.beta2)
94+
activejob (= 7.2.0.beta2)
95+
activerecord (= 7.2.0.beta2)
96+
activesupport (= 7.2.0.beta2)
8497
marcel (~> 1.0)
85-
activesupport (7.1.3.4)
98+
activesupport (7.2.0.beta2)
8699
base64
87100
bigdecimal
88-
concurrent-ruby (~> 1.0, >= 1.0.2)
101+
concurrent-ruby (~> 1.0, >= 1.3.1)
89102
connection_pool (>= 2.2.5)
90103
drb
91104
i18n (>= 1.6, < 2)
92105
minitest (>= 5.1)
93-
mutex_m
94-
tzinfo (~> 2.0)
95-
addressable (2.8.6)
96-
public_suffix (>= 2.0.2, < 6.0)
106+
tzinfo (~> 2.0, >= 2.0.5)
107+
addressable (2.8.7)
108+
public_suffix (>= 2.0.2, < 7.0)
97109
arbre (2.0.0)
98110
activesupport (>= 3.0.0)
99111
ruby2_keywords (>= 0.0.2)
@@ -140,7 +152,7 @@ GEM
140152
bigdecimal
141153
cucumber-gherkin (27.0.0)
142154
cucumber-messages (>= 19.1.4, < 23)
143-
cucumber-html-formatter (21.3.1)
155+
cucumber-html-formatter (21.4.0)
144156
cucumber-messages (> 19, < 25)
145157
cu F438 cumber-messages (22.0.0)
146158
cucumber-rails (3.0.0)
@@ -151,9 +163,6 @@ GEM
151163
cuprite (0.15.1)
152164
capybara (~> 3.0)
153165
ferrum (~> 0.15.0)
154-
database_cleaner-active_record (2.1.0)
155-
activerecord (>= 5.a)
156-
database_cleaner-core (~> 2.0.0)
157166
database_cleaner-core (2.0.1)
158167
date (3.3.4)
159168
devise (4.9.4)
@@ -252,8 +261,7 @@ GEM
252261
mini_mime (1.1.5)
253262
minitest (5.24.1)
254263
multi_test (1.1.0)
255-
mutex_m (0.2.0)
256-
net-imap (0.4.12)
264+
net-imap (0.4.14)
257265
date
258266
net-protocol
259267
net-pop (0.1.2)
@@ -280,7 +288,7 @@ GEM
280288
racc
281289
psych (5.1.2)
282290
stringio
283-
public_suffix (5.0.5)
291+
public_suffix (6.0.0)
284292
pundit (2.3.2)
285293
activesupport (>= 3.0.0)
286294
racc (1.8.0)
@@ -292,20 +300,20 @@ GEM
292300
rackup (2.1.0)
293301
rack (>= 3)
294302
webrick (~> 1.8)
295-
rails (7.1.3.4)
296-
actioncable (= 7.1.3.4)
297-
actionmailbox (= 7.1.3.4)
298-
actionmailer (= 7.1.3.4)
299-
actionpack (= 7.1.3.4)
300-
actiontext (= 7.1.3.4)
301-
actionview (= 7.1.3.4)
302-
activejob (= 7.1.3.4)
303-
activemodel (= 7.1.3.4)
304-
activerecord (= 7.1.3.4)
305-
activestorage (= 7.1.3.4)
306-
activesupport (= 7.1.3.4)
303+
rails (7.2.0.beta2)
304+
actioncable (= 7.2.0.beta2)
305+
actionmailbox (= 7.2.0.beta2)
306+
actionmailer (= 7.2.0.beta2)
307+
actionpack (= 7.2.0.beta2)
308+
actiontext (= 7.2.0.beta2)
309+
actionview (= 7.2.0.beta2)
310+
activejob (= 7.2.0.beta2)
311+
activemodel (= 7.2.0.beta2)
312+
activerecord (= 7.2.0.beta2)
313+
activestorage (= 7.2.0.beta2)
314+
activesupport (= 7.2.0.beta2)
307315
bundler (>= 1.15.0)
308-
railties (= 7.1.3.4)
316+
railties (= 7.2.0.beta2)
309317
rails-dom-testing (2.2.0)
310318
activesupport (>= 5.0.0)
311319
minitest
@@ -316,20 +324,16 @@ GEM
316324
rails-i18n (7.0.9)
317325
i18n (>= 0.7, < 2)
318326
railties (>= 6.0.0, < 8)
319-
railties (7.1.3.4)
320-
actionpack (= 7.1.3.4)
321-
activesupport (= 7.1.3.4)
322-
irb
327+
railties (7.2.0.beta2)
328+
actionpack (= 7.2.0.beta2)
329+
activesupport (= 7.2.0.beta2)
330+
irb (~> 1.13)
323331
rackup (>= 1.0.0)
324332
rake (>= 12.2)
325333
thor (~> 1.0, >= 1.2.2)
326334
zeitwerk (~> 2.6)
327335
rainbow (3.1.1)
328336
rake (13.2.1)
329-
ransack (4.1.1)
330-
activerecord (>= 6.1.5)
331-
activesupport (>= 6.1.5)
332-
i18n
333337
rdoc (6.7.0)
334338
psych (>= 4.0.0)
335339
regexp_parser (2.9.2)
@@ -404,10 +408,10 @@ GEM
404408
actionpack (>= 6.1)
405409
activesupport (>= 6.1)
406410
sprockets (>= 3.0.0)
407-
sqlite3 (1.7.3-aarch64-linux)
408-
sqlite3 (1.7.3-arm64-darwin)
409-
sqlite3 (1.7.3-x86_64-darwin)
410-
sqlite3 (1.7.3-x86_64-linux)
411+
sqlite3 (2.0.2-aarch64-linux-gnu)
412+
sqlite3 (2.0.2-arm64-darwin)
413+
sqlite3 (2.0.2-x86_64-darwin)
414+
sqlite3 (2.0.2-x86_64-linux-gnu)
411415
stringio (3.1.1)
412416
strscan (3.1.0)
413417
sys-uname (1.3.0)
@@ -419,6 +423,7 @@ GEM
419423
tzinfo (2.0.6)
420424
concurrent-ruby (~> 1.0)
421425
unicode-display_width (2.5.0)
426+
useragent (0.16.10)
422427
warden (1.2.9)
423428
rack (>= 2.0.9)
424429
webrick (1.8.1)
@@ -444,7 +449,7 @@ DEPENDENCIES
444449
cucumber
445450
cucumber-rails
446451
cuprite
447-
database_cleaner-active_record
452+
database_cleaner-active_record!
448453
devise
449454
draper
450455
formtastic (>= 5.0.0)
@@ -455,10 +460,10 @@ DEPENDENCIES
455460
launchy
456461
parallel_tests
457462
pundit
458-
rails (~> 7.1.0)
463+
rails (~> 7.2.0.beta2)
459464
rails-i18n
460465
rake
461-
ransack (>= 4.1.0)
466+
ransack!
462467
rspec-rails
463468
rubocop
464469
rubocop-capybara
@@ -469,7 +474,7 @@ DEPENDENCIES
469474
simplecov
470475
simplecov-cobertura
471476
sprockets-rails
472-
sqlite3 (~> 1.7)
477+
sqlite3
473478
webrick
474479
yard
475480

‎gemfiles/rails_71/Gemfile

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
# frozen_string_literal: true
2+
source "https://rubygems.org"
3+
4+
group :development, :test do
5+
gem "rake"
6+
7+
gem "cancancan"
8+
gem "pundit"
9+
10+
gem "draper"
11+
gem "devise"
12+
13+
gem "rails", "~> 7.1.0"
14+
15+
gem "sprockets-rails"
16+
17+
gem "cssbundling-rails"
18+
gem "importmap-rails"
19+
end
20+
21+
group :test do
22+
gem "cuprite"
23+
gem "capybara"
24+
gem "webrick"
25+
26+
gem "simplecov", require: false # Test coverage generator. Go to /coverage/ after running tests
27+
gem "simplecov-cobertura", require: false
28+
gem "cucumber-rails", require: false
29+
gem "cucumber"
30+
gem "database_cleaner"
31+
gem "launchy"
32+
gem "parallel_tests"
33+
gem "rspec-rails"
34+
gem "sqlite3", "~> 1.7", platform: :mri
35+
36+
# Translations
37+
gem "i18n-tasks"
38+
gem "i18n-spec"
39+
gem "rails-i18n" # Provides default i18n for many languages
40+
end
41+
42+
gemspec path: "../.."

0 commit comments

Comments
 (0)
0