Skip to content

Commit 81e0472

Browse files
Copilottagliala
Copilot
and
tagliala
authored
Drop Ruby < 3.2 compatibility (#995)
* Initial plan * Drop Ruby < 3.2 compatibility Co-authored-by: tagliala <556268+tagliala@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: tagliala <556268+tagliala@users.noreply.github.com>
1 parent 2767c43 commit 81e0472

9 files changed

Lines changed: 63 additions & 75 deletions

File tree

‎.github/workflows/ci.yaml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ jobs:
1515
fail-fast: false
1616
matrix:
1717
ruby:
18-
- "3.1"
1918
- "3.2"
2019
- "3.3"
2120
- "3.4"
@@ -27,10 +26,6 @@ jobs:
2726
- rails_80
2827
- rails_81
2928
exclude:
30-
- ruby: "3.1"
31-
rails: rails_80
32-
- ruby: "3.1"
33-
rails: rails_81
3429
- ruby: "3.4"
3530
rails: rails_70
3631
- ruby: "4.0"

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelog
22

3+
## Unreleased
4+
5+
* Drop Ruby 3.1 support
6+
37
## Version 2.1.0
48

59
* Support for setting the parent controller class [#903][]

‎gemfiles/rails_70/Gemfile‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,4 @@ group :development do
1313
gem 'simplecov', require: false
1414
gem 'simplecov-cobertura'
1515
gem 'warning'
16-
17-
# FIXME: relax this dependency when Ruby 3.1 support will be dropped
18-
gem "zeitwerk", "~> 2.6.18"
1916
end

‎gemfiles/rails_70/Gemfile.lock‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -115,16 +115,18 @@ GEM
115115
method_source (1.1.0)
116116
mini_mime (1.1.5)
117117
mini_portile2 (2.8.9)
118-
minitest (5.27.0)
118+
minitest (6.0.2)
119+
drb (~> 2.0)
120+
prism (~> 1.5)
119121
minitest-reporters (1.7.1)
120122
ansi
121123
builder
122124
minitest (>= 5.0)
123125
ruby-progressbar
124-
mocha (3.0.1)
126+
mocha (3.0.2)
125127
ruby2_keywords (>= 0.0.5)
126128
mutex_m (0.3.0)
127-
net-imap (0.5.13)
129+
net-imap (0.6.3)
128130
date
129131
net-protocol
130132
net-pop (0.1.2)
@@ -134,19 +136,20 @@ GEM
134136
net-smtp (0.5.1)
135137
net-protocol
136138
nio4r (2.7.5)
137-
nokogiri (1.18.10)
139+
nokogiri (1.19.1)
138140
mini_portile2 (~> 2.8.2)
139141
racc (~> 1.4)
140-
nokogiri (1.18.10-aarch64-linux-gnu)
142+
nokogiri (1.19.1-aarch64-linux-gnu)
141143
racc (~> 1.4)
142-
nokogiri (1.18.10-arm64-darwin)
144+
nokogiri (1.19.1-arm64-darwin)
143145
racc (~> 1.4)
144-
nokogiri (1.18.10-x86_64-darwin)
146+
nokogiri (1.19.1-x86_64-darwin)
145147
racc (~> 1.4)
146-
nokogiri (1.18.10-x86_64-linux-gnu)
148+
nokogiri (1.19.1-x86_64-linux-gnu)
147149
racc (~> 1.4)
150+
prism (1.9.0)
148151
racc (1.8.1)
149-
rack (2.2.21)
152+
rack (2.2.22)
150153
rack-test (2.2.0)
151154
rack (>= 1.3)
152155
rails (7.0.10)
@@ -171,8 +174,8 @@ GEM
171174
activesupport (>= 5.0.0)
172175
minitest
173176
nokogiri (>= 1.6)
174-
rails-html-sanitizer (1.6.2)
175-
loofah (~> 2.21)
177+
rails-html-sanitizer (1.7.0)
178+
loofah (~> 2.25)
176179
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)
177180
railties (7.0.10)
178181
actionpack (= 7.0.10)
@@ -207,7 +210,7 @@ GEM
207210
base64
208211
websocket-extensions (>= 0.1.0)
209212
websocket-extensions (0.1.5)
210-
zeitwerk (2.6.18)
213+
zeitwerk (2.7.5)
211214

212215
PLATFORMS
213216
aarch64-linux
@@ -226,7 +229,6 @@ DEPENDENCIES
226229
simplecov
227230
simplecov-cobertura
228231
warning
229-
zeitwerk (~> 2.6.18)
230232

231233
BUNDLED WITH
232-
2.6.9
234+
4.0.7

‎gemfiles/rails_71/Gemfile‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,4 @@ group :development do
1313
gem 'simplecov', require: false
1414
gem 'simplecov-cobertura'
1515
gem 'warning'
16-
17-
# FIXME: remove this dependency when Ruby 3.1 support will be dropped
18-
gem "erb", "~> 4.0"
19-
20-
# FIXME: relax this dependency when Ruby 3.1 support will be dropped
21-
gem "zeitwerk", "~> 2.6.18"
2216
end

‎gemfiles/rails_71/Gemfile.lock‎

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -96,13 +96,12 @@ GEM
9696
builder (3.3.0)
9797
cgi (0.5.1)
9898
concurrent-ruby (1.3.6)
99-
connection_pool (2.5.5)
99+
connection_pool (3.0.2)
100100
crass (1.0.6)
101101
date (3.5.1)
102102
docile (1.4.1)
103103
drb (2.2.3)
104-
erb (4.0.4)
105-
cgi (>= 0.3.3)
104+
erb (6.0.2)
106105
erubi (1.13.1)
107106
globalid (1.3.0)
108107
activesupport (>= 6.1)
@@ -112,8 +111,9 @@ GEM
112111
i18n (1.14.8)
113112
concurrent-ruby (~> 1.0)
114113
io-console (0.8.2)
115-
irb (1.16.0)
114+
irb (1.17.0)
116115
pp (>= 0.6.0)
116+
prism (>= 1.3.0)
117117
rdoc (>= 4.0.0)
118118
reline (>= 0.4.2)
119119
logger (1.7.0)
@@ -129,16 +129,18 @@ GEM
129129
marcel (1.1.0)
130130
mini_mime (1.1.5)
131131
mini_portile2 (2.8.9)
132-
minitest (5.27.0)
132+
minitest (6.0.2)
133+
drb (~> 2.0)
134+
prism (~> 1.5)
133135
minitest-reporters (1.7.1)
134136
ansi
135137
builder
136138
minitest (>= 5.0)
137139
ruby-progressbar
138-
mocha (3.0.1)
140+
mocha (3.0.2)
139141
ruby2_keywords (>= 0.0.5)
140142
mutex_m (0.3.0)
141-
net-imap (0.5.13)
143+
net-imap (0.6.3)
142144
date
143145
net-protocol
144146
net-pop (0.1.2)
@@ -148,25 +150,26 @@ GEM
148150
net-smtp (0.5.1)
149151
net-protocol
150152
nio4r (2.7.5)
151-
nokogiri (1.18.10)
153+
nokogiri (1.19.1)
152154
mini_portile2 (~> 2.8.2)
153155
racc (~> 1.4)
154-
nokogiri (1.18.10-aarch64-linux-gnu)
156+
nokogiri (1.19.1-aarch64-linux-gnu)
155157
racc (~> 1.4)
156-
nokogiri (1.18.10-arm64-darwin)
158+
nokogiri (1.19.1-arm64-darwin)
157159
racc (~> 1.4)
158-
nokogiri (1.18.10-x86_64-darwin)
160+
nokogiri (1.19.1-x86_64-darwin)
159161
racc (~> 1.4)
160-
nokogiri (1.18.10-x86_64-linux-gnu)
162+
nokogiri (1.19.1-x86_64-linux-gnu)
161163
racc (~> 1.4)
162164
pp (0.6.3)
163165
prettyprint
164166
prettyprint (0.2.0)
167+
prism (1.9.0)
165168
psych (5.3.1)
166169
date
167170
stringio
168171
racc (1.8.1)
169-
rack (3.2.4)
172+
rack (3.2.5)
170173
rack-session (2.1.1)
171174
base64 (>= 0.1.0)
172175
rack (>= 3.0.0)
@@ -196,8 +199,8 @@ GEM
196199
activesupport (>= 5.0.0)
197200
minitest
198201
nokogiri (>= 1.6)
199-
rails-html-sanitizer (1.6.2)
200-
loofah (~> 2.21)
202+
rails-html-sanitizer (1.7.0)
203+
loofah (~> 2.25)
201204
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)
202205
railties (7.1.6)
203206
actionpack (= 7.1.6)
@@ -210,7 +213,7 @@ GEM
210213
tsort (>= 0.2)
211214
zeitwerk (~> 2.6)
212215
rake (13.3.1)
213-
rdoc (7.1.0)
216+
rdoc (7.2.0)
214217
erb
215218
psych (>= 4.0.0)
216219
tsort
@@ -243,7 +246,7 @@ GEM
243246
base64
244247
websocket-extensions (>= 0.1.0)
245248
websocket-extensions (0.1.5)
246-
zeitwerk (2.6.18)
249+
zeitwerk (2.7.5)
247250

