From 8d04edc5ee894b38b53169d88279e291ebeb4b29 Mon Sep 17 00:00:00 2001
From: Graeme Porteous <graeme@rgbp.co.uk>
Date: Wed, 18 Dec 2024 11:30:12 +0000
Subject: [PATCH 1/3] Update RuboCop workflow

Similar changes as https://github.com/mysociety/foi-for-councils/pull/626/commits/574f365e84e43ae28eed17a08a48cc343ec9a853
---
 .github/workflows/rubocop.yml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/rubocop.yml b/.github/workflows/rubocop.yml
index 1db2466..db4f55e 100644
--- a/.github/workflows/rubocop.yml
+++ b/.github/workflows/rubocop.yml
@@ -4,17 +4,23 @@ on: [pull_request]
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
+    env:
+      BUNDLE_ONLY: rubocop
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: 2.6
 
+    - run: |
+        gem install securerandom -v 0.3.2
+        gem install activesupport -v 7.1.5.1
+
     - name: Run RuboCop linter
-      uses: reviewdog/action-rubocop@v1
+      uses: reviewdog/action-rubocop@v2
       with:
         github_token: ${{ secrets.github_token }}
         reporter: github-pr-review

From 52c5790b19350da3eb4ce5042cbf9e87cf71be57 Mon Sep 17 00:00:00 2001
From: Graeme Porteous <graeme@rgbp.co.uk>
Date: Wed, 18 Dec 2024 11:30:12 +0000
Subject: [PATCH 2/3] Lock gemfile platforms

Replication the other change made in https://github.com/mysociety/foi-for-councils/pull/626
---
 Gemfile.lock | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Gemfile.lock b/Gemfile.lock
index 1a0fe9e..1900f34 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -117,7 +117,9 @@ GEM
     zeitwerk (2.4.2)
 
 PLATFORMS
+  arm64-darwin
   ruby
+  x82_64-darwin
 
 DEPENDENCIES
   icasework!

From cf2dd2e7145c1d131ca10695e80550e9117f2481 Mon Sep 17 00:00:00 2001
From: Graeme Porteous <graeme@rgbp.co.uk>
Date: Wed, 18 Dec 2024 11:34:35 +0000
Subject: [PATCH 3/3] Drop Ruby 2.6 support

---
 .github/workflows/ci.yml      | 1 -
 .github/workflows/rubocop.yml | 2 +-
 .rubocop.yml                  | 2 +-
 icasework.gemspec             | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0765c94..a119c9d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -14,7 +14,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-        - { ruby: 2.6 }
         - { ruby: 2.7 }
 
     steps:
diff --git a/.github/workflows/rubocop.yml b/.github/workflows/rubocop.yml
index db4f55e..fe97a3f 100644
--- a/.github/workflows/rubocop.yml
+++ b/.github/workflows/rubocop.yml
@@ -13,7 +13,7 @@ jobs:
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.6
+        ruby-version: 2.7
 
     - run: |
         gem install securerandom -v 0.3.2
diff --git a/.rubocop.yml b/.rubocop.yml
index ad314c4..de75f4a 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -11,7 +11,7 @@ AllCops:
     - 'bin/rubocop'
   NewCops: enable
   SuggestExtensions: false
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 2.7
 
 Metrics/BlockLength:
   Exclude:
diff --git a/icasework.gemspec b/icasework.gemspec
index f19f713..5042d78 100644
--- a/icasework.gemspec
+++ b/icasework.gemspec
@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
     'organisations of all sizes to do a better job of case management'
   spec.homepage      = 'https://github.com/mysociety/icasework-ruby/'
   spec.license       = 'MIT'
-  spec.required_ruby_version = Gem::Requirement.new('>= 2.6.0')
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.7.0')
 
   spec.metadata['allowed_push_host'] = 'https://rubygems.org'