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

Commit e0fce07

Browse files
taglialatagliala
committed
Prepare for Rails 7.2
1 parent 2e25f12 commit e0fce07

File tree

6 files changed

+553
-80
lines changed

6 files changed

+553
-80
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.beta3"
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: 70 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -14,84 +14,79 @@ 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.beta3)
18+
actionpack (= 7.2.0.beta3)
19+
activesupport (= 7.2.0.beta3)
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.beta3)
24+
actionpack (= 7.2.0.beta3)
25+
activejob (= 7.2.0.beta3)
26+
activerecord (= 7.2.0.beta3)
27+
activestorage (= 7.2.0.beta3)
28+
activesupport (= 7.2.0.beta3)
29+
mail (>= 2.8.0)
30+
actionmailer (7.2.0.beta3)
31+
actionpack (= 7.2.0.beta3)
32+
actionview (= 7.2.0.beta3)
33+
activejob (= 7.2.0.beta3)
34+
activesupport (= 7.2.0.beta3)
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.beta3)
38+
actionview (= 7.2.0.beta3)
39+
activesupport (= 7.2.0.beta3)
4640
nokogiri (>= 1.8.5)
4741
racc
4842
rack (>= 2.2.4)
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.beta3)
49+
actionpack (= 7.2.0.beta3)
50+
activerecord (= 7.2.0.beta3)
51+
activestorage (= 7.2.0.beta3)
52+
activesupport (= 7.2.0.beta3)
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.beta3)
56+
activesupport (= 7.2.0.beta3)
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.beta3)
62+
activesupport (= 7.2.0.beta3)
6863
globalid (>= 0.3.6)
69-
activemodel (7.1.3.4)
70-
activesupport (= 7.1.3.4)
64+
activemodel (7.2.0.beta3)
65+
activesupport (= 7.2.0.beta3)
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.beta3)
71+
activemodel (= 7.2.0.beta3)
72+
activesupport (= 7.2.0.beta3)
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.beta3)
75+
actionpack (= 7.2.0.beta3)
76+
activejob (= 7.2.0.beta3)
77+
activerecord (= 7.2.0.beta3)
78+
activesupport (= 7.2.0.beta3)
8479
marcel (~> 1.0)
85-
activesupport (7.1.3.4)
80+
activesupport (7.2.0.beta3)
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+
tzinfo (~> 2.0, >= 2.0.5)
9590
addressable (2.8.7)
9691
public_suffix (>= 2.0.2, < 7.0)
9792
arbre (2.0.0)
@@ -239,6 +234,7 @@ GEM
239234
launchy (3.0.1)
240235
addressable (~> 2.8)
241236
childprocess (~> 5.0)
237+
logger (1.6.0)
242238
loofah (2.22.0)
243239
crass (~> 1.0.2)
244240
nokogiri (>= 1.12.0)
@@ -252,7 +248,6 @@ GEM
252248
mini_mime (1.1.5)
253249
minitest (5.24.1)
254250
multi_test (1.1.0)
255-
mutex_m (0.2.0)
256251
net-imap (0.4.14)
257252
date
258253
net-protocol
@@ -292,20 +287,20 @@ GEM
292287
rackup (2.1.0)
293288
rack (>= 3)
294289
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)
290+
rails (7.2.0.beta3)
291+
actioncable (= 7.2.0.beta3)
292+
actionmailbox (= 7.2.0.beta3)
293+
actionmailer (= 7.2.0.beta3)
294+
actionpack (= 7.2.0.beta3)
295+
actiontext (= 7.2.0.beta3)
296+
actionview (= 7.2.0.beta3)
297+
activejob (= 7.2.0.beta3)
298+
activemodel (= 7.2.0.beta3)
299+
activerecord (= 7.2.0.beta3)
300+
activestorage (= 7.2.0.beta3)
301+
activesupport (= 7.2.0.beta3)
307302
bundler (>= 1.15.0)
308-
railties (= 7.1.3.4)
303+
railties (= 7.2.0.beta3)
309304
rails-dom-testing (2.2.0)
310305
activesupport (>= 5.0.0)
311306
minitest
@@ -316,10 +311,10 @@ GEM
316311
rails-i18n (7.0.9)
317312
i18n (>= 0.7, < 2)
318313
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
314+
railties (7.2.0.beta3)
315+
actionpack (= 7.2.0.beta3)
316+
activesupport (= 7.2.0.beta3)
317+
irb (~> 1.13)
323318
rackup (>= 1.0.0)
324319
rake (>= 12.2)
325320
thor (~> 1.0, >= 1.2.2)
@@ -384,7 +379,7 @@ GEM
384379
rack (>= 1.1)
385380
rubocop (>= 1.33.0, < 2.0)
386381
rubocop-ast (>= 1.31.1, < 2.0)
387-
rubocop-rspec (3.0.2)
382+
rubocop-rspec (3.0.3)
388383
rubocop (~> 1.61)
389384
ruby-progressbar (1.13.0)
390385
ruby2_keywords (0.0.5)
@@ -404,10 +399,10 @@ GEM
404399
actionpack (>= 6.1)
405400
activesupport (>= 6.1)
406401
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)
402+
sqlite3 (2.0.2-aarch64-linux-gnu)
403+
sqlite3 (2.0.2-arm64-darwin)
404+
sqlite3 (2.0.2-x86_64-darwin)
405+
sqlite3 (2.0.2-x86_64-linux-gnu)
411406
stringio (3.1.1)
412407
strscan (3.1.0)
413408
sys-uname (1.3.0)
@@ -419,6 +414,7 @@ GEM
419414
tzinfo (2.0.6)
420415
concurrent-ruby (~> 1.0)
421416
unicode-display_width (2.5.0)
417+
useragent (0.16.10)
422418
warden (1.2.9)
423419
rack (>= 2.0.9)
424420
webrick (1.8.1)
@@ -455,10 +451,10 @@ DEPENDENCIES
455451
launchy
456452
parallel_tests
457453
pundit
458-
rails (~> 7.1.0)
454+
rails (~> 7.2.0.beta3)
459455
rails-i18n
460456
rake
461-
ransack (>= 4.1.0)
457+
ransack (>= 4.2.0)
462458
rspec-rails
463459
rubocop
464460
rubocop-capybara
@@ -469,7 +465,7 @@ DEPENDENCIES
469465
simplecov
470466
simplecov-cobertura
471467
sprockets-rails
472-
sqlite3 (~> 1.7)
468+
sqlite3
473469
webrick
474470
yard
475471

‎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 D439 +
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