Skip to content

Commit 934fb1e

Browse files
aogata-instaogata-inst
authored
add support for rails 7.2, drop deprecated rubies (#42)
refs AE-1724
1 parent 74fccaf commit 934fb1e

8 files changed

+273
-211
lines changed

‎.github/workflows/push.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
ruby-version: [2.7, "3.0", 3.1, 3.2]
17-
lockfile: ['Gemfile.activerecord-6.1.lock', 'Gemfile.activerecord-7.0.lock', 'Gemfile.activerecord-7.1.lock']
16+
ruby-version: [3.1, 3.2]
17+
lockfile: ['Gemfile.activerecord-6.1.lock', 'Gemfile.activerecord-7.0.lock', 'Gemfile.activerecord-7.1.lock', 'Gemfile.lock']
1818

1919
steps:
2020
- uses: actions/checkout@v3
@@ -26,4 +26,4 @@ jobs:
2626
- name: Run tests
2727
run: bundle check
2828
env:
29-
BUNDLE_LOCKFILE: ${{ matrix.lockfile }}
29+
BUNDLE_LOCKFILE: ${{ matrix.lockfile }}

‎Gemfile

+8-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
source 'https://rubygems.org/'
22

3-
plugin "bundler-multilock", "1.0.11"
3+
plugin "bundler-multilock", "1.3.4"
44
return unless Plugin.installed?("bundler-multilock")
55

66
Plugin.send(:load_plugin, "bundler-multilock")
@@ -20,4 +20,10 @@ end
2020
lockfile "activerecord-7.1" do
2121
gem "activerecord", "~> 7.1.0"
2222
gem "railties", "~> 7.1.0"
23-
end
23+
end
24+
25+
lockfile do
26+
gem "activerecord", "~> 7.2.0"
27+
gem "railties", "~> 7.2.0"
28+
end
29+

‎Gemfile.activerecord-6.1.lock

+51-45
Original file line numberDiff line numberDiff line change
@@ -1,88 +1,94 @@
11
PATH
22
remote: .
33
specs:
4-
guardrail (3.0.3)
5-
activerecord (>= 6.1, < 7.2)
6-
railties (>= 6.1, < 7.2)
4+
guardrail (3.0.4)
5+
activerecord (>= 6.1, < 8.0)
6+
railties (>= 6.1, < 8.0)
77

88
GEM
99
remote: https://rubygems.org/
1010
specs:
11-
actionpack (6.1.7.6)
12-
actionview (= 6.1.7.6)
13-
activesupport (= 6.1.7.6)
11+
actionpack (6.1.7.10)
12+
actionview (= 6.1.7.10)
13+
activesupport (= 6.1.7.10)
1414
rack (~> 2.0, >= 2.0.9)
1515
rack-test (>= 0.6.3)
1616
rails-dom-testing (~> 2.0)
1717
rails-html-sanitizer (~> 1.0, >= 1.2.0)
18-
actionview (6.1.7.6)
19-
activesupport (= 6.1.7.6)
18+
actionview (6.1.7.10)
19+
activesupport (= 6.1.7.10)
2020
builder (~> 3.1)
2121
erubi (~> 1.4)
2222
rails-dom-testing (~> 2.0)
2323
rails-html-sanitizer (~> 1.1, >= 1.2.0)
24-
activemodel (6.1.7.6)
25-
activesupport (= 6.1.7.6)
26-
activerecord (6.1.7.6)
27-
activemodel (= 6.1.7.6)
28-
activesupport (= 6.1.7.6)
29-
activesupport (6.1.7.6)
24+
activemodel (6.1.7.10)
25+
activesupport (= 6.1.7.10)
26+
activerecord (6.1.7.10)
27+
activemodel (= 6.1.7.10)
28+
activesupport (= 6.1.7.10)
29+
activesupport (6.1.7.10)
3030
concurrent-ruby (~> 1.0, >= 1.0.2)
3131
i18n (>= 1.6, < 2)
3232
minitest (>= 5.1)
3333
tzinfo (~> 2.0)
3434
zeitwerk (~> 2.3)
35-
builder (3.2.4)
36-
concurrent-ruby (1.2.2)
35+
builder (3.3.0)
36+
concurrent-ruby (1.3.5)
3737
crass (1.0.6)
38-
debug (1.8.0)
39-
irb (>= 1.5.0)
40-
reline (>= 0.3.1)
41-
erubi (1.12.0)
42-
i18n (1.14.1)
43-
concurrent-ruby (~> 1.0)
44-
io-console (0.6.0)
45-
irb (1.8.1)
46-
rdoc
38+
date (3.4.1)
39+
debug (1.10.0)
40+
irb (~> 1.10)
4741
reline (>= 0.3.8)
48-
loofah (2.21.3)
42+
erubi (1.13.1)
43+
i18n (1.14.7)
44+
concurrent-ruby (~> 1.0)
45+
io-console (0.8.0)
46+
irb (1.15.1)
47+
pp (>= 0.6.0)
48+
rdoc (>= 4.0.0)
49+
reline (>= 0.4.2)
50+
loofah (2.24.0)
4951
crass (~> 1.0.2)
5052
nokogiri (>= 1.12.0)
51-
method_source (1.0.0)
52-
mini_portile2 (2.8.4)
53-
minitest (5.20.0)
54-
nokogiri (1.15.4)
53+
method_source (1.1.0)
54+
mini_portile2 (2.8.8)
55+
minitest (5.25.4)
56+
nokogiri (1.18.3)
5557
mini_portile2 (~> 2.8.2)
5658
racc (~> 1.4)
57-
psych (5.1.0)
59+
pp (0.6.2)
60+
prettyprint
61+
prettyprint (0.2.0)
62+
psych (5.2.3)
63+
date
5864
stringio
59-
racc (1.7.1)
60-
rack (2.2.8)
61-
rack-test (2.1.0)
65+
racc (1.8.1)
66+
rack (2.2.11)
67+
rack-test (2.2.0)
6268
rack (>= 1.3)
6369
rails-dom-testing (2.2.0)
6470
activesupport (>= 5.0.0)
6571
minitest
6672
nokogiri (>= 1.6)
67-
rails-html-sanitizer (1.6.0)
73+
rails-html-sanitizer (1.6.2)
6874
loofah (~> 2.21)
69-
nokogiri (~> 1.14)
70-
railties (6.1.7.6)
71-
actionpack (= 6.1.7.6)
72-
activesupport (= 6.1.7.6)
75+
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)
76+
railties (6.1.7.10)
77+
actionpack (= 6.1.7.10)
78+
activesupport (= 6.1.7.10)
7379
method_source
7480
rake (>= 12.2)
7581
thor (~> 1.0)
76-
rake (13.0.6)
77-
rdoc (6.5.0)
82+
rake (13.2.1)
83+
rdoc (6.12.0)
7884
psych (>= 4.0.0)
79-
reline (0.3.9)
85+
reline (0.6.0)
8086
io-console (~> 0.5)
81-
stringio (3.0.8)
82-
thor (1.2.2)
87+
stringio (3.1.5)
88+
thor (1.3.2)
8389
tzinfo (2.0.6)
8490
concurrent-ruby (~> 1.0)
85-
zeitwerk (2.6.12)
91+
zeitwerk (2.6.18)
8692

