Skip to content
Snippets Groups Projects
Unverified Commit 05d2de4e authored by david22swan's avatar david22swan Committed by GitHub
Browse files

Merge pull request #615 from puppetlabs/CAT-2286-Update_templates_to_avoid_puppet_7_dependencies

(CAT-2286) Remove Ruby < 3.1 dependencies
parents 1a55f8d5 dd1397d2
No related branches found
No related tags found
No related merge requests found
...@@ -514,15 +514,6 @@ Gemfile: ...@@ -514,15 +514,6 @@ Gemfile:
':development': ':development':
# Json gems should be pinned to their default versions so that users aren't forced to recompile the native extensions. # Json gems should be pinned to their default versions so that users aren't forced to recompile the native extensions.
# See the following for a version matrix: https://stdgems.org/json/#gem-version # See the following for a version matrix: https://stdgems.org/json/#gem-version
- gem: json
version: '= 2.1.0'
condition: "Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))"
- gem: json
version: '= 2.3.0'
condition: "Gem::Requirement.create(['>= 2.7.0', '< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))"
- gem: json
version: '= 2.5.1'
condition: "Gem::Requirement.create(['>= 3.0.0', '< 3.0.5']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))"
- gem: json - gem: json
version: '= 2.6.1' version: '= 2.6.1'
condition: "Gem::Requirement.create(['>= 3.1.0', '< 3.1.3']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))" condition: "Gem::Requirement.create(['>= 3.1.0', '< 3.1.3']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))"
......
...@@ -8,7 +8,7 @@ defaults = { ...@@ -8,7 +8,7 @@ defaults = {
'AllCops' => { 'AllCops' => {
'NewCops' => 'enable', 'NewCops' => 'enable',
'DisplayCopNames' => true, 'DisplayCopNames' => true,
'TargetRubyVersion' => '2.6', 'TargetRubyVersion' => '3.1',
'Include' => [ 'Include' => [
'**/*.rb', '**/*.rb',
], ],
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment