diff --git a/.github/workflows/rspec_tests.yml b/.github/workflows/rspec_tests.yml index 5dd281e52..2354e40de 100644 --- a/.github/workflows/rspec_tests.yml +++ b/.github/workflows/rspec_tests.yml @@ -12,13 +12,9 @@ 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/CHANGELOG.mkd b/CHANGELOG.mkd index 04d45bd43..f0e8b2470 100644 --- a/CHANGELOG.mkd +++ b/CHANGELOG.mkd @@ -4,6 +4,8 @@ CHANGELOG Unreleased ---------- +Require Ruby 3.1 [#1402](https://github.com/puppetlabs/r10k/pull/1402) + 4.1.0 ----- 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'