From 13a590c8fad79572bdcaa50b438f395fcda49aff Mon Sep 17 00:00:00 2001
From: Aaron Rosenberg <aaron.rosenberg@gusto.com>
Date: Mon, 2 Mar 2026 10:37:39 -0500
Subject: [PATCH] Upgrade RuboCop from 0.63.1 to 1.85.0

RuboCop 0.63.1 is incompatible with Ruby 4.0 because `ostruct` was
removed from default gems. Unpin the version and fix the two
Style/RedundantParentheses offenses in humanizer.rb.
---
 .rubocop.yml                       | 1 +
 Gemfile                            | 2 +-
 gemfiles/activesupport_7_0.gemfile | 2 +-
 gemfiles/activesupport_7_1.gemfile | 2 +-
 gemfiles/activesupport_7_2.gemfile | 2 +-
 gemfiles/activesupport_8_0.gemfile | 2 +-
 lib/rrule/humanizer.rb             | 4 ++--
 7 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 27bf62c..125cad4 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,6 +1,7 @@
 AllCops:
   TargetRubyVersion: 2.6
   NewCops: disable
+  SuggestExtensions: false
   Exclude:
     - 'gemfiles/**/*'
     - Appraisals
diff --git a/Gemfile b/Gemfile
index 71e9be0..ff2cb59 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,6 +6,6 @@ gem 'appraisal'
 gem 'pry-byebug'
 gem 'rake'
 gem 'rspec'
-gem 'rubocop', '0.63.1'
+gem 'rubocop'
 
 gemspec
diff --git a/gemfiles/activesupport_7_0.gemfile b/gemfiles/activesupport_7_0.gemfile
index 65a2a78..94fc48e 100644
--- a/gemfiles/activesupport_7_0.gemfile
+++ b/gemfiles/activesupport_7_0.gemfile
@@ -6,7 +6,7 @@ gem "appraisal"
 gem "pry-byebug"
 gem "rake"
 gem "rspec"
-gem "rubocop", "0.63.1"
+gem "rubocop"
 gem "activesupport", "~> 7.0"
 
 gemspec path: "../"
diff --git a/gemfiles/activesupport_7_1.gemfile b/gemfiles/activesupport_7_1.gemfile
index 5332cc0..7900818 100644
--- a/gemfiles/activesupport_7_1.gemfile
+++ b/gemfiles/activesupport_7_1.gemfile
@@ -6,7 +6,7 @@ gem "appraisal"
 gem "pry-byebug"
 gem "rake"
 gem "rspec"
-gem "rubocop", "0.63.1"
+gem "rubocop"
 gem "activesupport", "~> 7.1"
 
 gemspec path: "../"
diff --git a/gemfiles/activesupport_7_2.gemfile b/gemfiles/activesupport_7_2.gemfile
index 67ec518..7d081d8 100644
--- a/gemfiles/activesupport_7_2.gemfile
+++ b/gemfiles/activesupport_7_2.gemfile
@@ -6,7 +6,7 @@ gem "appraisal"
 gem "pry-byebug"
 gem "rake"
 gem "rspec"
-gem "rubocop", "0.63.1"
+gem "rubocop"
 gem "activesupport", "~> 7.2"
 
 gemspec path: "../"
diff --git a/gemfiles/activesupport_8_0.gemfile b/gemfiles/activesupport_8_0.gemfile
index 85ceba1..0457f73 100644
--- a/gemfiles/activesupport_8_0.gemfile
+++ b/gemfiles/activesupport_8_0.gemfile
@@ -6,7 +6,7 @@ gem "appraisal"
 gem "pry-byebug"
 gem "rake"
 gem "rspec"
-gem "rubocop", "0.63.1"
+gem "rubocop"
 gem "activesupport", "~> 8.0"
 
 gemspec path: "../"
diff --git a/lib/rrule/humanizer.rb b/lib/rrule/humanizer.rb
index a1bf244..628f538 100644
--- a/lib/rrule/humanizer.rb
+++ b/lib/rrule/humanizer.rb
@@ -120,7 +120,7 @@ def yearly
 
         add list(options.fetch(:bymonth), method(:monthtext), 'and') if bymonth_option
 
-        add list (bymonthday_option.map { |o| nth(o) }), :to_s, 'and' if bymonthday_option
+        add list(bymonthday_option.map { |o| nth(o) }, :to_s, 'and') if bymonthday_option
       end
 
       def weekly
@@ -220,7 +220,7 @@ def _byweekday
 
       def _bymonthday
         add 'on the'
-        add list (bymonthday_option.map { |o| nth(o) }), :to_s, 'and'
+        add list(bymonthday_option.map { |o| nth(o) }, :to_s, 'and')
       end
 
       def _byhour