Remove deprecated Cop.all usage (Shopify#358)

cntral · Jul 30, 2024 · 0d39442 · 0d39442
2 parents f82b3f7 + 38e1129
commit 0d39442
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 20 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -5,11 +5,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [2.7, 3.0, 3.1, 3.2, 3.3, head]
-        gemfile: [rubocop-next, rubocop-old]
+        ruby: [3.1, 3.2, 3.3, head]
     runs-on: ubuntu-latest
-    env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps
-      BUNDLE_GEMFILE: gemfiles/Gemfile.${{ matrix.gemfile }}
     steps:
     - uses: actions/checkout@v3
     - uses: ruby/setup-ruby@v1

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -6,7 +6,7 @@ PATH
       better_html (>= 2.0.1)
       parser (>= 2.7.1.4)
       rainbow
-      rubocop
+      rubocop (>= 1)
       smart_properties
 
 GEM
@@ -123,4 +123,4 @@ DEPENDENCIES
   rubocop-shopify
 
 BUNDLED WITH
-   2.3.16
+   2.4.20
diff --git a/erb_lint.gemspec b/erb_lint.gemspec
@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   s.add_dependency("better_html", ">= 2.0.1")
   s.add_dependency("parser", ">= 2.7.1.4")
   s.add_dependency("rainbow")
-  s.add_dependency("rubocop")
+  s.add_dependency("rubocop", ">= 1")
   s.add_dependency("smart_properties")
 
   s.add_development_dependency("rspec")

diff --git a/gemfiles/Gemfile.rubocop-next b/gemfiles/Gemfile.rubocop-next
diff --git a/gemfiles/Gemfile.rubocop-old b/gemfiles/Gemfile.rubocop-old
diff --git a/lib/erb_lint/linters/rubocop.rb b/lib/erb_lint/linters/rubocop.rb
@@ -146,10 +146,10 @@ def rubocop_processed_source(content, filename)
 
       def cop_classes
         if @only_cops.present?
-          selected_cops = ::RuboCop::Cop::Cop.all.select { |cop| cop.match?(@only_cops) }
+          selected_cops = ::RuboCop::Cop::Registry.all.select { |cop| cop.match?(@only_cops) }
           ::RuboCop::Cop::Registry.new(selected_cops)
         else
-          ::RuboCop::Cop::Registry.new(::RuboCop::Cop::Cop.all)
+          ::RuboCop::Cop::Registry.new(::RuboCop::Cop::Registry.all)
         end
       end
 

diff --git a/lib/erb_lint/linters/rubocop_text.rb b/lib/erb_lint/linters/rubocop_text.rb
@@ -29,7 +29,7 @@ def descendant_nodes(parser)
       end
 
       def cop_classes
-        selected_cops = ::RuboCop::Cop::Cop.all.select { |cop| cop.match?(@only_cops) }
+        selected_cops = ::RuboCop::Cop::Registry.all.select { |cop| cop.match?(@only_cops) }
 
         ::RuboCop::Cop::Registry.new(selected_cops)
       end