diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index edf0e9308b..a5647de364 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -42,13 +42,11 @@ jobs: fail-fast: false matrix: cfg: - - {os: ubuntu-24.04, ruby: '3.2'} - {os: ubuntu-24.04, ruby: '3.3'} - {os: ubuntu-24.04, ruby: '3.4'} - {os: ubuntu-24.04, ruby: '4.0'} - - {os: ubuntu-24.04, ruby: 'jruby-9.4.8.0'} - - {os: ubuntu-24.04, ruby: 'jruby-9.4.14.0'} - - {os: windows-2025, ruby: '3.2'} + - {os: ubuntu-24.04, ruby: 'jruby-10.0.5.0'} + - {os: ubuntu-24.04, ruby: 'jruby-10.1.0.0'} - {os: windows-2025, ruby: '3.3'} - {os: windows-2025, ruby: '3.4'} - {os: windows-2025, ruby: '4.0'} diff --git a/.rubocop.yml b/.rubocop.yml index 58c36a00f4..3cce7c4a81 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -9,7 +9,7 @@ plugins: # without excluding the vendor dirs below, rubocop will load all rubocop config files from installed gems ¯\_(ツ)_/¯ AllCops: - TargetRubyVersion: 3.1 + TargetRubyVersion: 3.3 Include: - 'lib/**/*.rb' - 'ext/**/*.rb' diff --git a/lib/puppet/graph/simple_graph.rb b/lib/puppet/graph/simple_graph.rb index 0688e8365c..dc95c43e25 100644 --- a/lib/puppet/graph/simple_graph.rb +++ b/lib/puppet/graph/simple_graph.rb @@ -2,7 +2,6 @@ require_relative '../../puppet/external/dot' require_relative '../../puppet/relationship' -require 'set' # A hopefully-faster graph class to replace the use of GRATR. class Puppet::Graph::SimpleGraph diff --git a/lib/puppet/module_tool/metadata.rb b/lib/puppet/module_tool/metadata.rb index 56eaa32ce3..0d107a7225 100644 --- a/lib/puppet/module_tool/metadata.rb +++ b/lib/puppet/module_tool/metadata.rb @@ -4,7 +4,6 @@ require_relative '../../puppet/network/format_support' require 'uri' require_relative '../../puppet/util/json' -require 'set' module Puppet::ModuleTool # This class provides a data structure representing a module's metadata. diff --git a/lib/puppet/provider/package/pacman.rb b/lib/puppet/provider/package/pacman.rb index 6c93851e52..8da72b806d 100644 --- a/lib/puppet/provider/package/pacman.rb +++ b/lib/puppet/provider/package/pacman.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require_relative '../../../puppet/provider/package' -require 'set' require 'uri' Puppet::Type.type(:package).provide :pacman, :parent => Puppet::Provider::Package do diff --git a/lib/puppet/settings/base_setting.rb b/lib/puppet/settings/base_setting.rb index ebbdf09df7..3bea095311 100644 --- a/lib/puppet/settings/base_setting.rb +++ b/lib/puppet/settings/base_setting.rb @@ -1,6 +1,5 @@ # frozen_string_literal: true -require 'set' require_relative '../../puppet/settings/errors' # The base setting type diff --git a/lib/puppet/transaction.rb b/lib/puppet/transaction.rb index 27d5152997..254420ce16 100644 --- a/lib/puppet/transaction.rb +++ b/lib/puppet/transaction.rb @@ -5,7 +5,6 @@ require_relative '../puppet/util/skip_tags' require_relative '../puppet/application' require 'digest/sha1' -require 'set' # the class that actually walks our resource/property tree, collects the changes, # and performs them diff --git a/lib/puppet/util/tag_set.rb b/lib/puppet/util/tag_set.rb index 2ec1d19ff0..91e509851b 100644 --- a/lib/puppet/util/tag_set.rb +++ b/lib/puppet/util/tag_set.rb @@ -1,6 +1,5 @@ # frozen_string_literal: true -require 'set' require_relative '../../puppet/network/format_support' class Puppet::Util::TagSet < Set diff --git a/openvox.gemspec b/openvox.gemspec index 1ffabb3993..f1075f8a79 100644 --- a/openvox.gemspec +++ b/openvox.gemspec @@ -13,7 +13,7 @@ Gem::Specification.new do |spec| spec.licenses = ['Apache-2.0'] spec.required_rubygems_version = Gem::Requirement.new("> 1.3.1") - spec.required_ruby_version = Gem::Requirement.new(">= 3.1.0") + spec.required_ruby_version = Gem::Requirement.new(">= 3.3.0") spec.authors = ["OpenVox Project"] spec.date = "2012-08-17" spec.description = <<~EOF