8793
PLATFORMS
8894
ruby

‎Gemfile.activerecord-7.0.lock

+51-45
Original file line numberDiff line numberDiff line change
@@ -1,88 +1,94 @@
11
PATH
22
remote: .
33
specs:
4-
guardrail (3.0.3)
5-
activerecord (>= 6.1, < 7.2)
6-
railties (>= 6.1, < 7.2)
4+
guardrail (3.0.4)
5+
activerecord (>= 6.1, < 8.0)
6+
railties (>= 6.1, < 8.0)
77

88
GEM
99
remote: https://rubygems.org/
1010
specs:
11-
actionpack (7.0.8)
12-
actionview (= 7.0.8)
13-
activesupport (= 7.0.8)
11+
actionpack (7.0.8.7)
12+
actionview (= 7.0.8.7)
13+
activesupport (= 7.0.8.7)
1414
rack (~> 2.0, >= 2.2.4)
1515
rack-test (>= 0.6.3)
1616
rails-dom-testing (~> 2.0)
1717
rails-html-sanitizer (~> 1.0, >= 1.2.0)
18-
actionview (7.0.8)
19-
activesupport (= 7.0.8)
18+
actionview (7.0.8.7)
19+
activesupport (= 7.0.8.7)
2020
builder (~> 3.1)
2121
erubi (~> 1.4)
2222
rails-dom-testing (~> 2.0)
2323
rails-html-sanitizer (~> 1.1, >= 1.2.0)
24-
activemodel (7.0.8)
25-
activesupport (= 7.0.8)
26-
activerecord (7.0.8)
27-
activemodel (= 7.0.8)
28-
activesupport (= 7.0.8)
29-
activesupport (7.0.8)
24+
activemodel (7.0.8.7)
25+
activesupport (= 7.0.8.7)
26+
activerecord (7.0.8.7)
27+
activemodel (= 7.0.8.7)
28+
activesupport (= 7.0.8.7)
29+
activesupport (7.0.8.7)
3030
concurrent-ruby (~> 1.0, >= 1.0.2)
3131
i18n (>= 1.6, < 2)
3232
minitest (>= 5.1)
3333
tzinfo (~> 2.0)
34-
builder (3.2.4)
35-
concurrent-ruby (1.2.2)
34+
builder (3.3.0)
35+
concurrent-ruby (1.3.5)
3636
crass (1.0.6)
37-
debug (1.8.0)
38-
irb (>= 1.5.0)
39-
reline (>= 0.3.1)
40-
erubi (1.12.0)
41-
i18n (1.14.1)
42-
concurrent-ruby (~> 1.0)
43-
io-console (0.6.0)
44-
irb (1.8.1)
45-
rdoc
37+
date (3.4.1)
38+
debug (1.10.0)
39+
irb (~> 1.10)
4640
reline (>= 0.3.8)
47-
loofah (2.21.3)
41+
erubi (1.13.1)
42+
i18n (1.14.7)
43+
concurrent-ruby (~> 1.0)
44+
io-console (0.8.0)
45+
irb (1.15.1)
46+
pp (>= 0.6.0)
47+
rdoc (>= 4.0.0)
48+
reline (>= 0.4.2)
49+
loofah (2.24.0)
4850
crass (~> 1.0.2)
4951
nokogiri (>= 1.12.0)
50-
method_source (1.0.0)
51-
mini_portile2 (2.8.4)
52-
minitest (5.20.0)
53-
nokogiri (1.15.4)
52+
method_source (1.1.0)
53+
mini_portile2 (2.8.8)
54+
minitest (5.25.4)
55+
nokogiri (1.18.3)
5456
mini_portile2 (~> 2.8.2)
5557
racc (~> 1.4)
56-
psych (5.1.0)
58+
pp (0.6.2)
59+
prettyprint
60+
prettyprint (0.2.0)
61+
psych (5.2.3)
62+
date
5763
stringio
58-
racc (1.7.1)
59-
rack (2.2.8)
60-
rack-test (2.1.0)
64+
racc (1.8.1)
65+
rack (2.2.11)
66+
rack-test (2.2.0)
6167
rack (>= 1.3)
6268
rails-dom-testing (2.2.0)
6369
activesupport (>= 5.0.0)
6470
minitest
6571
nokogiri (>= 1.6)
66-
rails-html-sanitizer (1.6.0)
72+
rails-html-sanitizer (1.6.2)
6773
loofah (~> 2.21)
68-
nokogiri (~> 1.14)
69-
railties (7.0.8)
70-
actionpack (= 7.0.8)
71-
activesupport (= 7.0.8)
74+
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)
75+
railties (7.0.8.7)
76+
actionpack (= 7.0.8.7)
77+
activesupport (= 7.0.8.7)
7278
method_source
7379
rake (>= 12.2)
7480
thor (~> 1.0)
7581
zeitwerk (~> 2.5)
76-
rake (13.0.6)
77-
rdoc (6.5.0)
82+
rake (13.2.1)
83+
rdoc (6.12.0)
7884
psych (>= 4.0.0)
79-
reline (0.3.9)
85+
reline (0.6.0)
8086
io-console (~> 0.5)
81-
stringio (3.0.8)
82-
thor (1.2.2)
87+
stringio (3.1.5)
88+
thor (1.3.2)
8389
tzinfo (2.0.6)
8490
concurrent-ruby (~> 1.0)
85-
zeitwerk (2.6.12)
91+
zeitwerk (2.6.18)
8692

8793
PLATFORMS
8894
ruby

0 commit comments

Comments
 (0)