From fd5a9ec7fb9e25e67894dd99d974b7e0bc250eae Mon Sep 17 00:00:00 2001
From: Mike Linksvayer <mlinksva@github.com>
Date: Fri, 30 Aug 2024 18:51:48 +0000
Subject: [PATCH 1/2] update ruby version in tests to match gh pages version

---
 .github/workflows/test.yml | 2 +-
 .rubocop.yml               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e29d601..a5b1557 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -19,7 +19,7 @@ jobs:
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.7.4
+        ruby-version: 3.3.4
         bundler-cache: true
 
     - name: Run tests
diff --git a/.rubocop.yml b/.rubocop.yml
index 7457108..82e3368 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,6 +1,6 @@
 AllCops:
   NewCops: enable
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.3
   Exclude:
     - _site/**/*
     - vendor/**/*

From 8c856288c1c3c96e0759fedee0a506c2abc89e22 Mon Sep 17 00:00:00 2001
From: Mike Linksvayer <mlinksva@github.com>
Date: Fri, 30 Aug 2024 19:07:34 +0000
Subject: [PATCH 2/2] rubocop ruby 3 things

---
 script/check-approval | 2 +-
 spec/spec_helper.rb   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/script/check-approval b/script/check-approval
index 453da28..555d958 100755
--- a/script/check-approval
+++ b/script/check-approval
@@ -58,7 +58,7 @@ rows << :separator
 eligible = !current && spdx && approved_licenses.include?(license)
 rows << ['Eligible', eligible]
 
-puts Terminal::Table.new title: "License: #{license}", rows: rows
+puts Terminal::Table.new title: "License: #{license}", rows:
 puts
 puts "Code search: https://github.com/search?q=#{license}+filename%3ALICENSE&type=Code"
 
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 94a1655..feefb76 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -27,7 +27,7 @@ end
 def config
   SpecHelper.config ||= begin
     config = Jekyll::Configuration.new.read_config_file config_file
-    config = Jekyll::Utils.deep_merge_hashes(config, source: source)
+    config = Jekyll::Utils.deep_merge_hashes(config, source:)
     Jekyll::Utils.deep_merge_hashes(Jekyll::Configuration::DEFAULTS, config)
   end
 end