From cd55868377dccb248b881de15db309ee1a206f1f Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Fri, 20 Sep 2024 16:06:48 +0200
Subject: [PATCH 1/2] Require Ruby 3.1

This allows us to use the latest version of puppet_forge client.
---
 .github/workflows/test.yml | 2 --
 .rubocop.yml               | 3 +++
 ra10ke.gemspec             | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b9d41e2..bdc267f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -27,8 +27,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - ruby: "2.7"
-          - ruby: "3.0"
           - ruby: "3.1"
             coverage: "yes"
           - ruby: "3.2"
diff --git a/.rubocop.yml b/.rubocop.yml
index 12e57db..c59548e 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -3,3 +3,6 @@ inherit_from: .rubocop_todo.yml
 
 inherit_gem:
   voxpupuli-rubocop: rubocop.yml
+
+AllCops:
+  TargetRubyVersion: '3.1'
diff --git a/ra10ke.gemspec b/ra10ke.gemspec
index 8c417c5..b7c8440 100644
--- a/ra10ke.gemspec
+++ b/ra10ke.gemspec
@@ -14,10 +14,10 @@ Gem::Specification.new do |spec|
 
   spec.files         = `git ls-files`.split($/)
   spec.require_paths = ['lib']
-  spec.required_ruby_version = '>= 2.7.0'
+  spec.required_ruby_version = '>= 3.1.0'
 
   spec.add_dependency 'git', '>= 1.18', '< 3.0'
-  spec.add_dependency 'puppet_forge', '~> 5.0', '>= 5.0.1'
+  spec.add_dependency 'puppet_forge', '~> 6.0'
   spec.add_dependency 'r10k', '>= 2.6.5', '< 5'
   spec.add_dependency 'rake', '~> 13.0', '>= 13.0.6'
   spec.add_dependency 'semverse', '>= 2.0', '< 4'

From b9a83f745ecb3e1ae5f01244d17b88890c4bec22 Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Mon, 9 Dec 2024 17:26:26 +0100
Subject: [PATCH 2/2] r10k: Require 5.x

---
 ra10ke.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ra10ke.gemspec b/ra10ke.gemspec
index b7c8440..05745de 100644
--- a/ra10ke.gemspec
+++ b/ra10ke.gemspec
@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'git', '>= 1.18', '< 3.0'
   spec.add_dependency 'puppet_forge', '~> 6.0'
-  spec.add_dependency 'r10k', '>= 2.6.5', '< 5'
+  spec.add_dependency 'r10k', '~> 5.0'
   spec.add_dependency 'rake', '~> 13.0', '>= 13.0.6'
   spec.add_dependency 'semverse', '>= 2.0', '< 4'
   spec.add_dependency 'solve', '~> 4.0', '>= 4.0.4'