From 541ecf21354ea297d37d9986f79545d6af066d02 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 Feb 2023 23:58:12 +0000 Subject: [PATCH 1/7] Update rubocop requirement from ~> 1.18.0 to >= 1.18, < 1.46 Updates the requirements on [rubocop](https://github.com/rubocop/rubocop) to permit the latest version. - [Release notes](https://github.com/rubocop/rubocop/releases) - [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop/compare/v1.18.0...v1.28.2) --- updated-dependencies: - dependency-name: rubocop dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- rubocop-jekyll.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubocop-jekyll.gemspec b/rubocop-jekyll.gemspec index becefc0..30c6ec5 100644 --- a/rubocop-jekyll.gemspec +++ b/rubocop-jekyll.gemspec @@ -19,6 +19,6 @@ Gem::Specification.new do |s| s.require_paths = ["lib"] s.required_ruby_version = ">= 2.5.0" - s.add_runtime_dependency "rubocop", "~> 1.18.0" + s.add_runtime_dependency "rubocop", ">= 1.18", "< 1.46" s.add_runtime_dependency "rubocop-performance", "~> 1.2" end From ff495799da154349ff0df9dcd51a482496362049 Mon Sep 17 00:00:00 2001 From: Parker Moore <237985+parkr@users.noreply.github.com> Date: Thu, 16 Feb 2023 15:58:54 -0800 Subject: [PATCH 2/7] Upgrade rubocop to v1.46.x --- rubocop-jekyll.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubocop-jekyll.gemspec b/rubocop-jekyll.gemspec index 30c6ec5..f8366dd 100644 --- a/rubocop-jekyll.gemspec +++ b/rubocop-jekyll.gemspec @@ -19,6 +19,6 @@ Gem::Specification.new do |s| s.require_paths = ["lib"] s.required_ruby_version = ">= 2.5.0" - s.add_runtime_dependency "rubocop", ">= 1.18", "< 1.46" + s.add_runtime_dependency "rubocop", "~> 1.46.0" s.add_runtime_dependency "rubocop-performance", "~> 1.2" end From 1237f09548c47af1bbc645f98d8312e8039715b9 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Thu, 16 Feb 2023 16:01:22 -0800 Subject: [PATCH 3/7] Target Ruby 2.7 --- .rubocop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.rubocop.yml b/.rubocop.yml index 2a442ec..820164f 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -2,7 +2,7 @@ require: - rubocop-performance AllCops: - TargetRubyVersion: 2.5 + TargetRubyVersion: 2.7 Exclude: - bin/**/* - exe/**/* From 0a5d9099352cd388fe433b19db4e862c6e09ba8e Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Thu, 16 Feb 2023 16:01:43 -0800 Subject: [PATCH 4/7] Replace removed Gemspec/DateAssignment with replacement Gemspec/DeprecatedAttributeAssignment --- .rubocop.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 820164f..47f8320 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -11,10 +11,9 @@ AllCops: - vendor/**/* - tmp/**/* -Gemspec/DateAssignment: +Gemspec/DeprecatedAttributeAssignment: Enabled: true - Layout/BeginEndAlignment: Enabled: true Layout/EmptyComment: From 427bf39e171fc778625d49a691bcec050772c6b1 Mon Sep 17 00:00:00 2001 From: Parker Moore <237985+parkr@users.noreply.github.com> Date: Thu, 16 Feb 2023 16:03:17 -0800 Subject: [PATCH 5/7] rubocop 1.45.x --- rubocop-jekyll.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubocop-jekyll.gemspec b/rubocop-jekyll.gemspec index f8366dd..33395a2 100644 --- a/rubocop-jekyll.gemspec +++ b/rubocop-jekyll.gemspec @@ -19,6 +19,6 @@ Gem::Specification.new do |s| s.require_paths = ["lib"] s.required_ruby_version = ">= 2.5.0" - s.add_runtime_dependency "rubocop", "~> 1.46.0" + s.add_runtime_dependency "rubocop", "~> 1.45.0" s.add_runtime_dependency "rubocop-performance", "~> 1.2" end From 34338391b2aa35d2c09a5b71d8b77bb3115d3196 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Thu, 16 Feb 2023 16:07:00 -0800 Subject: [PATCH 6/7] Add all the new cops, disabling two of them --- .rubocop.yml | 110 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 110 insertions(+) diff --git a/.rubocop.yml b/.rubocop.yml index 47f8320..a538dec 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -318,3 +318,113 @@ Style/TrailingCommaInArrayLiteral: EnforcedStyleForMultiline: consistent_comma Style/TrailingCommaInHashLiteral: EnforcedStyleForMultiline: consistent_comma +Gemspec/DevelopmentDependencies: # new in 1.44 + Enabled: false # we don't care where dev dependencies are placed +Gemspec/RequireMFA: # new in 1.23 + Enabled: false # jekyllbot auto-releases :( +Layout/LineContinuationLeadingSpace: # new in 1.31 + Enabled: true +Layout/LineContinuationSpacing: # new in 1.31 + Enabled: true +Layout/LineEndStringConcatenationIndentation: # new in 1.18 + Enabled: true +Lint/AmbiguousOperatorPrecedence: # new in 1.21 + Enabled: true +Lint/AmbiguousRange: # new in 1.19 + Enabled: true +Lint/ConstantOverwrittenInRescue: # new in 1.31 + Enabled: true +Lint/DuplicateMagicComment: # new in 1.37 + Enabled: true +Lint/EmptyInPattern: # new in 1.16 + Enabled: true +Lint/IncompatibleIoSelectWithFiberScheduler: # new in 1.21 + Enabled: true +Lint/NonAtomicFileOperation: # new in 1.31 + Enabled: true +Lint/RefinementImportMethods: # new in 1.27 + Enabled: true +Lint/RequireRangeParentheses: # new in 1.32 + Enabled: true +Lint/RequireRelativeSelfPath: # new in 1.22 + Enabled: true +Lint/UselessRescue: # new in 1.43 + Enabled: true +Lint/UselessRuby2Keywords: # new in 1.23 + Enabled: true +Naming/BlockForwarding: # new in 1.24 + Enabled: true +Security/CompoundHash: # new in 1.28 + Enabled: true +Security/IoMethods: # new in 1.22 + Enabled: true +Style/ArrayIntersect: # new in 1.40 + Enabled: true +Style/ComparableClamp: # new in 1.44 + Enabled: true +Style/ConcatArrayLiterals: # new in 1.41 + Enabled: true +Style/EmptyHeredoc: # new in 1.32 + Enabled: true +Style/EnvHome: # new in 1.29 + Enabled: true +Style/FetchEnvVar: # new in 1.28 + Enabled: true +Style/FileRead: # new in 1.24 + Enabled: true +Style/FileWrite: # new in 1.24 + Enabled: true +Style/InPatternThen: # new in 1.16 + Enabled: true +Style/MagicCommentFormat: # new in 1.35 + Enabled: true +Style/MapCompactWithConditionalBlock: # new in 1.30 + Enabled: true +Style/MapToHash: # new in 1.24 + Enabled: true +Style/MapToSet: # new in 1.42 + Enabled: true +Style/MinMaxComparison: # new in 1.42 + Enabled: true +Style/MultilineInPatternThen: # new in 1.16 + Enabled: true +Style/NestedFileDirname: # new in 1.26 + Enabled: true +Style/NumberedParameters: # new in 1.22 + Enabled: true +Style/NumberedParametersLimit: # new in 1.22 + Enabled: true +Style/ObjectThen: # new in 1.28 + Enabled: true +Style/OpenStructUse: # new in 1.23 + Enabled: true +Style/OperatorMethodCall: # new in 1.37 + Enabled: true +Style/QuotedSymbols: # new in 1.16 + Enabled: true +Style/RedundantConstantBase: # new in 1.40 + Enabled: true +Style/RedundantDoubleSplatHashBraces: # new in 1.41 + Enabled: true +Style/RedundantEach: # new in 1.38 + Enabled: true +Style/RedundantHeredocDelimiterQuotes: # new in 1.45 + Enabled: true +Style/RedundantInitialize: # new in 1.27 + Enabled: true +Style/RedundantSelfAssignmentBranch: # new in 1.19 + Enabled: true +Style/RedundantStringEscape: # new in 1.37 + Enabled: true +Style/SelectByRegexp: # new in 1.22 + Enabled: true +Performance/ConcurrentMonotonicTime: # new in 1.12 + Enabled: true +Performance/MapCompact: # new in 1.11 + Enabled: true +Performance/RedundantEqualityComparisonBlock: # new in 1.10 + Enabled: true +Performance/RedundantSplitRegexpArgument: # new in 1.10 + Enabled: true +Performance/StringIdentifierArgument: # new in 1.13 + Enabled: true From f40509fb36e5e82a2893e6f1e05012dbfa93f37e Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Thu, 16 Feb 2023 16:14:38 -0800 Subject: [PATCH 7/7] Upgrade required ruby version to 2.7 --- rubocop-jekyll.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubocop-jekyll.gemspec b/rubocop-jekyll.gemspec index 33395a2..faff10f 100644 --- a/rubocop-jekyll.gemspec +++ b/rubocop-jekyll.gemspec @@ -17,7 +17,7 @@ Gem::Specification.new do |s| end s.require_paths = ["lib"] - s.required_ruby_version = ">= 2.5.0" + s.required_ruby_version = ">= 2.7.0" s.add_runtime_dependency "rubocop", "~> 1.45.0" s.add_runtime_dependency "rubocop-performance", "~> 1.2"