Skip to content

Commit 2b58fd6

Browse files
authored
Remove Ruby 2.7 and 3.0 (duffn#240)
1 parent faf3938 commit 2b58fd6

File tree

12 files changed

+98
-86
lines changed

12 files changed

+98
-86
lines changed

.github/workflows/test.yml

-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ jobs:
1010
fail-fast: false
1111
matrix:
1212
ruby:
13-
- "2.7"
14-
- "3.0"
1513
- "3.1"
1614
- "3.2"
1715
runs-on: ubuntu-latest

.rubocop.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ require:
33
- rubocop-rake
44

55
AllCops:
6-
TargetRubyVersion: 2.7
6+
TargetRubyVersion: 3.1
77
NewCops: enable
88
Exclude:
99
- vendor/**/*
@@ -27,3 +27,6 @@ RSpec/ExampleLength:
2727

2828
RSpec/MultipleExpectations:
2929
Enabled: false
30+
31+
RSpecRails/HaveHttpStatus:
32+
Enabled: false

.ruby-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.7.7
1+
3.2.2

Gemfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ gem 'grape-entity', '~> 1.0.0'
1111
gem 'grape-jwt-authentication', '~> 2.2'
1212
gem 'grape_logging', '~> 1.8', '>= 1.8.4'
1313
gem 'grape-swagger', '~> 1.6'
14-
gem 'jwt', '~> 2.7'
14+
gem 'jwt', '~> 2.8'
1515
gem 'kaminari', '~> 1.2', '>= 1.2.2'
1616
gem 'otr-activerecord', '~> 2.2'
1717
gem 'pg', '~> 1.5'
1818
gem 'prometheus-client', '~> 4.2'
1919
gem 'puma', '~> 6.4'
20-
gem 'rack', '~> 2.2'
20+
gem 'rack', '~> 2.2.8'
2121
gem 'rack-cors', '~> 2.0'
2222
gem 'rake', '~> 13.1'
2323
gem 'secure_headers', '~> 6.5'
@@ -35,7 +35,7 @@ group :test do
3535
gem 'factory_bot', '~> 6.4'
3636
gem 'faker', '~> 3.2'
3737
gem 'rack-test', '~> 2.1'
38-
gem 'rspec', '~> 3.12'
38+
gem 'rspec', '~> 3.13'
3939
gem 'simplecov', '~> 0.22.0'
4040
gem 'simplecov-cobertura', '~> 2.1'
4141
gem 'timecop', '~> 0.9.8'

Gemfile.lock

+80-72
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actionview (7.1.3)
5-
activesupport (= 7.1.3)
4+
actionview (7.1.3.2)
5+
activesupport (= 7.1.3.2)
66
builder (~> 3.1)
77
erubi (~> 1.11)
88
rails-dom-testing (~> 2.2)
99
rails-html-sanitizer (~> 1.6)
10-
activemodel (7.1.3)
11-
activesupport (= 7.1.3)
12-
activerecord (7.1.3)
13-
activemodel (= 7.1.3)
14-
activesupport (= 7.1.3)
10+
activemodel (7.1.3.2)
11+
activesupport (= 7.1.3.2)
12+
activerecord (7.1.3.2)
13+
activemodel (= 7.1.3.2)
14+
activesupport (= 7.1.3.2)
1515
timeout (>= 0.4.0)
16-
activesupport (7.1.3)
16+
activesupport (7.1.3.2)
1717
base64
1818
bigdecimal
1919
concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -27,7 +27,7 @@ GEM
2727
ast (2.4.2)
2828
base64 (0.2.0)
2929
bcrypt (3.1.20)
30-
bigdecimal (3.1.5)
30+
bigdecimal (3.1.7)
3131
builder (3.2.4)
3232
bundler-audit (0.9.1)
3333
bundler (>= 1.2.0, < 3)
@@ -39,15 +39,15 @@ GEM
3939
dry-validation (~> 1.0, >= 1.0.0)
4040
connection_pool (2.4.1)
4141
crass (1.0.6)
42+
csv (3.3.0)
4243
deep_merge (1.2.2)
43-
diff-lcs (1.5.0)
44+
diff-lcs (1.5.1)
4445
docile (1.4.0)
45-
drb (2.2.0)
46-
ruby2_keywords
47-
dry-configurable (1.0.1)
46+
drb (2.2.1)
47+
dry-configurable (1.1.0)
4848
dry-core (~> 1.0, < 2)
4949
zeitwerk (~> 2.6)
50-
dry-core (1.0.0)
50+
dry-core (1.0.1)
5151
concurrent-ruby (~> 1.0)
5252
zeitwerk (~> 2.6)
5353
dry-inflector (1.0.0)
@@ -56,15 +56,16 @@ GEM
5656
concurrent-ruby (~> 1.0)
5757
dry-core (~> 1.0, < 2)
5858
zeitwerk (~> 2.6)
59-
dry-schema (1.13.2)
59+
dry-schema (1.13.3)
6060
concurrent-ruby (~> 1.0)
6161
dry-configurable (~> 1.0, >= 1.0.1)
6262
dry-core (~> 1.0, < 2)
6363
dry-initializer (~> 3.0)
6464
dry-logic (>= 1.4, < 2)
6565
dry-types (>= 1.7, < 2)
6666
zeitwerk (~> 2.6)
67-
dry-types (1.7.1)
67+
dry-types (1.7.2)
68+
bigdecimal (~> 3.0)
6869
concurrent-ruby (~> 1.0)
6970
dry-core (~> 1.0)
7071
dry-inflector (~> 1.0)
@@ -77,25 +78,25 @@ GEM
7778
dry-schema (>= 1.12, < 2)
7879
zeitwerk (~> 2.6)
7980
erubi (1.12.0)
80-
factory_bot (6.4.5)
81+
factory_bot (6.4.6)
8182
activesupport (>= 5.0.0)
82-
faker (3.2.3)
83+
faker (3.3.1)
8384
i18n (>= 1.8.11, < 2)
84-
ffi (1.15.5)
85+
ffi (1.16.3)
8586
formatador (1.1.0)
86-
grape (1.7.0)
87-
activesupport
87+
grape (1.8.0)
88+
activesupport (>= 5)
8889
builder
8990
dry-types (>= 1.1)
9091
mustermann-grape (~> 1.0.0)
9192
rack (>= 1.3.0)
9293
rack-accept
93-
grape-entity (1.0.0)
94+
grape-entity (1.0.1)
9495
activesupport (>= 3.0.0)
9596
multi_json (>= 1.3.2)
96-
grape-jwt-authentication (2.2.0)
97+
grape-jwt-authentication (2.3.0)
9798
activesupport (>= 5.2)
98-
grape (~> 1.0)
99+
grape (>= 1.0, < 3.0)
99100
httparty (>= 0.21)
100101
jwt (~> 2.6)
101102
keyless (~> 1.1)
@@ -105,7 +106,7 @@ GEM
105106
grape_logging (1.8.4)
106107
grape
107108
rack
108-
guard (2.18.0)
109+
guard (2.18.1)
109110
formatador (>= 0.2.4)
110111
listen (>= 2.7, < 4.0)
111112
lumberjack (>= 1.0.12, < 2.0)
@@ -122,13 +123,15 @@ GEM
122123
hashie (5.0.0)
123124
hashie-forbidden_attributes (0.1.1)
124125
hashie (>= 3.0)
125-
httparty (0.21.0)
126+
httparty (0.22.0)
127+
csv
126128
mini_mime (>= 1.0.0)
127129
multi_xml (>= 0.5.2)
128-
i18n (1.14.1)
130+
i18n (1.14.4)
129131
concurrent-ruby (~> 1.0)
130-
json (2.7.1)
131-
jwt (2.7.1)
132+
json (2.7.2)
133+
jwt (2.8.1)
134+
base64
132135
kaminari (1.2.2)
133136
activesupport (>= 4.1.0)
134137
kaminari-actionview (= 1.2.2)
@@ -147,36 +150,37 @@ GEM
147150
jwt (~> 2.6)
148151
recursive-open-struct (~> 1.1)
149152
language_server-protocol (3.17.0.3)
150-
listen (3.8.0)
153+
listen (3.9.0)
151154
rb-fsevent (~> 0.10, >= 0.10.3)
152155
rb-inotify (~> 0.9, >= 0.9.10)
153-
loofah (2.21.4)
156+
loofah (2.22.0)
154157
crass (~> 1.0.2)
155158
nokogiri (>= 1.12.0)
156-
lumberjack (1.2.8)
157-
method_source (1.0.0)
158-
mini_mime (1.1.2)
159-
mini_portile2 (2.8.1)
160-
minitest (5.21.1)
159+
lumberjack (1.2.10)
160+
method_source (1.1.0)
161+
mini_mime (1.1.5)
162+
mini_portile2 (2.8.6)
163+
minitest (5.22.3)
161164
multi_json (1.15.0)
162-
multi_xml (0.6.0)
165+
multi_xml (0.7.1)
166+
bigdecimal (~> 3.1)
163167
mustermann (3.0.0)
164168
ruby2_keywords (~> 0.0.1)
165169
mustermann-grape (1.0.2)
166170
mustermann (>= 1.0.0)
167171
mutex_m (0.2.0)
168172
nenv (0.3.0)
169-
nio4r (2.7.0)
170-
nokogiri (1.14.3)
171-
mini_portile2 (~> 2.8.0)
173+
nio4r (2.7.1)
174+
nokogiri (1.16.4)
175+
mini_portile2 (~> 2.8.2)
172176
racc (~> 1.4)
173-
nokogiri (1.14.3-aarch64-linux)
177+
nokogiri (1.16.4-aarch64-linux)
174178
racc (~> 1.4)
175-
nokogiri (1.14.3-arm64-darwin)
179+
nokogiri (1.16.4-arm64-darwin)
176180
racc (~> 1.4)
177-
nokogiri (1.14.3-x86_64-darwin)
181+
nokogiri (1.16.4-x86_64-darwin)
178182
racc (~> 1.4)
179-
nokogiri (1.14.3-x86_64-linux)
183+
nokogiri (1.16.4-x86_64-linux)
180184
racc (~> 1.4)
181185
notiffany (0.1.3)
182186
nenv (~> 0.1)
@@ -185,21 +189,21 @@ GEM
185189
activerecord (>= 4.0, < 7.2)
186190
hashie-forbidden_attributes (~> 0.1)
187191
parallel (1.24.0)
188-
parser (3.3.0.5)
192+
parser (3.3.1.0)
189193
ast (~> 2.4.1)
190194
racc
191-
pg (1.5.4)
195+
pg (1.5.6)
192196
prometheus-client (4.2.2)
193197
pry (0.14.2)
194198
coderay (~> 1.1)
195199
method_source (~> 1.0)
196200
puma (6.4.2)
197201
nio4r (~> 2.0)
198202
racc (1.7.3)
199-
rack (2.2.8)
203+
rack (2.2.9)
200204
rack-accept (0.4.5)
201205
rack (>= 0.4)
202-
rack-cors (2.0.1)
206+
rack-cors (2.0.2)
203207
rack (>= 2.0.0)
204208
rack-test (2.1.0)
205209
rack (>= 1.3)
@@ -211,53 +215,57 @@ GEM
211215
loofah (~> 2.21)
212216
nokogiri (~> 1.14)
213217
rainbow (3.1.1)
214-
rake (13.1.0)
218+
rake (13.2.1)
215219
rb-fsevent (0.11.2)
216220
rb-inotify (0.10.1)
217221
ffi (~> 1.0)
218222
recursive-open-struct (1.1.3)
219223
regexp_parser (2.9.0)
220224
rexml (3.2.6)
221-
rspec (3.12.0)
222-
rspec-core (~> 3.12.0)
223-
rspec-expectations (~> 3.12.0)
224-
rspec-mocks (~> 3.12.0)
225-
rspec-core (3.12.1)
226-
rspec-support (~> 3.12.0)
227-
rspec-expectations (3.12.2)
225+
rspec (3.13.0)
226+
rspec-core (~> 3.13.0)
227+
rspec-expectations (~> 3.13.0)
228+
rspec-mocks (~> 3.13.0)
229+
rspec-core (3.13.0)
230+
rspec-support (~> 3.13.0)
231+
rspec-expectations (3.13.0)
228232
diff-lcs (>= 1.2.0, < 2.0)
229-
rspec-support (~> 3.12.0)
230-
rspec-mocks (3.12.5)
233+
rspec-support (~> 3.13.0)
234+
rspec-mocks (3.13.0)
231235
diff-lcs (>= 1.2.0, < 2.0)
232-
rspec-support (~> 3.12.0)
233-
rspec-support (3.12.0)
234-
rubocop (1.60.2)
236+
rspec-support (~> 3.13.0)
237+
rspec-support (3.13.1)
238+
rubocop (1.63.4)
235239
json (~> 2.3)
236240
language_server-protocol (>= 3.17.0)
237241
parallel (~> 1.10)
238242
parser (>= 3.3.0.2)
239243
rainbow (>= 2.2.2, < 4.0)
240244
regexp_parser (>= 1.8, < 3.0)
241245
rexml (>= 3.2.5, < 4.0)
242-
rubocop-ast (>= 1.30.0, < 2.0)
246+
rubocop-ast (>= 1.31.1, < 2.0)
243247
ruby-progressbar (~> 1.7)
244248
unicode-display_width (>= 2.4.0, < 3.0)
245-
rubocop-ast (1.30.0)
246-
parser (>= 3.2.1.0)
249+
rubocop-ast (1.31.3)
250+
parser (>= 3.3.1.0)
247251
rubocop-capybara (2.20.0)
248252
rubocop (~> 1.41)
249253
rubocop-factory_bot (2.25.1)
250254
rubocop (~> 1.41)
251255
rubocop-rake (0.6.0)
252256
rubocop (~> 1.0)
253-
rubocop-rspec (2.26.1)
257+
rubocop-rspec (2.29.2)
254258
rubocop (~> 1.40)
255259
rubocop-capybara (~> 2.17)
256260
rubocop-factory_bot (~> 2.22)
261+
rubocop-rspec_rails (~> 2.28)
262+
rubocop-rspec_rails (2.28.3)
263+
rubocop (~> 1.40)
257264
ruby-progressbar (1.13.0)
258265
ruby2_keywords (0.0.5)
259266
secure_headers (6.5.0)
260-
sentry-ruby (5.16.1)
267+
sentry-ruby (5.17.3)
268+
bigdecimal
261269
concurrent-ruby (~> 1.0, >= 1.0.2)
262270
shellany (0.0.1)
263271
simplecov (0.22.0)
@@ -269,13 +277,13 @@ GEM
269277
simplecov (~> 0.19)
270278
simplecov-html (0.12.3)
271279
simplecov_json_formatter (0.1.4)
272-
thor (1.2.1)
280+
thor (1.3.1)
273281
timecop (0.9.8)
274282
timeout (0.4.1)
275283
tzinfo (2.0.6)
276284
concurrent-ruby (~> 1.0)
277285
unicode-display_width (2.5.0)
278-
zeitwerk (2.6.8)
286+
zeitwerk (2.6.13)
279287

280288
PLATFORMS
281289
aarch64-linux-musl
@@ -299,17 +307,17 @@ DEPENDENCIES
299307
grape-swagger (~> 1.6)
300308
grape_logging (~> 1.8, >= 1.8.4)
301309
guard-puma (~> 0.8.1)
302-
jwt (~> 2.7)
310+
jwt (~> 2.8)
303311
kaminari (~> 1.2, >= 1.2.2)
304312
otr-activerecord (~> 2.2)
305313
pg (~> 1.5)
306314
prometheus-client (~> 4.2)
307315
puma (~> 6.4)
308-
rack (~> 2.2)
316+
rack (~> 2.2.8)
309317
rack-cors (~> 2.0)
310318
rack-test (~> 2.1)
311319
rake (~> 13.1)
312-
rspec (~> 3.12)
320+
rspec (~> 3.13)
313321
rubocop (~> 1.60)
314322
rubocop-rake (~> 0.6.0)
315323
rubocop-rspec (~> 2.26)
@@ -320,4 +328,4 @@ DEPENDENCIES
320328
timecop (~> 0.9.8)
321329

322330
BUNDLED WITH
323-
2.3.16
331+
2.4.10

Rakefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ namespace :users do
7070
username = prompt('Username: ')
7171
password = prompt('Password: ')
7272

73-
user = User.new(username: username, password: password, email: email)
73+
user = User.new(username:, password:, email:)
7474
user.save!
7575
end
7676
end

0 commit comments

Comments
 (0)