From 29afbfcdbb90bf7d6eda23cb383edf30f76abb04 Mon Sep 17 00:00:00 2001
From: Brian Shand <Brian.Shand@nhs.net>
Date: Thu, 31 Jul 2025 12:31:31 +0100
Subject: [PATCH 1/2] rake bundle:update should package gems for all platforms

---
 CHANGELOG.md                | 1 +
 lib/tasks/audit_bundle.rake | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4495144..d588e58 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## [Unreleased]
 ### Fixed
 * Update rubocop version dependency
+* rake bundle:update should package gems for all platforms
 
 ## 7.3.2 / 2025-05-01
 ### Fixed
diff --git a/lib/tasks/audit_bundle.rake b/lib/tasks/audit_bundle.rake
index ba4804d..a6f3fad 100644
--- a/lib/tasks/audit_bundle.rake
+++ b/lib/tasks/audit_bundle.rake
@@ -138,11 +138,12 @@ namespace :bundle do
     end
 
     # Retrieve binary gems for platforms listed in Gemfile.lock
-    platforms = `bundle platform`.split("\n").grep(/^[*] x86_64-/).collect { |s| s[2..] }
     Dir.chdir('vendor/cache') do
+      platforms = `bundle platform`.split("\n").grep(/^[*] x86_64-/).collect { |s| s[2..] }
       platforms.each do |platform|
         system("gem fetch #{gem} --version=#{new_gem_version2} --platform=#{platform}")
       end
+      system('bundle package --all-platforms')
     end if Dir.exist?('vendor/cache')
 
     if gem == 'webpacker'
@@ -206,7 +207,7 @@ namespace :bundle do
 
       $ ( git rm #{files_to_git_rm.join(' ')}
           git add #{files_to_git_add.join(' ')}
-          git commit -m '# Bump #{gem} to #{new_gem_version2}'
+          git commit -m 'Bump #{gem} to #{new_gem_version2}'
         )
     MSG
   end

From 28c4fffc2880b3c116056bd95fcbe9cfb6be2b5a Mon Sep 17 00:00:00 2001
From: Brian Shand <Brian.Shand@nhs.net>
Date: Thu, 31 Jul 2025 12:37:17 +0100
Subject: [PATCH 2/2] Drop support for Ruby 3.0

---
 .github/workflows/lint.yml | 2 +-
 .github/workflows/test.yml | 7 -------
 CHANGELOG.md               | 3 +++
 ndr_dev_support.gemspec    | 2 +-
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 81c7841..521af05 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -15,7 +15,7 @@ jobs:
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 3.0
+        ruby-version: 3.3
     - name: Install dependencies
       run: bundle install
     - name: Run RuboCop against BASE..HEAD changes
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 1dfda55..ab6dc19 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -7,7 +7,6 @@ jobs:
     strategy:
       matrix:
         ruby-version:
-          - '3.0'
           - '3.1'
           - '3.2'
           - '3.3'
@@ -17,14 +16,8 @@ jobs:
           - gemfiles/Gemfile.rails72
           - gemfiles/Gemfile.rails80
         exclude:
-          # rails 7.2 requires ruby >= 3.1
-          # https://www.fastruby.io/blog/ruby/rails/versions/compatibility-table.html
-          - ruby-version: '3.0'
-            gemfile: 'gemfiles/Gemfile.rails72'
           # rails 8.0 requires ruby >= 3.2
           # https://www.fastruby.io/blog/ruby/rails/versions/compatibility-table.html
-          - ruby-version: '3.0'
-            gemfile: 'gemfiles/Gemfile.rails80'
           - ruby-version: '3.1'
             gemfile: 'gemfiles/Gemfile.rails80'
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d588e58..14387d1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,9 @@
 * Update rubocop version dependency
 * rake bundle:update should package gems for all platforms
 
+## Changed
+* Drop support for Ruby 3.0
+
 ## 7.3.2 / 2025-05-01
 ### Fixed
 * Capistrano: Add missing `tmpdir` requirement to deploy application secrets
diff --git a/ndr_dev_support.gemspec b/ndr_dev_support.gemspec
index c9af0cc..3742c20 100644
--- a/ndr_dev_support.gemspec
+++ b/ndr_dev_support.gemspec
@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 3.0'
+  spec.required_ruby_version = '>= 3.1'
 
   spec.add_dependency 'pry'