From 408db1e7d3fcb7f049ff082ba2eba731710f9aa1 Mon Sep 17 00:00:00 2001
From: Joe Rafaniello <jrafanie@gmail.com>
Date: Fri, 12 Jan 2024 14:44:12 -0500
Subject: [PATCH 1/3] Allow rails 7 gems in gemspec

---
 activerecord-id_regions.gemspec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/activerecord-id_regions.gemspec b/activerecord-id_regions.gemspec
index 7b080e1..09e600d 100644
--- a/activerecord-id_regions.gemspec
+++ b/activerecord-id_regions.gemspec
@@ -20,8 +20,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activerecord",  ">= 5.0", "< 7.0"
-  spec.add_dependency "activesupport", ">= 5.0", "< 7.0"
+  spec.add_dependency "activerecord",  ">= 5.0", "<7.1"
+  spec.add_dependency "activesupport", ">= 5.0", "<7.1"
   spec.add_dependency "pg"
 
   spec.add_development_dependency "bundler"

From d7e0824672f4b4d4f084626f5fe1b5a8b038b302 Mon Sep 17 00:00:00 2001
From: Joe Rafaniello <jrafanie@gmail.com>
Date: Wed, 17 Jan 2024 17:23:44 -0500
Subject: [PATCH 2/3] Add rails 7 to the test matrix, drop ruby 2.6

2.6 is EOL and not supported by rails 7.
---
 .github/workflows/ci.yaml |  2 +-
 Gemfile                   | 20 ++++++++++++--------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 0b6cf8d..0192ac5 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -12,12 +12,12 @@ jobs:
     strategy:
       matrix:
         ruby-version:
-        - '2.6'
         - '2.7'
         - '3.0'
         rails-version:
         - '6.0'
         - '6.1'
+        - '7.0'
     services:
       postgres:
         image: manageiq/postgresql:13
diff --git a/Gemfile b/Gemfile
index 2d88fa4..e984a13 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,11 +3,15 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in activerecord-id_regions.gemspec
 gemspec
 
-case ENV['TEST_RAILS_VERSION']
-when "6.0"
-  gem "activerecord",  "~>6.0.4"
-  gem "activesupport", "~>6.0.4"
-when "6.1"
-  gem "activerecord",  "~>6.1.4"
-  gem "activesupport", "~>6.1.4"
-end
+minimum_version =
+  case ENV['TEST_RAILS_VERSION']
+  when "6.0"
+    "~>6.0.4"
+  when "7.0"
+    "~>7.0.8"
+  else
+    "~>6.1.4"
+  end
+
+gem "activerecord", minimum_version
+gem "activesupport", minimum_version

From 2af7eaa07cc4a67876a83e01decf989f4144cd61 Mon Sep 17 00:00:00 2001
From: Joe Rafaniello <jrafanie@gmail.com>
Date: Fri, 19 Jan 2024 09:22:08 -0500
Subject: [PATCH 3/3] Add ruby 3.1 to test matrix

---
 .github/workflows/ci.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 0192ac5..1da5532 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -14,6 +14,7 @@ jobs:
         ruby-version:
         - '2.7'
         - '3.0'
+        - '3.1'
         rails-version:
         - '6.0'
         - '6.1'