248251
PLATFORMS
249252
aarch64-linux
@@ -253,7 +256,6 @@ PLATFORMS
253256
x86_64-linux
254257

255258
DEPENDENCIES
256-
erb (~> 4.0)
257259
inherited_resources!
258260
minitest
259261
minitest-reporters
@@ -263,7 +265,6 @@ DEPENDENCIES
263265
simplecov
264266
simplecov-cobertura
265267
warning
266-
zeitwerk (~> 2.6.18)
267268

268269
BUNDLED WITH
269-
2.6.9
270+
4.0.7

‎gemfiles/rails_72/Gemfile‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,4 @@ group :development do
1313
gem 'simplecov', require: false
1414
gem 'simplecov-cobertura'
1515
gem 'warning'
16-
17-
# FIXME: remove this dependency when Ruby 3.1 support will be dropped
18-
gem "erb", "~> 4.0"
19-
20-
# FIXME: relax this dependency when Ruby 3.1 support will be dropped
21-
gem "zeitwerk", "~> 2.6.18"
2216
end

‎gemfiles/rails_72/Gemfile.lock‎

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,12 @@ GEM
9090
builder (3.3.0)
9191
cgi (0.5.1)
9292
concurrent-ruby (1.3.6)
93-
connection_pool (2.5.5)
93+
connection_pool (3.0.2)
9494
crass (1.0.6)
9595
date (3.5.1)
9696
docile (1.4.1)
9797
drb (2.2.3)
98-
erb (4.0.4)
99-
cgi (>= 0.3.3)
98+
erb (6.0.2)
10099
erubi (1.13.1)
101100
globalid (1.3.0)
102101
activesupport (>= 6.1)
@@ -106,8 +105,9 @@ GEM
106105
i18n (1.14.8)
107106
concurrent-ruby (~> 1.0)
108107
io-console (0.8.2)
109-
irb (1.16.0)
108+
irb (1.17.0)
110109
pp (>= 0.6.0)
110+
prism (>= 1.3.0)
111111
rdoc (>= 4.0.0)
112112
reline (>= 0.4.2)
113113
logger (1.7.0)
@@ -123,15 +123,17 @@ GEM
123123
marcel (1.1.0)
124124
mini_mime (1.1.5)
125125
mini_portile2 (2.8.9)
126-
minitest (5.27.0)
126+
minitest (6.0.2)
127+
drb (~> 2.0)
128+
prism (~> 1.5)
127129
minitest-reporters (1.7.1)
128130
ansi
129131
builder
130132
minitest (>= 5.0)
131133
ruby-progressbar
132-
mocha (3.0.1)
134+
mocha (3.0.2)
133135
ruby2_keywords (>= 0.0.5)
134-
net-imap (0.5.13)
136+
net-imap (0.6.3)
135137
date
136138
net-protocol
137139
net-pop (0.1.2)
@@ -141,25 +143,26 @@ GEM
141143
net-smtp (0.5.1)
142144
net-protocol
143145
nio4r (2.7.5)
144-
nokogiri (1.18.10)
146+
nokogiri (1.19.1)
145147
mini_portile2 (~> 2.8.2)
146148
racc (~> 1.4)
147-
nokogiri (1.18.10-aarch64-linux-gnu)
149+
nokogiri (1.19.1-aarch64-linux-gnu)
148150
racc (~> 1.4)
149-
nokogiri (1.18.10-arm64-darwin)
151+
nokogiri (1.19.1-arm64-darwin)
150152
racc (~> 1.4)
151-
nokogiri (1.18.10-x86_64-darwin)
153+
nokogiri (1.19.1-x86_64-darwin)
152154
racc (~> 1.4)
153-
nokogiri (1.18.10-x86_64-linux-gnu)
155+
nokogiri (1.19.1-x86_64-linux-gnu)
154156
racc (~> 1.4)
155157
pp (0.6.3)
156158
prettyprint
157159
prettyprint (0.2.0)
160+
prism (1.9.0)
158161
psych (5.3.1)
159162
date
160163
stringio
161164
racc (1.8.1)
162-
rack (3.2.4)
165+
rack (3.2.5)
163166
rack-session (2.1.1)
164167
base64 (>= 0.1.0)
165168
rack (>= 3.0.0)
@@ -189,8 +192,8 @@ GEM
189192
activesupport (>= 5.0.0)
190193
minitest
191194
nokogiri (>= 1.6)
192-
rails-html-sanitizer (1.6.2)
193-
loofah (~> 2.21)
195+
rails-html-sanitizer (1.7.0)
196+
loofah (~> 2.25)
194197
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)
195198
railties (7.2.3)
196199
actionpack (= 7.2.3)
@@ -203,7 +206,7 @@ GEM
203206
tsort (>= 0.2)
204207
zeitwerk (~> 2.6)
205208
rake (13.3.1)
206-
rdoc (7.1.0)
209+
rdoc (7.2.0)
207210
erb
208211
psych (>= 4.0.0)
209212
tsort
@@ -237,7 +240,7 @@ GEM
237240
base64
238241
websocket-extensions (>= 0.1.0)
239242
websocket-extensions (0.1.5)
240-
zeitwerk (2.6.18)
243+
zeitwerk (2.7.5)
241244

242245
PLATFORMS
243246
aarch64-linux
@@ -247,7 +250,6 @@ PLATFORMS
247250
x86_64-linux
248251

249252
DEPENDENCIES
250-
erb (~> 4.0)
251253
inherited_resources!
252254
minitest
253255
minitest-reporters
@@ -257,7 +259,6 @@ DEPENDENCIES
257259
simplecov
258260
simplecov-cobertura
259261
warning
260-
zeitwerk (~> 2.6.18)
261262

262263
BUNDLED WITH
263-
2.6.9
264+
4.0.7

0 commit comments

Comments
 (0)