From d3d6094f83bae0315a23148559f027f5c106a5d5 Mon Sep 17 00:00:00 2001
From: Jan Graichen <jgraichen@altimos.de>
Date: Thu, 18 Apr 2024 13:44:59 +0200
Subject: [PATCH] chore: Bump tests to Ruby 3.0+ and Rails 6.1+

* Remove unsupported Ruby and Rails versions
* Add Ruby 3.1, 3.2, 3.2
* Add Rails 7.1
---
 .github/workflows/test.yml                    | 18 +++++-----------
 Appraisals                                    | 11 ++++------
 gemfiles/rails_6_0.gemfile                    | 21 -------------------
 .../{rails_5_2.gemfile => rails_7_1.gemfile}  |  2 +-
 4 files changed, 10 insertions(+), 42 deletions(-)
 delete mode 100644 gemfiles/rails_6_0.gemfile
 rename gemfiles/{rails_5_2.gemfile => rails_7_1.gemfile} (93%)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 75a043d..252f580 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -8,22 +8,14 @@ jobs:
     strategy:
       matrix:
         ruby:
+          - "3.3"
+          - "3.2"
+          - "3.1"
           - "3.0"
-          - "2.7"
-          - "2.6"
-          - "2.5"
         gemfile:
-          - rails_5_2.gemfile
-          - rails_6_0.gemfile
           - rails_6_1.gemfile
           - rails_7_0.gemfile
-        exclude:
-          - ruby: "3.0"
-            gemfile: rails_5_2.gemfile
-          - ruby: "2.5"
-            gemfile: rails_7_0.gemfile
-          - ruby: "2.6"
-            gemfile: rails_7_0.gemfile
+          - rails_7_1.gemfile
       fail-fast: False
 
     env:
@@ -60,7 +52,7 @@ jobs:
       - uses: actions/checkout@master
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.0
+          ruby-version: "3.3"
           bundler-cache: True
 
       - run: bundle exec rubocop --parallel --color
diff --git a/Appraisals b/Appraisals
index b83c670..faf1457 100644
--- a/Appraisals
+++ b/Appraisals
@@ -1,10 +1,3 @@
-appraise "rails-5-2" do
-  gem 'rails', '~> 5.2.0'
-end
-
-appraise "rails-6-0" do
-  gem 'rails', '~> 6.0.0'
-end
 
 appraise "rails-6-1" do
   gem 'rails', '~> 6.1.0'
@@ -14,6 +7,10 @@ appraise "rails-7-0" do
   gem 'rails', '~> 7.0.0'
 end
 
+appraise "rails-7-1" do
+  gem 'rails', '~> 7.1.0'
+end
+
 appraise "rails-head" do
   gem 'rails', github: 'rails/rails'
 end
diff --git a/gemfiles/rails_6_0.gemfile b/gemfiles/rails_6_0.gemfile
deleted file mode 100644
index 58afb2b..0000000
--- a/gemfiles/rails_6_0.gemfile
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "kaminari"
-gem "pagy"
-gem "will_paginate"
-gem "actionpack", ">= 3.2.0"
-gem "activerecord", ">= 3.2.0"
-gem "sqlite3", "~> 2.0"
-gem "rspec"
-gem "rspec-rails"
-gem "my-rubocop", github: "jgraichen/my-rubocop", ref: "v3"
-gem "rails", "~> 6.0.0"
-
-group :development do
-  gem "appraisal"
-  gem "rake"
-end
-
-gemspec path: "../"
diff --git a/gemfiles/rails_5_2.gemfile b/gemfiles/rails_7_1.gemfile
similarity index 93%
rename from gemfiles/rails_5_2.gemfile
rename to gemfiles/rails_7_1.gemfile
index 1d30ee1..59c2acc 100644
--- a/gemfiles/rails_5_2.gemfile
+++ b/gemfiles/rails_7_1.gemfile
@@ -11,7 +11,7 @@ gem "sqlite3", "~> 2.0"
 gem "rspec"
 gem "rspec-rails"
 gem "my-rubocop", github: "jgraichen/my-rubocop", ref: "v3"
-gem "rails", "~> 5.2.0"
+gem "rails", "~> 7.1.0"
 
 group :development do
   gem "appraisal"