From 1d31d004d7b9e876cba5a4d7beec9793c91134ef Mon Sep 17 00:00:00 2001 From: Koichi ITO Date: Sat, 24 Apr 2021 02:28:36 +0900 Subject: [PATCH] Drop Ruby 2.4 support and require RuboCop 1.13 or higher RuboCop does not support Ruby 2.4 and rails/rails uses RuboCop 1.13. - https://github.com/rubocop/rubocop/pull/9648 - https://github.com/rails/rails/commit/bbbc861 And https://github.com/toshimaru/rubocop-rails_config/pull/111 requires this PR. Therefore, this PR drops support for Ruby 2.4 to enable the same cops as rails/rails. --- .github/workflows/test.yml | 10 +--------- Appraisals | 2 +- README.md | 2 +- gemfiles/rubocop_1.10.gemfile | 14 -------------- gemfiles/rubocop_1.11.gemfile | 14 -------------- gemfiles/rubocop_1.12.gemfile | 14 -------------- gemfiles/rubocop_1.8.gemfile | 14 -------------- gemfiles/rubocop_1.9.gemfile | 14 -------------- rubocop-rails_config.gemspec | 4 ++-- 9 files changed, 5 insertions(+), 83 deletions(-) delete mode 100644 gemfiles/rubocop_1.10.gemfile delete mode 100644 gemfiles/rubocop_1.11.gemfile delete mode 100644 gemfiles/rubocop_1.12.gemfile delete mode 100644 gemfiles/rubocop_1.8.gemfile delete mode 100644 gemfiles/rubocop_1.9.gemfile diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bf02ec0..f8bf7ac 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -4,17 +4,9 @@ jobs: test: strategy: matrix: - ruby: [2.4, 2.5, 2.6, 2.7, 3.0] + ruby: [2.5, 2.6, 2.7, 3.0] gemfile: - - gemfiles/rubocop_1.8.gemfile - - gemfiles/rubocop_1.9.gemfile - - gemfiles/rubocop_1.10.gemfile - - gemfiles/rubocop_1.11.gemfile - - gemfiles/rubocop_1.12.gemfile - gemfiles/rubocop_1.13.gemfile - exclude: - - ruby: 2.4 - gemfile: gemfiles/rubocop_1.13.gemfile env: BUNDLE_GEMFILE: ${{ matrix.gemfile }} runs-on: ubuntu-latest diff --git a/Appraisals b/Appraisals index cbf99f3..ce5f497 100644 --- a/Appraisals +++ b/Appraisals @@ -1,6 +1,6 @@ # frozen_string_literal: true -SUPPORTED_VERSIONS = %w[1.8 1.9 1.10 1.11 1.12 1.13].freeze +SUPPORTED_VERSIONS = %w[1.13].freeze SUPPORTED_VERSIONS.each do |version| appraise "rubocop-#{version}" do diff --git a/README.md b/README.md index 6243721..366040a 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ $ rails generate rubocop_rails_config:install ### TargetRubyVersion -Although Rails 7 (edge) only supports Ruby 2.7 or more, rubocop-rails_config still supports Ruby 2.4 or more to support as many Ruby versions as possible. +Although Rails 7 (edge) only supports Ruby 2.7 or more, rubocop-rails_config still supports Ruby 2.5 or more to support as many Ruby versions as possible. If you'd like to change `TargetRubyVersion`, see [Customization](#customization). diff --git a/gemfiles/rubocop_1.10.gemfile b/gemfiles/rubocop_1.10.gemfile deleted file mode 100644 index 8e7d125..0000000 --- a/gemfiles/rubocop_1.10.gemfile +++ /dev/null @@ -1,14 +0,0 @@ -# frozen_string_literal: true - -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "appraisal" -gem "bundler" -gem "minitest" -gem "rake" -gem "rails", ">= 5.0" -gem "rubocop", "~> 1.10.0" - -gemspec path: "../" diff --git a/gemfiles/rubocop_1.11.gemfile b/gemfiles/rubocop_1.11.gemfile deleted file mode 100644 index d802e76..0000000 --- a/gemfiles/rubocop_1.11.gemfile +++ /dev/null @@ -1,14 +0,0 @@ -# frozen_string_literal: true - -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "appraisal" -gem "bundler" -gem "minitest" -gem "rake" -gem "rails", ">= 5.0" -gem "rubocop", "~> 1.11.0" - -gemspec path: "../" diff --git a/gemfiles/rubocop_1.12.gemfile b/gemfiles/rubocop_1.12.gemfile deleted file mode 100644 index cae4c70..0000000 --- a/gemfiles/rubocop_1.12.gemfile +++ /dev/null @@ -1,14 +0,0 @@ -# frozen_string_literal: true - -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "appraisal" -gem "bundler" -gem "minitest" -gem "rake" -gem "rails", ">= 5.0" -gem "rubocop", "~> 1.12.0" - -gemspec path: "../" diff --git a/gemfiles/rubocop_1.8.gemfile b/gemfiles/rubocop_1.8.gemfile deleted file mode 100644 index aa5c5be..0000000 --- a/gemfiles/rubocop_1.8.gemfile +++ /dev/null @@ -1,14 +0,0 @@ -# frozen_string_literal: true - -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "appraisal" -gem "bundler" -gem "minitest" -gem "rake" -gem "rails", ">= 5.0" -gem "rubocop", "~> 1.8.0" - -gemspec path: "../" diff --git a/gemfiles/rubocop_1.9.gemfile b/gemfiles/rubocop_1.9.gemfile deleted file mode 100644 index a51d203..0000000 --- a/gemfiles/rubocop_1.9.gemfile +++ /dev/null @@ -1,14 +0,0 @@ -# frozen_string_literal: true - -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "appraisal" -gem "bundler" -gem "minitest" -gem "rake" -gem "rails", ">= 5.0" -gem "rubocop", "~> 1.9.0" - -gemspec path: "../" diff --git a/rubocop-rails_config.gemspec b/rubocop-rails_config.gemspec index 73a4ba2..2d16ee2 100644 --- a/rubocop-rails_config.gemspec +++ b/rubocop-rails_config.gemspec @@ -10,9 +10,9 @@ Gem::Specification.new do |spec| spec.files = Dir["README.md", "LICENSE", "config/*.yml", "lib/**/*"] spec.homepage = "https://github.com/toshimaru/rubocop-rails_config" spec.license = "MIT" - spec.required_ruby_version = ">= 2.4.0" + spec.required_ruby_version = ">= 2.5.0" - spec.add_dependency "rubocop", ">= 1.8" + spec.add_dependency "rubocop", ">= 1.13" spec.add_dependency "rubocop-ast", ">= 1.0.1" spec.add_dependency "rubocop-performance", "~> 1.3" spec.add_dependency "rubocop-rails", "~> 2.0"