From 6edbdcb89c2ca81d2fbb977cf0fb0b5c1ef2bad2 Mon Sep 17 00:00:00 2001
From: Brian Shand <Brian.Shand@nhs.net>
Date: Wed, 14 Jan 2026 09:46:09 +0000
Subject: [PATCH] Support Rails 8.1, Ruby 4.0

---
 .github/workflows/test.yml | 2 ++
 CHANGELOG.md               | 3 +++
 gemfiles/Gemfile.rails81   | 6 ++++++
 ndr_support.gemspec        | 4 ++--
 4 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 gemfiles/Gemfile.rails81

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 40a9d3b..d7f662a 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -11,10 +11,12 @@ jobs:
           - '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 870244b..9364026 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,7 @@
 ## [Unreleased]
+### Fixed
+* Support Rails 8.1, Ruby 4.0
+
 ## 5.11.0 / 2026-01-05
 ## Fixed
 * Add 2028 bank holidays
diff --git a/gemfiles/Gemfile.rails81 b/gemfiles/Gemfile.rails81
new file mode 100644
index 0000000..9706eb2
--- /dev/null
+++ b/gemfiles/Gemfile.rails81
@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gemspec path: '..'
+
+gem 'activerecord',  '~> 8.1.0'
+gem 'activesupport', '~> 8.1.0'
diff --git a/ndr_support.gemspec b/ndr_support.gemspec
index 483f8ab..b862107 100644
--- a/ndr_support.gemspec
+++ b/ndr_support.gemspec
@@ -20,8 +20,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'activerecord',  '>= 7.1', '< 8.1'
-  spec.add_dependency 'activesupport', '>= 7.1', '< 8.1'
+  spec.add_dependency 'activerecord',  '>= 7.1', '< 8.2'
+  spec.add_dependency 'activesupport', '>= 7.1', '< 8.2'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake', '>= 12.3.3'