From 1d0a389b408000c3e9efa0c938161d2db71c0016 Mon Sep 17 00:00:00 2001 From: Go MAEDA Date: Sat, 12 Apr 2025 01:52:56 +0000 Subject: [PATCH] Update RuboCop to 1.74 (#41884). git-svn-id: https://svn.redmine.org/redmine/trunk@23637 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- .rubocop_todo.yml | 8 +++++--- Gemfile | 2 +- lib/redmine/plugin.rb | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index e858e655d..3e5e246b9 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -1,6 +1,6 @@ # This configuration was generated by # `rubocop --auto-gen-config --exclude-limit 20 --no-offense-counts --no-auto-gen-timestamp` -# using RuboCop version 1.73.2. +# using RuboCop version 1.74.0. # The point is for the user to remove these configuration records # one by one as the offenses are removed from the code base. # Note that changes in the inspected code, or installation of new @@ -319,7 +319,7 @@ Naming/VariableName: # Configuration parameters: EnforcedStyle, CheckMethodNames, CheckSymbols, AllowedIdentifiers, AllowedPatterns. # SupportedStyles: snake_case, normalcase, non_integer -# AllowedIdentifiers: capture3, iso8601, rfc1123_date, rfc822, rfc2822, rfc3339, x86_64 +# AllowedIdentifiers: TLS1_1, TLS1_2, capture3, iso8601, rfc1123_date, rfc822, rfc2822, rfc3339, x86_64 Naming/VariableNumber: Exclude: - 'test/functional/versions_controller_test.rb' @@ -718,8 +718,10 @@ Style/CaseLikeIf: - 'lib/redmine/scm/adapters/git_adapter.rb' # This cop supports unsafe autocorrection (--autocorrect-all). -# Configuration parameters: EnforcedStyle. +# Configuration parameters: EnforcedStyle, EnforcedStyleForClasses, EnforcedStyleForModules. # SupportedStyles: nested, compact +# SupportedStylesForClasses: , nested, compact +# SupportedStylesForModules: , nested, compact Style/ClassAndModuleChildren: Enabled: false diff --git a/Gemfile b/Gemfile index c27a2c959..9e2608e2a 100644 --- a/Gemfile +++ b/Gemfile @@ -111,7 +111,7 @@ group :test do gem "capybara", ">= 3.39" gem 'selenium-webdriver', '>= 4.11.0' # RuboCop - gem 'rubocop', '~> 1.73.2', require: false + gem 'rubocop', '~> 1.74.0', require: false gem 'rubocop-performance', '~> 1.23.0', require: false gem 'rubocop-rails', '~> 2.29.0', require: false gem 'bundle-audit', require: false diff --git a/lib/redmine/plugin.rb b/lib/redmine/plugin.rb index 223b3927a..447bed666 100644 --- a/lib/redmine/plugin.rb +++ b/lib/redmine/plugin.rb @@ -250,7 +250,7 @@ module Redmine ) end elsif req.is_a?(Range) - unless compare_versions(req.first, current) <= 0 && compare_versions(req.last, current) >= 0 + unless compare_versions(req.first, current) <= 0 && compare_versions(req.last, current) >= 0 # rubocop:disable Style/ComparableBetween raise PluginRequirementError.new( "#{id} plugin requires a Redmine version between #{req.first} " \ "and #{req.last} but current is #{current.join('.')}"