From 1589b8f354b8bd10ad644ca2ecbbe68a5e23d11e Mon Sep 17 00:00:00 2001
From: Brian Shand <Brian.Shand@nhs.net>
Date: Tue, 21 Oct 2025 15:03:21 +0100
Subject: [PATCH 1/2] Support Ruby 3.4. Drop support for Rails 7.0, Ruby 3.1

---
 .github/workflows/test.yml | 4 ++--
 CHANGELOG.md               | 1 +
 gemfiles/Gemfile.rails70   | 8 --------
 tnql.gemspec               | 4 ++--
 4 files changed, 5 insertions(+), 12 deletions(-)
 delete mode 100644 gemfiles/Gemfile.rails70

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index ab6dc19..40a9d3b 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -5,13 +5,13 @@ on: [push]
 jobs:
   test:
     strategy:
+      fail-fast: false
       matrix:
         ruby-version:
-          - '3.1'
           - '3.2'
           - '3.3'
+          - '3.4'
         gemfile:
-          - gemfiles/Gemfile.rails70
           - gemfiles/Gemfile.rails71
           - gemfiles/Gemfile.rails72
           - gemfiles/Gemfile.rails80
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0105551..687110e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## [Unreleased]
 ### Fixed
 * Restrict treetop gem dependency
+* Support Ruby 3.4. Drop support for Rails 7.0, Ruby 3.1
 
 ## 1.1.2 / 2024-11-18
 ### Fixed
diff --git a/gemfiles/Gemfile.rails70 b/gemfiles/Gemfile.rails70
deleted file mode 100644
index aba9ab0..0000000
--- a/gemfiles/Gemfile.rails70
+++ /dev/null
@@ -1,8 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec path: '..'
-
-gem 'rails',  '~> 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/tnql.gemspec b/tnql.gemspec
index e6b387f..711f38b 100644
--- a/tnql.gemspec
+++ b/tnql.gemspec
@@ -24,9 +24,9 @@ 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.1'
+  spec.required_ruby_version = '>= 3.2'
 
-  spec.add_dependency 'activesupport', '>= 7.0', '< 8.1'
+  spec.add_dependency 'activesupport', '>= 7.1', '< 8.1'
   spec.add_dependency 'chronic', '~> 0.3'
   spec.add_dependency 'ndr_support', '>= 3.0', '< 6'
   # treetop 1.6.14 causes errors. I think this may be a buggy release and fixed soon,

From 71f0e6e12142ce66efa2b9ef34187d94fd2ca94d Mon Sep 17 00:00:00 2001
From: Brian Shand <Brian.Shand@nhs.net>
Date: Wed, 22 Oct 2025 10:14:02 +0100
Subject: [PATCH 2/2] Support ruby 3.4

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

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 81c7841..4380a00 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.4
     - name: Install dependencies
       run: bundle install
     - name: Run RuboCop against BASE..HEAD changes