From 41d561362e7af4bcd7da7bfad97e6e5e2d32f7bb Mon Sep 17 00:00:00 2001
From: Georg Ledermann <georg@ledermann.dev>
Date: Tue, 26 Dec 2023 07:17:27 +0100
Subject: [PATCH] Test against Ruby 3.3 and Rails 7.1, drop Ruby 2.7 and Rails
 < 6.1

---
 .github/workflows/main.yml                    | 23 ++-----------------
 gemfiles/Gemfile-activemodel-5.0.x            |  5 ----
 gemfiles/Gemfile-activemodel-5.1.x            |  5 ----
 gemfiles/Gemfile-activemodel-5.2.x            |  5 ----
 gemfiles/Gemfile-activemodel-6.0.x            |  5 ----
 ...emodel-4.2.x => Gemfile-activemodel-7.1.x} |  2 +-
 6 files changed, 3 insertions(+), 42 deletions(-)
 delete mode 100644 gemfiles/Gemfile-activemodel-5.0.x
 delete mode 100644 gemfiles/Gemfile-activemodel-5.1.x
 delete mode 100644 gemfiles/Gemfile-activemodel-5.2.x
 delete mode 100644 gemfiles/Gemfile-activemodel-6.0.x
 rename gemfiles/{Gemfile-activemodel-4.2.x => Gemfile-activemodel-7.1.x} (62%)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 94f9820..8353c6c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -11,27 +11,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '2.7', '3.0', '3.1' ]
-        rails: [ '4.2', '5.0', '5.1', '5.2', '6.0', '6.1', '7.0' ]
-        exclude:
-          - ruby: '2.7'
-            rails: '4.2'
-          - ruby: '3.0'
-            rails: '4.2'
-          - ruby: '3.0'
-            rails: '5.0'
-          - ruby: '3.0'
-            rails: '5.1'
-          - ruby: '3.0'
-            rails: '5.2'
-          - ruby: '3.1'
-            rails: '4.2'
-          - ruby: '3.1'
-            rails: '5.0'
-          - ruby: '3.1'
-            rails: '5.1'
-          - ruby: '3.1'
-            rails: '5.2'
+        ruby: [ '3.0', '3.1', '3.2', '3.3' ]
+        rails: [ '6.1', '7.0', '7.1' ]
 
     name: Ruby ${{ matrix.ruby }} / Rails ${{ matrix.rails }}
     env:
diff --git a/gemfiles/Gemfile-activemodel-5.0.x b/gemfiles/Gemfile-activemodel-5.0.x
deleted file mode 100644
index 3f764f9..0000000
--- a/gemfiles/Gemfile-activemodel-5.0.x
+++ /dev/null
@@ -1,5 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec path: '..'
-
-gem 'activemodel', '~> 5.0.0'
diff --git a/gemfiles/Gemfile-activemodel-5.1.x b/gemfiles/Gemfile-activemodel-5.1.x
deleted file mode 100644
index 2ef50d6..0000000
--- a/gemfiles/Gemfile-activemodel-5.1.x
+++ /dev/null
@@ -1,5 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec path: '..'
-
-gem 'activemodel', '~> 5.1.0'
diff --git a/gemfiles/Gemfile-activemodel-5.2.x b/gemfiles/Gemfile-activemodel-5.2.x
deleted file mode 100644
index ab961a7..0000000
--- a/gemfiles/Gemfile-activemodel-5.2.x
+++ /dev/null
@@ -1,5 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec path: '..'
-
-gem 'activemodel', '~> 5.2.0'
diff --git a/gemfiles/Gemfile-activemodel-6.0.x b/gemfiles/Gemfile-activemodel-6.0.x
deleted file mode 100644
index ad46a64..0000000
--- a/gemfiles/Gemfile-activemodel-6.0.x
+++ /dev/null
@@ -1,5 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec path: '..'
-
-gem 'activemodel', '~> 6.0.0'
diff --git a/gemfiles/Gemfile-activemodel-4.2.x b/gemfiles/Gemfile-activemodel-7.1.x
similarity index 62%
rename from gemfiles/Gemfile-activemodel-4.2.x
rename to gemfiles/Gemfile-activemodel-7.1.x
index 1d2a084..219a3ac 100644
--- a/gemfiles/Gemfile-activemodel-4.2.x
+++ b/gemfiles/Gemfile-activemodel-7.1.x
@@ -2,4 +2,4 @@ source 'https://rubygems.org'
 
 gemspec path: '..'
 
-gem 'activemodel', '~>4.2.6'
+gem 'activemodel', '~> 7.1.2'