From d8efacaff8782b38431c69678449651bdef43609 Mon Sep 17 00:00:00 2001
From: Brian Shand <Brian.Shand@nhs.net>
Date: Fri, 10 Jul 2026 14:04:06 +0100
Subject: [PATCH] Support Ruby 4.0, Rails 8.1. Drop support for Ruby 3.2

---
 .github/workflows/lint.yml | 2 +-
 .github/workflows/test.yml | 3 ++-
 CHANGELOG.md               | 1 +
 gemfiles/Gemfile.rails81   | 5 +++++
 tnql.gemspec               | 4 ++--
 5 files changed, 11 insertions(+), 4 deletions(-)
 create mode 100644 gemfiles/Gemfile.rails81

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index e4b4ef8..4f9e871 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -15,7 +15,7 @@ jobs:
     - name: Set up Ruby
       uses: ruby/setup-ruby@0dafeac902942906541bc140009cdbf32665b601 # 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 e20f0b4..b9e50d0 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -8,13 +8,14 @@ jobs:
       fail-fast: false
       matrix:
         ruby-version:
-          - '3.2'
           - '3.3'
           - '3.4'
+          - '4.0'
         gemfile:
           - gemfiles/Gemfile.rails71
           - gemfiles/Gemfile.rails72
           - gemfiles/Gemfile.rails80
+          - gemfiles/Gemfile.rails81
         exclude:
           # rails 8.0 requires ruby >= 3.2
           # https://www.fastruby.io/blog/ruby/rails/versions/compatibility-table.html
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 687110e..285c61f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 ### Fixed
 * Restrict treetop gem dependency
 * Support Ruby 3.4. Drop support for Rails 7.0, Ruby 3.1
+* Support Ruby 4.0, Rails 8.1. Drop support for Ruby 3.2
 
 ## 1.1.2 / 2024-11-18
 ### Fixed
diff --git a/gemfiles/Gemfile.rails81 b/gemfiles/Gemfile.rails81
new file mode 100644
index 0000000..4b958c0
--- /dev/null
+++ b/gemfiles/Gemfile.rails81
@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gemspec path: '..'
+
+gem 'rails', '~> 8.1.0'
diff --git a/tnql.gemspec b/tnql.gemspec
index cae2d17..1f9a919 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.2'
+  spec.required_ruby_version = '>= 3.3'
 
-  spec.add_dependency 'activesupport', '>= 7.1', '< 8.1'
+  spec.add_dependency 'activesupport', '>= 7.1', '< 8.2'
   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,