Skip to content

Commit 463e3ba

Browse files
committed
💚 More fixes for CI
1 parent b5a8bf7 commit 463e3ba

15 files changed

+42
-32
lines changed

.rubocop_gradual.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
[78, 3, 30, "Gemspec/DependencyVersion: Dependency version specification is required.", 2010339150],
6060
[89, 3, 72, "Gemspec/DependencyVersion: Dependency version specification is required.", 2491072344]
6161
],
62-
"test/test_helper.rb:2680236708": [
63-
[199, 45, 1, "Lint/AssignmentInCondition: Wrap assignment in parentheses if intentional", 177560]
62+
"test/test_helper.rb:2983051125": [
63+
[195, 45, 1, "Lint/AssignmentInCondition: Wrap assignment in parentheses if intentional", 177560]
6464
]
6565
}

.tool-versions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ruby 3.1.6
1+
ruby 3.4.2

Gemfile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,11 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" }
1010
# Load order it important for combustion, so make sure it loads first!
1111
gem "combustion", "~> 1.5"
1212

13-
# Common Deps
14-
eval_gemfile "gemfiles/modular/common.gemfile"
13+
# Gems that have been removed from stdlib need to be added to the Gemfile explicitly
14+
gem "logger"
15+
gem "rexml"
16+
gem "mutex_m", "~> 0.2"
17+
gem "stringio", "~> 3.0"
1518

1619
# Include dependencies from <gem name>.gemspec
1720
gemspec

Gemfile.lock

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ GEM
107107
uri (>= 0.13.1)
108108
ansi (1.5.0)
109109
ast (2.4.3)
110-
backports (3.25.0)
110+
backports (3.25.1)
111111
base64 (0.2.0)
112112
benchmark (0.4.0)
113113
bigdecimal (3.1.9)
@@ -128,7 +128,7 @@ GEM
128128
debug (1.10.0)
129129
irb (~> 1.10)
130130
reline (>= 0.3.8)
131-
diff-lcs (1.6.0)
131+
diff-lcs (1.6.1)
132132
diffy (3.4.3)
133133
docile (1.4.1)
134134
drb (2.2.1)
@@ -146,13 +146,13 @@ GEM
146146
concurrent-ruby (~> 1.0)
147147
dry-core (~> 1.1)
148148
zeitwerk (~> 2.6)
149-
dry-schema (1.13.4)
149+
dry-schema (1.14.1)
150150
concurrent-ruby (~> 1.0)
151151
dry-configurable (~> 1.0, >= 1.0.1)
152-
dry-core (~> 1.0, < 2)
153-
dry-initializer (~> 3.0)
154-
dry-logic (>= 1.4, < 2)
155-
dry-types (>= 1.7, < 2)
152+
dry-core (~> 1.1)
153+
dry-initializer (~> 3.2)
154+
dry-logic (~> 1.5)
155+
dry-types (~> 1.8)
156156
zeitwerk (~> 2.6)
157157
dry-types (1.8.2)
158158
bigdecimal (~> 3.0)
@@ -202,6 +202,7 @@ GEM
202202
minitest (5.25.5)
203203
mocha (2.7.1)
204204
ruby2_keywords (>= 0.0.5)
205+
mutex_m (0.3.0)
205206
mysql2 (0.5.6)
206207
net-imap (0.5.6)
207208
date
@@ -213,18 +214,19 @@ GEM
213214
net-smtp (0.5.1)
214215
net-protocol
215216
nio4r (2.7.4)
216-
nokogiri (1.18.5-arm64-darwin)
217+
nokogiri (1.18.6-arm64-darwin)
217218
racc (~> 1.4)
218219
ostruct (0.6.1)
219220
parallel (1.26.3)
220-
parser (3.3.7.1)
221+
parser (3.3.7.2)
221222
ast (~> 2.4.1)
222223
racc
223224
pg (1.5.9)
224225
power_assert (2.0.5)
225226
pp (0.6.2)
226227
prettyprint
227228
prettyprint (0.2.0)
229+
prism (1.4.0)
228230
pry (0.15.2)
229231
coderay (~> 1.1)
230232
method_source (~> 1.0)
@@ -275,10 +277,10 @@ GEM
275277
zeitwerk (~> 2.6)
276278
rainbow (3.1.1)
277279
rake (13.2.1)
278-
rdoc (6.12.0)
280+
rdoc (6.13.0)
279281
psych (>= 4.0.0)
280-
reek (6.4.0)
281-
dry-schema (~> 1.13.0)
282+
reek (6.5.0)
283+
dry-schema (~> 1.13)
282284
logger (~> 1.6)
283285
parser (~> 3.3.0)
284286
rainbow (>= 2.0, < 4.0)
@@ -301,8 +303,9 @@ GEM
301303
rubocop-ast (>= 1.38.0, < 2.0)
302304
ruby-progressbar (~> 1.7)
303305
unicode-display_width (>= 2.4.0, < 4.0)
304-
rubocop-ast (1.40.0)
305-
parser (>= 3.3.1.0)
306+
rubocop-ast (1.43.0)
307+
parser (>= 3.3.7.2)
308+
prism (~> 1.4)
306309
rubocop-gradual (0.3.6)
307310
diff-lcs (>= 1.2.0, < 2.0)
308311
diffy (~> 3.0)
@@ -315,8 +318,9 @@ GEM
315318
version_gem (>= 1.1.2, < 3)
316319
rubocop-md (1.2.4)
317320
rubocop (>= 1.45)
318-
rubocop-packaging (0.5.2)
319-
rubocop (>= 1.33, < 2.0)
321+
rubocop-packaging (0.6.0)
322+
lint_roller (~> 1.1.0)
323+
rubocop (>= 1.72.1, < 2.0)
320324
rubocop-performance (1.24.0)
321325
lint_roller (~> 1.1)
322326
rubocop (>= 1.72.1, < 2.0)
@@ -379,7 +383,7 @@ GEM
379383
standard-custom (>= 1.0.2, < 2)
380384
standard-performance (>= 1.3.1, < 2)
381385
version_gem (>= 1.1.4, < 3)
382-
stringio (3.1.5)
386+
stringio (3.1.6)
383387
terminal-table (4.0.0)
384388
unicode-display_width (>= 1.1.1, < 4)
385389
test-unit (3.6.7)
@@ -417,6 +421,7 @@ DEPENDENCIES
417421
masq2!
418422
minitest
419423
mocha
424+
mutex_m (~> 0.2)
420425
mysql2
421426
pg
422427
pry (~> 0.14)
@@ -431,6 +436,7 @@ DEPENDENCIES
431436
rubocop-packaging (~> 0.5, >= 0.5.2)
432437
sqlite3
433438
standard (>= 1.35.1, != 1.42.0, != 1.41.1)
439+
stringio (~> 3.0)
434440
test-unit (~> 3.0)
435441
yard (~> 0.9, >= 0.9.37)
436442
yard-junk (~> 0.0, >= 0.0.10)!

