From eac7c49b10a163e763f062bfbcf33bd30e69ab9f Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Fri, 20 Sep 2024 15:45:17 +0200
Subject: [PATCH] Require Ruby 3.1

This allows us to use the latest minitar and forge_ruby dependencies.
---
 .github/workflows/rspec_tests.yml | 3 ---
 r10k.gemspec                      | 8 ++++----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/rspec_tests.yml b/.github/workflows/rspec_tests.yml
index 5dd281e52..11adbdfca 100644
--- a/.github/workflows/rspec_tests.yml
+++ b/.github/workflows/rspec_tests.yml
@@ -12,13 +12,10 @@ jobs:
     strategy:
       matrix:
         cfg:
-          - {os: ubuntu-latest, ruby: 2.6}
-          - {os: ubuntu-latest, ruby: 2.7}
           - {os: ubuntu-latest, ruby: 3.1}
           - {os: ubuntu-latest, ruby: 3.2}
           - {os: ubuntu-latest, ruby: jruby-9.3}
           - {os: ubuntu-latest, ruby: jruby-9.4}
-          - {os: windows-latest, ruby: 2.6}
           - {os: windows-latest, ruby: 3.2}
 
     runs-on: ${{ matrix.cfg.os }}
diff --git a/r10k.gemspec b/r10k.gemspec
index f01416cc4..0f601bad9 100644
--- a/r10k.gemspec
+++ b/r10k.gemspec
@@ -18,22 +18,22 @@ Gem::Specification.new do |s|
     dynamic environments.
   DESCRIPTION
 
-  s.required_ruby_version = '>= 2.6.0'
+  s.required_ruby_version = '>= 3.1.0'
 
   s.license  = 'Apache-2.0'
 
-  s.add_dependency 'colored2',   '3.1.2'
+  s.add_dependency 'colored2', '~> 4.0'
   s.add_dependency 'cri', '>= 2.15.10'
 
   s.add_dependency 'log4r',     '1.1.10'
   s.add_dependency 'multi_json', '~> 1.10'
 
-  s.add_dependency 'puppet_forge', '>= 4.1', '< 6'
+  s.add_dependency 'puppet_forge', '~> 6.0'
 
   s.add_dependency 'gettext-setup', '>=0.24', '<2.0'
 
   s.add_dependency 'jwt', '>= 2.2.3', '< 3'
-  s.add_dependency 'minitar', '~> 0.9'
+  s.add_dependency 'minitar', '~> 1.0', '>= 1.0.2'
 
   s.add_development_dependency 'rspec', '~> 3.1'