Merge pull request #182 from Shopify/drop-ruby-2.4

Shopify · Aug 6, 2020 · 1944354 · 1944354
2 parents 73c9a6e + 3d6801e
commit 1944354
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 9 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -1,8 +1,8 @@
-inherit_from:
-  - https://shopify.github.io/ruby-style-guide/rubocop.yml
+inherit_gem:
+  rubocop-shopify: rubocop.yml
 
 AllCops:
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.5
   Exclude:
     - 'vendor/**/*'
     - 'gemfiles/vendor/**/*'

diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,6 @@
 language: ruby
 cache: bundler
 rvm:
-  - 2.4.1
   - 2.5
   - 2.6
   - 2.7
@@ -10,4 +9,6 @@ gemfile:
 - gemfiles/Gemfile.rubocop-next
 script:
   - bundle exec rspec spec
+  - bundle show rubocop
+  - bundle show rubocop-shopify
   - bundle exec rubocop
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -80,6 +80,8 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
+    rubocop-shopify (1.0.0)
+      rubocop (>= 0.78.0)
     ruby-progressbar (1.10.1)
     smart_properties (1.15.0)
     thread_safe (0.3.6)
@@ -97,6 +99,7 @@ DEPENDENCIES
   rake
   rspec
   rubocop
+  rubocop-shopify
 
 BUNDLED WITH
    1.17.3
diff --git a/erb_lint.gemspec b/erb_lint.gemspec
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.bindir = 'exe'
   s.executables = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
 
-  s.required_ruby_version = '>= 2.4.0'
+  s.required_ruby_version = '>= 2.5.0'
 
   s.metadata = {
     "allowed_push_host" => "https://rubygems.org",
@@ -34,4 +34,5 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency('rspec')
   s.add_development_dependency('rubocop')
+  s.add_development_dependency('rubocop-shopify')
 end
diff --git a/gemfiles/Gemfile.rubocop-next b/gemfiles/Gemfile.rubocop-next
@@ -2,4 +2,7 @@
 
 eval_gemfile "../Gemfile"
 
-gem "rubocop", ">= 0.87"
+gem "rubocop", ">= 0.87", "< 0.89"
+
+# most recent rubocop-shopify release (1.0.4) is not compatible with rubocop >= 0.87, but this unreleased version is
+gem "rubocop-shopify", git: "https://github.com/Shopify/ruby-style-guide.git", ref: "ee3b64392b09f7e8d8089a57c4e65f91c0594732"
diff --git a/spec/erb_lint/linters/rubocop_spec.rb b/spec/erb_lint/linters/rubocop_spec.rb
@@ -9,7 +9,7 @@
       rubocop_config: {
         require: [File.expand_path('../../fixtures/cops/auto_correct_cop', __FILE__)],
         AllCops: {
-          TargetRubyVersion: '2.4',
+          TargetRubyVersion: '2.5',
         },
       },
     )
@@ -234,7 +234,7 @@
         only: ['Layout/ArgumentAlignment'],
         rubocop_config: {
           AllCops: {
-            TargetRubyVersion: '2.4',
+            TargetRubyVersion: '2.5',
           },
           'Layout/ArgumentAlignment': {
             Enabled: true,

diff --git a/spec/erb_lint/linters/rubocop_text_spec.rb b/spec/erb_lint/linters/rubocop_text_spec.rb
@@ -9,7 +9,7 @@
       rubocop_config: {
         require: [File.expand_path('../../fixtures/cops/auto_correct_cop', __FILE__)],
         AllCops: {
-          TargetRubyVersion: '2.4',
+          TargetRubyVersion: '2.5',
         },
       },
     )