From f1794b28a3b54f0fb166c65d2fbc216084021b0a Mon Sep 17 00:00:00 2001 From: Geronimo Mendez Date: Tue, 16 Jul 2024 17:52:34 -0300 Subject: [PATCH 1/9] update dependencies versions to support `3.3` --- rubocop-airbnb/rubocop-airbnb.gemspec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rubocop-airbnb/rubocop-airbnb.gemspec b/rubocop-airbnb/rubocop-airbnb.gemspec index 07612f3..b9fa44d 100644 --- a/rubocop-airbnb/rubocop-airbnb.gemspec +++ b/rubocop-airbnb/rubocop-airbnb.gemspec @@ -25,9 +25,9 @@ Gem::Specification.new do |spec| 'Gemfile', ] - spec.add_dependency('rubocop', '~> 1.32.0') - spec.add_dependency('rubocop-performance', '~> 1.10.2') - spec.add_dependency('rubocop-rails', '~> 2.9.1') - spec.add_dependency('rubocop-rspec', '~> 2.0.0') + spec.add_dependency('rubocop', '~> 1.48.0') + spec.add_dependency('rubocop-performance', '~> 1.20.2') + spec.add_dependency('rubocop-rails', '~> 2.24.0') + spec.add_dependency('rubocop-rspec', '~> 2.26.0') spec.add_development_dependency('rspec', '~> 3.5') end From 95b7a6fe15f776f9c80019676b5ed87ca56c9576 Mon Sep 17 00:00:00 2001 From: Geronimo Mendez Date: Tue, 16 Jul 2024 17:52:40 -0300 Subject: [PATCH 2/9] fix error from `rubocop 1.48` error from said version of rubocop: RuboCop::ValidationError: Property AutoCorrect of cop FactoryBot/CreateList is supposed to be a boolean and contextual is not. version `1.61` of `rubocop` fixes that issue, allowing all tests to pass. found that solution in this issue: https://github.com/rubocop/rubocop-rspec/issues/1916 from rubocop-rspec, where they were experiencing the same error and updating rubocop to 1.61, solved the issue. However they don't appear to know the culprit of this. --- rubocop-airbnb/rubocop-airbnb.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubocop-airbnb/rubocop-airbnb.gemspec b/rubocop-airbnb/rubocop-airbnb.gemspec index b9fa44d..c7d59e6 100644 --- a/rubocop-airbnb/rubocop-airbnb.gemspec +++ b/rubocop-airbnb/rubocop-airbnb.gemspec @@ -25,7 +25,7 @@ Gem::Specification.new do |spec| 'Gemfile', ] - spec.add_dependency('rubocop', '~> 1.48.0') + spec.add_dependency('rubocop', '~> 1.61.0') spec.add_dependency('rubocop-performance', '~> 1.20.2') spec.add_dependency('rubocop-rails', '~> 2.24.0') spec.add_dependency('rubocop-rspec', '~> 2.26.0') From 9c879dc926623b0704ee0fb79bf1de58b7285fc3 Mon Sep 17 00:00:00 2001 From: Geronimo Mendez Date: Tue, 16 Jul 2024 17:52:41 -0300 Subject: [PATCH 3/9] let`rubocop` version be `>= 1.61.0` --- rubocop-airbnb/rubocop-airbnb.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubocop-airbnb/rubocop-airbnb.gemspec b/rubocop-airbnb/rubocop-airbnb.gemspec index c7d59e6..aef036b 100644 --- a/rubocop-airbnb/rubocop-airbnb.gemspec +++ b/rubocop-airbnb/rubocop-airbnb.gemspec @@ -25,7 +25,7 @@ Gem::Specification.new do |spec| 'Gemfile', ] - spec.add_dependency('rubocop', '~> 1.61.0') + spec.add_dependency('rubocop', '>= 1.61.0') spec.add_dependency('rubocop-performance', '~> 1.20.2') spec.add_dependency('rubocop-rails', '~> 2.24.0') spec.add_dependency('rubocop-rspec', '~> 2.26.0') From 0c794bb7860401b09e425ba2e064e95fba20005f Mon Sep 17 00:00:00 2001 From: Geronimo Mendez Date: Tue, 16 Jul 2024 17:52:41 -0300 Subject: [PATCH 4/9] fix `deprecation warning` Warning: obsolete parameter `IgnoredMethods` (for `Style/BlockDelimiters`) found in config/rubocop-style.yml `IgnoredMethods` has been renamed to `AllowedMethods` and/or `AllowedPatterns`. parameter `IgnoredMethods` was deprecated in version `1.33.0` of `rubocop` in favor of `AllowedMethods`. See: https://github.com/rubocop/rubocop/blob/master/relnotes/v1.33.0.md?plain=1#L19 --- rubocop-airbnb/config/rubocop-style.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rubocop-airbnb/config/rubocop-style.yml b/rubocop-airbnb/config/rubocop-style.yml index 4e8c516..d81ce16 100644 --- a/rubocop-airbnb/config/rubocop-style.yml +++ b/rubocop-airbnb/config/rubocop-style.yml @@ -116,7 +116,7 @@ Style/BlockDelimiters: - let! - subject - watch - IgnoredMethods: + AllowedMethods: # Methods that can be either procedural or functional and cannot be # categorised from their usage alone, e.g. # @@ -889,7 +889,7 @@ Style/SymbolLiteral: Style/SymbolProc: Description: Use symbols as procs instead of blocks when possible. Enabled: false - IgnoredMethods: + AllowedMethods: - respond_to Style/TernaryParentheses: From 3e843600e4c58698ddb0c43fa4d71a1c9cf65496 Mon Sep 17 00:00:00 2001 From: Geronimo Mendez Date: Tue, 16 Jul 2024 18:10:31 -0300 Subject: [PATCH 5/9] add `ruby 3.3` to the CI matrix --- .github/workflows/rspec_rubocop.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/rspec_rubocop.yml b/.github/workflows/rspec_rubocop.yml index 107aa7c..b4967e4 100644 --- a/.github/workflows/rspec_rubocop.yml +++ b/.github/workflows/rspec_rubocop.yml @@ -26,6 +26,8 @@ jobs: bundler-version: latest - ruby-version: '3.1' bundler-version: latest + - ruby-version: '3.3' + bundler-version: latest steps: - uses: actions/checkout@v3 - name: Set up Ruby From 0749e36ffac1ef0f386ca4f0b531dd2190ab5625 Mon Sep 17 00:00:00 2001 From: Geronimo Mendez Date: Fri, 19 Jul 2024 17:51:54 -0300 Subject: [PATCH 6/9] maintain major `rubocop` version --- rubocop-airbnb/rubocop-airbnb.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubocop-airbnb/rubocop-airbnb.gemspec b/rubocop-airbnb/rubocop-airbnb.gemspec index aef036b..c7d59e6 100644 --- a/rubocop-airbnb/rubocop-airbnb.gemspec +++ b/rubocop-airbnb/rubocop-airbnb.gemspec @@ -25,7 +25,7 @@ Gem::Specification.new do |spec| 'Gemfile', ] - spec.add_dependency('rubocop', '>= 1.61.0') + spec.add_dependency('rubocop', '~> 1.61.0') spec.add_dependency('rubocop-performance', '~> 1.20.2') spec.add_dependency('rubocop-rails', '~> 2.24.0') spec.add_dependency('rubocop-rspec', '~> 2.26.0') From d3b6074ad7e6a2ef43f974caaa5b0a9f18a59bdf Mon Sep 17 00:00:00 2001 From: Geronimo Mendez Date: Fri, 19 Jul 2024 18:02:33 -0300 Subject: [PATCH 7/9] update `setup-ruby` commit sha --- .github/workflows/rspec_rubocop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rspec_rubocop.yml b/.github/workflows/rspec_rubocop.yml index b4967e4..ad16b31 100644 --- a/.github/workflows/rspec_rubocop.yml +++ b/.github/workflows/rspec_rubocop.yml @@ -31,7 +31,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Set up Ruby - uses: ruby/setup-ruby@ee2113536afb7f793eed4ce60e8d3b26db912da4 # v1.127.0 + uses: ruby/setup-ruby@2a9a743e19810b9f3c38060637daf594dbd7b37f # 1.186.0 with: ruby-version: ${{ matrix.ruby-version }} bundler: ${{ matrix.bundler-version }} From 188c69183d32f9986d27ab21c899eca698efbc9f Mon Sep 17 00:00:00 2001 From: Geronimo Mendez Date: Fri, 19 Jul 2024 18:24:29 -0300 Subject: [PATCH 8/9] drop support for `Ruby 2.6` Also require ruby 2.7 or higher --- .github/workflows/rspec_rubocop.yml | 2 -- rubocop-airbnb/rubocop-airbnb.gemspec | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/rspec_rubocop.yml b/.github/workflows/rspec_rubocop.yml index ad16b31..bbad1f1 100644 --- a/.github/workflows/rspec_rubocop.yml +++ b/.github/workflows/rspec_rubocop.yml @@ -18,8 +18,6 @@ jobs: strategy: matrix: include: # use bundler 2.3 for ruby versions < 2.6 (https://bundler.io/compatibility.html) - - ruby-version: '2.6' - bundler-version: latest - ruby-version: '2.7' bundler-version: latest - ruby-version: '3.0' diff --git a/rubocop-airbnb/rubocop-airbnb.gemspec b/rubocop-airbnb/rubocop-airbnb.gemspec index c7d59e6..5827a59 100644 --- a/rubocop-airbnb/rubocop-airbnb.gemspec +++ b/rubocop-airbnb/rubocop-airbnb.gemspec @@ -15,7 +15,7 @@ Gem::Specification.new do |spec| spec.license = 'MIT' spec.version = RuboCop::Airbnb::VERSION spec.platform = Gem::Platform::RUBY - spec.required_ruby_version = '>= 2.5' + spec.required_ruby_version = '>= 2.7' spec.require_paths = ['lib'] spec.files = Dir[ From 5a11e1aa10bd7a980e6e4e0a23ebef0b71f5bd64 Mon Sep 17 00:00:00 2001 From: Geronimo Mendez Date: Mon, 22 Jul 2024 13:24:26 -0300 Subject: [PATCH 9/9] allow for more flexibility on minor versions. --- rubocop-airbnb/rubocop-airbnb.gemspec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rubocop-airbnb/rubocop-airbnb.gemspec b/rubocop-airbnb/rubocop-airbnb.gemspec index 5827a59..f68f14a 100644 --- a/rubocop-airbnb/rubocop-airbnb.gemspec +++ b/rubocop-airbnb/rubocop-airbnb.gemspec @@ -25,9 +25,9 @@ Gem::Specification.new do |spec| 'Gemfile', ] - spec.add_dependency('rubocop', '~> 1.61.0') - spec.add_dependency('rubocop-performance', '~> 1.20.2') - spec.add_dependency('rubocop-rails', '~> 2.24.0') - spec.add_dependency('rubocop-rspec', '~> 2.26.0') + spec.add_dependency('rubocop', '~> 1.61') + spec.add_dependency('rubocop-performance', '~> 1.20') + spec.add_dependency('rubocop-rails', '~> 2.24') + spec.add_dependency('rubocop-rspec', '~> 2.26') spec.add_development_dependency('rspec', '~> 3.5') end