From 81c5132387bc39b8b92f35b5f6cd5b4b937bd36a Mon Sep 17 00:00:00 2001
From: Brian Shand <Brian.Shand@nhs.net>
Date: Thu, 7 May 2026 17:50:41 +0100
Subject: [PATCH 1/2] Drop support for Ruby 3.1, Rails 7.0

Relax minitest gem dependency
Include SECURITY.md in packaged gem
---
 .github/workflows/test.yml | 12 ------------
 CHANGELOG.md               |  3 ++-
 gemfiles/Gemfile.rails70   |  7 -------
 ndr_dev_support.gemspec    |  6 +++---
 4 files changed, 5 insertions(+), 23 deletions(-)
 delete mode 100644 gemfiles/Gemfile.rails70

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c851f5f..b7e2677 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -8,13 +8,11 @@ jobs:
       fail-fast: false
       matrix:
         ruby-version:
-          - '3.1'
           - '3.2'
           - '3.3'
           - '3.4'
           - '4.0'
         gemfile:
-          - gemfiles/Gemfile.rails70
           - gemfiles/Gemfile.rails71
           - gemfiles/Gemfile.rails72
           - gemfiles/Gemfile.rails80
@@ -24,16 +22,6 @@ jobs:
           # https://www.fastruby.io/blog/ruby/rails/versions/compatibility-table.html
           - ruby-version: '3.1'
             gemfile: 'gemfiles/Gemfile.rails81'
-          # rails 8.0 requires ruby >= 3.2
-          # https://www.fastruby.io/blog/ruby/rails/versions/compatibility-table.html
-          - ruby-version: '3.1'
-            gemfile: 'gemfiles/Gemfile.rails80'
-          # rails 7.0 requires ruby <= 3.3
-          # https://www.fastruby.io/blog/ruby/rails/versions/compatibility-table.html
-          - ruby-version: '3.4'
-            gemfile: 'gemfiles/Gemfile.rails70'
-          - ruby-version: '4.0'
-            gemfile: 'gemfiles/Gemfile.rails70'
 
     name: Ruby ${{ matrix.ruby-version }} / Bundle ${{ matrix.gemfile }}
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 69d6f6c..f4a3d54 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 ## [Unreleased]
-*no unreleased changes*
+### Fixed
+* Drop support for Ruby 3.1, Rails 7.0
 
 ## 7.3.6 / 2026-01-13
 ### Added
diff --git a/gemfiles/Gemfile.rails70 b/gemfiles/Gemfile.rails70
deleted file mode 100644
index 8eec5b8..0000000
--- a/gemfiles/Gemfile.rails70
+++ /dev/null
@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-gemspec path: '..'
-
-gem 'activesupport', '~> 7.0.0'
-
-# Latest concurrent-ruby breaks Rails < 7.1. See https://github.com/rails/rails/issues/54260
-gem 'concurrent-ruby', '1.3.4'
diff --git a/ndr_dev_support.gemspec b/ndr_dev_support.gemspec
index fd6c0a7..d9a9918 100644
--- a/ndr_dev_support.gemspec
+++ b/ndr_dev_support.gemspec
@@ -13,14 +13,14 @@ Gem::Specification.new do |spec|
   spec.license       = 'MIT'
 
   gem_files          = %w[CHANGELOG.md CODE_OF_CONDUCT.md LICENSE.txt README.md
-                          config lib ndr_dev_support.gemspec]
+                          SECURITY.md config lib ndr_dev_support.gemspec]
   spec.files         = `git ls-files -z`.split("\x0").
                        select { |f| gem_files.include?(f.split('/')[0]) }
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 3.1'
+  spec.required_ruby_version = '>= 3.2'
 
   spec.add_dependency 'pry'
 
@@ -39,7 +39,7 @@ Gem::Specification.new do |spec|
   # Integration test dependencies:
   spec.add_dependency 'capybara', '>= 3.34'
   spec.add_dependency 'capybara-screenshot'
-  spec.add_dependency 'minitest', '~> 5.11'
+  spec.add_dependency 'minitest', '>= 5.11', '< 7.0'
   spec.add_dependency 'selenium-webdriver', '~> 4.8'
   spec.add_dependency 'show_me_the_cookies'
 

From 2694cd7847ec7070caaaa39abf8045c2b59a5471 Mon Sep 17 00:00:00 2001
From: Brian Shand <Brian.Shand@nhs.net>
Date: Mon, 11 May 2026 10:54:01 +0100
Subject: [PATCH 2/2] Drop support for Ruby 3.2

---
 .github/workflows/lint.yml | 2 +-
 .github/workflows/test.yml | 1 -
 CHANGELOG.md               | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 394001e..7af8218 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -15,7 +15,7 @@ jobs:
     - name: Set up Ruby
       uses: ruby/setup-ruby@c4e5b1316158f92e3d49443a9d58b31d25ac0f8f # ruby/setup-ruby@v1 see https://github.com/ruby/setup-ruby/tree/v1
       with:
-        ruby-version: 3.4
+        ruby-version: 4.0
     - 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 b7e2677..f283479 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -8,7 +8,6 @@ jobs:
       fail-fast: false
       matrix:
         ruby-version:
-          - '3.2'
           - '3.3'
           - '3.4'
           - '4.0'
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f4a3d54..7ae703d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 ## [Unreleased]
 ### Fixed
-* Drop support for Ruby 3.1, Rails 7.0
+* Drop support for Ruby 3.1 and 3.2, Rails 7.0
 
 ## 7.3.6 / 2026-01-13
 ### Added