From e1e93df601c2514faff6a930c9584fc8f6cedde8 Mon Sep 17 00:00:00 2001
From: Hermann Mayer <hermann.mayer92@gmail.com>
Date: Fri, 3 Jan 2025 15:17:32 +0100
Subject: [PATCH] Raised the minimum Ruby/Rails versions.

Signed-off-by: Hermann Mayer <hermann.mayer92@gmail.com>
---
 .github/workflows/test.yml |  4 ++--
 .rubocop.yml               |  2 +-
 Appraisals                 |  4 ----
 CHANGELOG.md               |  2 +-
 Gemfile                    |  2 +-
 gemfiles/rails_5.2.gemfile | 23 -----------------------
 gemfiles/rails_6.1.gemfile |  2 +-
 gemfiles/rails_7.1.gemfile |  2 +-
 jabber_admin.gemspec       |  4 ++--
 9 files changed, 9 insertions(+), 36 deletions(-)
 delete mode 100644 gemfiles/rails_5.2.gemfile

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 6bb6973..e38f016 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -18,8 +18,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ['2.7']
-        rails: ['5.2', '6.1', '7.1']
+        ruby: ['2.7', '3.0']
+        rails: ['6.1', '7.1']
     env:
       BUNDLE_GEMFILE: 'gemfiles/rails_${{ matrix.rails }}.gemfile'
     steps:
diff --git a/.rubocop.yml b/.rubocop.yml
index e1b64af..149f9b3 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -13,7 +13,7 @@ AllCops:
   SuggestExtensions: false
   DisplayCopNames: true
   TargetRubyVersion: 2.7
-  TargetRailsVersion: 5.2
+  TargetRailsVersion: 6.1
   Exclude:
     - bin/**/*
     - vendor/**/*
diff --git a/Appraisals b/Appraisals
index 26a1fb3..79b09c2 100644
--- a/Appraisals
+++ b/Appraisals
@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-appraise 'rails-5.2' do
-  gem 'activesupport', '~> 5.2.0'
-end
-
 appraise 'rails-6.1' do
   gem 'activesupport', '~> 6.1.0'
 end
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4a3cae7..1ece442 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 ### next
 
-* TODO: Replace this bullet point with an actual description of a change.
+* Raised minimum supported Ruby/Rails version to 2.7/6.1 (#15)
 
 ### 1.3.4 (15 August 2024)
 
diff --git a/Gemfile b/Gemfile
index 409f4b5..6738335 100644
--- a/Gemfile
+++ b/Gemfile
@@ -13,7 +13,7 @@ gem 'bundler', '~> 2.3'
 gem 'countless', '~> 1.1'
 gem 'guard-rspec', '~> 4.7'
 gem 'irb', '~> 1.2'
-gem 'railties', '>= 5.2'
+gem 'railties', '>= 6.1'
 gem 'rake', '~> 13.0'
 gem 'rspec', '~> 3.12'
 gem 'rubocop', '~> 1.28'
diff --git a/gemfiles/rails_5.2.gemfile b/gemfiles/rails_5.2.gemfile
deleted file mode 100644
index 065cc1d..0000000
--- a/gemfiles/rails_5.2.gemfile
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "appraisal", "~> 2.4"
-gem "bundler", "~> 2.3"
-gem "countless", "~> 1.1"
-gem "guard-rspec", "~> 4.7"
-gem "irb", "~> 1.2"
-gem "railties", ">= 5.2"
-gem "rake", "~> 13.0"
-gem "rspec", "~> 3.12"
-gem "rubocop", "~> 1.28"
-gem "rubocop-rails", "~> 2.14"
-gem "rubocop-rspec", "~> 2.10"
-gem "simplecov", ">= 0.22"
-gem "vcr", "~> 6.0"
-gem "webmock", "~> 3.18"
-gem "yard", ">= 0.9.28"
-gem "yard-activesupport-concern", ">= 0.0.1"
-gem "activesupport", "~> 5.2.0"
-
-gemspec path: "../"
diff --git a/gemfiles/rails_6.1.gemfile b/gemfiles/rails_6.1.gemfile
index 245ae6d..a2e554c 100644
--- a/gemfiles/rails_6.1.gemfile
+++ b/gemfiles/rails_6.1.gemfile
@@ -7,7 +7,7 @@ gem "bundler", "~> 2.3"
 gem "countless", "~> 1.1"
 gem "guard-rspec", "~> 4.7"
 gem "irb", "~> 1.2"
-gem "railties", ">= 5.2"
+gem "railties", ">= 6.1"
 gem "rake", "~> 13.0"
 gem "rspec", "~> 3.12"
 gem "rubocop", "~> 1.28"
diff --git a/gemfiles/rails_7.1.gemfile b/gemfiles/rails_7.1.gemfile
index 42bc652..f0034c5 100644
--- a/gemfiles/rails_7.1.gemfile
+++ b/gemfiles/rails_7.1.gemfile
@@ -7,7 +7,7 @@ gem "bundler", "~> 2.3"
 gem "countless", "~> 1.1"
 gem "guard-rspec", "~> 4.7"
 gem "irb", "~> 1.2"
-gem "railties", ">= 5.2"
+gem "railties", ">= 6.1"
 gem "rake", "~> 13.0"
 gem "rspec", "~> 3.12"
 gem "rubocop", "~> 1.28"
diff --git a/jabber_admin.gemspec b/jabber_admin.gemspec
index d10f647..b81b587 100644
--- a/jabber_admin.gemspec
+++ b/jabber_admin.gemspec
@@ -33,6 +33,6 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.7'
 
-  spec.add_runtime_dependency 'activesupport', '>= 5.2'
-  spec.add_runtime_dependency 'rest-client', '~> 2.1'
+  spec.add_dependency 'activesupport', '>= 6.1'
+  spec.add_dependency 'rest-client', '~> 2.1'
 end