gemfiles/audit.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ gem "combustion", "~> 1.5"
1010
gem "sqlite3", "~> 2.0"
1111
gem "rails", "~> 8.0.2"
1212

13-
gemspec :path => "../"
13+
gemspec path: "../"
1414

1515
eval_gemfile("modular/audit.gemfile")

gemfiles/coverage.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ gem "combustion", "~> 1.5"
1010
gem "sqlite3", "~> 2.0"
1111
gem "rails", "~> 8.0.2"
1212

13-
gemspec :path => "../"
13+
gemspec path: "../"
1414

1515
eval_gemfile("modular/coverage.gemfile")
1616

gemfiles/rails_5_2.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ gem "sqlite3", "~> 1.4"
1111
gem "rails", "~> 5.2.8.1"
1212
gem "nokogiri"
1313

14-
gemspec :path => "../"
14+
gemspec path: "../"
1515

1616
eval_gemfile("modular/mini_testing.gemfile")

gemfiles/rails_6_0.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ gem "combustion", "~> 1.5"
1010
gem "sqlite3", "~> 1.4"
1111
gem "rails", "~> 6.0.6.1"
1212

13-
gemspec :path => "../"
13+
gemspec path: "../"
1414

1515
eval_gemfile("modular/mini_testing.gemfile")

gemfiles/rails_6_1.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ gem "combustion", "~> 1.5"
1010
gem "sqlite3", "~> 1.4"
1111
gem "rails", "~> 6.1.7.10"
1212

13-
gemspec :path => "../"
13+
gemspec path: "../"
1414

1515
eval_gemfile("modular/mini_testing.gemfile")

gemfiles/rails_7_0.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ gem "combustion", "~> 1.5"
1010
gem "sqlite3", "~> 2.0"
1111
gem "rails", "~> 7.0.8.7"
1212

13-
gemspec :path => "../"
13+
gemspec path: "../"
1414

1515
eval_gemfile("modular/mini_testing.gemfile")

0 commit comments

Comments
 (0)