From 0523040f39648f51d6a74f504be8caf8e36dc609 Mon Sep 17 00:00:00 2001
From: Sam Bostock <sam.bostock@shopify.com>
Date: Mon, 12 Feb 2024 17:39:15 -0500
Subject: [PATCH 1/3] Add Ruby 3.2 & 3.3 to CI matrix

---
 .github/workflows/ruby.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
index 1d40e96c..c164f77b 100644
--- a/.github/workflows/ruby.yml
+++ b/.github/workflows/ruby.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       matrix:
         gemfile: [Gemfile, gemfiles/minimum_rubocop.gemfile]
-        ruby: ["2.7", "3.0", "3.1"]
+        ruby: ["2.7", "3.0", "3.1", "3.2", "3.3"]
 
     env:
       BUNDLE_GEMFILE: ${{ matrix.gemfile }}

From c0686f48f4cffde2091f1edde2d848f2ce3c1863 Mon Sep 17 00:00:00 2001
From: Sam Bostock <sam.bostock@shopify.com>
Date: Mon, 12 Feb 2024 18:14:32 -0500
Subject: [PATCH 2/3] Add `base64` as a development dependency

There is an indirect dependency on `base64` which causes the following
warning on Ruby 3.3:

    warning: base64 was loaded from the standard library, but will no longer be part of the default gems since Ruby 3.4.0.
    Add base64 to your Gemfile or gemspec. Also contact author of rubocop-1.53.0 to add base64 into its gemspec.

This has been fixed upstream, however we still run into it when testing
against the minimum compatible RuboCop version, hence adding the
dependency.
---
 Gemfile      | 6 ++++++
 Gemfile.lock | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/Gemfile b/Gemfile
index ae8acf1f..eabaf160 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,3 +8,9 @@ gem "diffy"
 gem "minitest"
 gem "pry-byebug"
 gem "rake"
+
+# Fixes the following warning on Ruby 3.3:
+#   base64 was loaded from the standard library, but will no longer be part of the default gems since Ruby 3.4.0.
+#   Add base64 to your Gemfile or gemspec. Also contact author of rubocop-1.53.0 to add base64 into its gemspec.
+# Check if this is still necessary when the minimum RuboCop version is increased.
+gem "base64"
diff --git a/Gemfile.lock b/Gemfile.lock
index 625cf4f4..5dd215a9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -8,6 +8,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
+    base64 (0.2.0)
     byebug (11.1.3)
     coderay (1.1.3)
     diffy (3.4.2)
@@ -50,6 +51,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  base64
   diffy
   minitest
   pry-byebug

From 555e8e39262156439c4c62960db40363dbe53f8c Mon Sep 17 00:00:00 2001
From: Sam Bostock <sam.bostock@shopify.com>
Date: Mon, 12 Feb 2024 18:18:47 -0500
Subject: [PATCH 3/3] Bump development Ruby version to 3.3.0

---
 .ruby-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ruby-version b/.ruby-version
index ef538c28..15a27998 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-3.1.2
+3.3.0