From 7e79e1f93c300a3d2011be3a647face6ad7ae7d9 Mon Sep 17 00:00:00 2001 From: Andrew Duthie Date: Fri, 20 May 2022 15:36:53 -0400 Subject: [PATCH] Update Rubocop to the latest version **Why**: So that we're taking advantage of the latest features and bug fixes, and to avoid potential conflicts if a developer (me) tries to run a system-installed Rubocop of a newer version which becomes irate at the now-removed "Lint/UselessElseWithoutRescue" lint. changelog: Internal, Dependencies, Update dependencies to the latest version --- .rubocop.yml | 3 --- Gemfile | 2 +- Gemfile.lock | 22 +++++++++++----------- 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 8faf541cce5..d943ea2b0a3 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -597,9 +597,6 @@ Lint/UriRegexp: Lint/UselessAssignment: Enabled: true -Lint/UselessElseWithoutRescue: - Enabled: true - Lint/UselessSetterCall: Enabled: true diff --git a/Gemfile b/Gemfile index 840820f28ed..2b4f216fcb0 100644 --- a/Gemfile +++ b/Gemfile @@ -102,7 +102,7 @@ group :development, :test do gem 'psych' gem 'puma' gem 'rspec-rails', '~> 4.0' - gem 'rubocop', '~> 1.23.0', require: false + gem 'rubocop', '~> 1.29.1', require: false gem 'rubocop-performance', '~> 1.12.0', require: false gem 'rubocop-rails', '>= 2.5.2', require: false end diff --git a/Gemfile.lock b/Gemfile.lock index 78640ef8c61..608002f0550 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -413,10 +413,10 @@ GEM openssl-signature_algorithm (1.1.1) openssl (~> 2.0) orm_adapter (0.5.0) - parallel (1.21.0) + parallel (1.22.1) parallel_tests (3.7.3) parallel - parser (3.0.3.2) + parser (3.1.2.0) ast (~> 2.4.1) pg (1.2.3) pg_query (2.1.3) @@ -502,7 +502,7 @@ GEM method_source rake (>= 12.2) thor (~> 1.0) - rainbow (3.0.0) + rainbow (3.1.1) rake (13.0.6) rb-fsevent (0.10.4) rb-inotify (0.10.1) @@ -514,7 +514,7 @@ GEM redis-session-store (0.11.4) actionpack (>= 3, < 8) redis (>= 3, < 5) - regexp_parser (2.2.0) + regexp_parser (2.4.0) reline (0.2.7) io-console (~> 0.5) request_store (1.5.0) @@ -552,17 +552,17 @@ GEM rspec-retry (0.6.2) rspec-core (> 3.3) rspec-support (3.10.3) - rubocop (1.23.0) + rubocop (1.29.1) parallel (~> 1.10) - parser (>= 3.0.0.0) + parser (>= 3.1.0.0) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) - rexml - rubocop-ast (>= 1.12.0, < 2.0) + rexml (>= 3.2.5, < 4.0) + rubocop-ast (>= 1.17.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.15.0) - parser (>= 3.0.1.1) + rubocop-ast (1.18.0) + parser (>= 3.1.1.0) rubocop-performance (1.12.0) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -781,7 +781,7 @@ DEPENDENCIES rqrcode rspec-rails (~> 4.0) rspec-retry - rubocop (~> 1.23.0) + rubocop (~> 1.29.1) rubocop-performance (~> 1.12.0) rubocop-rails (>= 2.5.2) ruby-progressbar