Skip to content

Commit 9a7bc1d

Browse files
authored
Merge pull request #692 from Shopify/dependabot/bundler/rubocop-1.72.2
Bump rubocop from 1.63.4 to 1.72.2
2 parents d264927 + 6ca8323 commit 9a7bc1d

File tree

4 files changed

+56
-3
lines changed

4 files changed

+56
-3
lines changed

.github/workflows/dump-config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- name: Setup Ruby
3131
uses: ruby/setup-ruby@v1
3232
with:
33-
ruby-version: '3.2.0'
33+
ruby-version: '3.4.1'
3434
bundler-cache: true
3535

3636
- name: Dump config

Gemfile.lock

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ GEM
1414
diffy (3.4.3)
1515
json (2.10.1)
1616
language_server-protocol (3.17.0.4)
17+
lint_roller (1.1.0)
1718
method_source (1.0.0)
1819
minitest (5.25.4)
1920
parallel (1.26.3)
@@ -30,9 +31,10 @@ GEM
3031
rainbow (3.1.1)
3132
rake (13.2.1)
3233
regexp_parser (2.10.0)
33-
rubocop (1.71.2)
34+
rubocop (1.72.2)
3435
json (~> 2.3)
35-
language_server-protocol (>= 3.17.0)
36+
language_server-protocol (~> 3.17.0.2)
37+
lint_roller (~> 1.1.0)
3638
parallel (~> 1.10)
3739
parser (>= 3.3.0.2)
3840
rainbow (>= 2.2.2, < 4.0)

rubocop.yml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -371,6 +371,11 @@ Lint/ConstantReassignment:
371371
Enabled: false
372372
<% end %>
373373

374+
<% if rubocop_version >= "1.72" %>
375+
Lint/CopDirectiveSyntax:
376+
Enabled: false
377+
<% end %>
378+
374379
Lint/Debugger:
375380
Enabled: false
376381

@@ -608,6 +613,11 @@ Lint/RedundantSplatExpansion:
608613
Lint/RedundantStringCoercion:
609614
Enabled: false
610615

616+
<% if rubocop_version >= "1.72" %>
617+
Lint/RedundantTypeConversion:
618+
Enabled: false
619+
<% end %>
620+
611621
Lint/RedundantWithIndex:
612622
Enabled: false
613623

@@ -676,6 +686,11 @@ Lint/StructNewOverride:
676686
Lint/SuppressedException:
677687
Enabled: false
678688

689+
<% if rubocop_version >= "1.72" %>
690+
Lint/SuppressedExceptionInNumberConversion:
691+
Enabled: false
692+
<% end %>
693+
679694
Lint/SymbolConversion:
680695
Enabled: false
681696

@@ -735,6 +750,11 @@ Lint/UselessAccessModifier:
735750
Lint/UselessAssignment:
736751
Enabled: false
737752

753+
<% if rubocop_version >= "1.72" %>
754+
Lint/UselessConstantScoping:
755+
Enabled: false
756+
<% end %>
757+
738758
<% if rubocop_version >= "1.69" %>
739759
Lint/UselessDefined:
740760
Enabled: false
@@ -1451,6 +1471,11 @@ Style/RedundantFileExtensionInRequire:
14511471
Style/RedundantFilterChain:
14521472
Enabled: false
14531473

1474+
<% if rubocop_version >= "1.72" %>
1475+
Style/RedundantFormat:
1476+
Enabled: false
1477+
<% end %>
1478+
14541479
Style/RedundantFreeze:
14551480
Enabled: false
14561481

test/fixtures/full_config.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1187,6 +1187,10 @@ Lint/ConstantResolution:
11871187
VersionAdded: '0.86'
11881188
Only: []
11891189
Ignore: []
1190+
Lint/CopDirectiveSyntax:
1191+
Description: Checks that `# rubocop:` directives are strictly formatted.
1192+
Enabled: false
1193+
VersionAdded: '1.72'
11901194
Lint/Debugger:
11911195
Description: Check for debugger calls.
11921196
Enabled: false
@@ -1681,6 +1685,10 @@ Lint/RedundantStringCoercion:
16811685
Enabled: false
16821686
VersionAdded: '0.19'
16831687
VersionChanged: '0.77'
1688+
Lint/RedundantTypeConversion:
1689+
Description: Checks for redundantly converting a literal to the same type.
1690+
Enabled: false
1691+
VersionAdded: '1.72'
16841692
Lint/RedundantWithIndex:
16851693
Description: Checks for redundant `with_index`.
16861694
Enabled: false
@@ -1802,6 +1810,12 @@ Lint/SuppressedException:
18021810
AllowNil: true
18031811
VersionAdded: '0.9'
18041812
VersionChanged: '1.12'
1813+
Lint/SuppressedExceptionInNumberConversion:
1814+
Description: Checks for cases where exceptions unrelated to the numeric constructors
1815+
may be unintentionally swallowed.
1816+
Enabled: false
1817+
SafeAutoCorrect: false
1818+
VersionAdded: '1.72'
18051819
Lint/SymbolConversion:
18061820
Description: Checks for unnecessary symbol conversions.
18071821
Enabled: false
@@ -1935,6 +1949,10 @@ Lint/UselessAssignment:
19351949
AutoCorrect: contextual
19361950
VersionAdded: '0.11'
19371951
VersionChanged: '1.66'
1952+
Lint/UselessConstantScoping:
1953+
Description: Checks for useless constant scoping.
1954+
Enabled: false
1955+
VersionAdded: '1.72'
19381956
Lint/UselessDefined:
19391957
Description: Checks for calls to `defined?` with strings and symbols. The result
19401958
of such a call will always be truthy.
@@ -2300,6 +2318,7 @@ Naming/PredicateName:
23002318
MethodDefinitionMacros:
23012319
- define_method
23022320
- define_singleton_method
2321+
UseSorbetSigs: false
23032322
Exclude:
23042323
- "/spec/**/*"
23052324
Naming/RescuedExceptionsVariableName:
@@ -3904,6 +3923,13 @@ Style/RedundantFilterChain:
39043923
SafeAutoCorrect: false
39053924
VersionAdded: '1.52'
39063925
VersionChanged: '1.57'
3926+
Style/RedundantFormat:
3927+
Description: Checks for usages of `Kernel#format` or `Kernel#sprintf` with only
3928+
a single argument.
3929+
Enabled: false
3930+
SafeAutoCorrect: false
3931+
VersionAdded: '1.72'
3932+
VersionChanged: '1.72'
39073933
Style/RedundantFreeze:
39083934
Description: Checks usages of Object#freeze on immutable objects.
39093935
Enabled: false

0 commit comments

Comments
 (0)