Skip to content

Commit 437df34

Browse files
committed
PDK update
1 parent 1e26b22 commit 437df34

File tree

4 files changed

+26
-27
lines changed

4 files changed

+26
-27
lines changed

.devcontainer/devcontainer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"settings": {
66
"terminal.integrated.profiles.linux": {
77
"bash": {
8-
"path": "bash",
8+
"path": "bash"
99
}
1010
}
1111
},

Gemfile

+23-23
Original file line numberDiff line numberDiff line change
@@ -14,31 +14,31 @@ def location_for(place_or_version, fake_version = nil)
1414
end
1515

1616
group :development do
17-
gem "json", '= 2.1.0', require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
18-
gem "json", '= 2.3.0', require: false if Gem::Requirement.create(['>= 2.7.0', '< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
19-
gem "json", '= 2.5.1', require: false if Gem::Requirement.create(['>= 3.0.0', '< 3.0.5']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
20-
gem "json", '= 2.6.1', require: false if Gem::Requirement.create(['>= 3.1.0', '< 3.1.3']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
21-
gem "json", '= 2.6.3', require: false if Gem::Requirement.create(['>= 3.2.0', '< 4.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
22-
gem "voxpupuli-puppet-lint-plugins", '~> 3.1', require: false
23-
gem "facterdb", '~> 1.18', require: false
24-
gem "metadata-json-lint", '>= 2.0.2', '< 4.0.0', require: false
25-
gem "puppetlabs_spec_helper", '>= 3.0.0', '< 5.0.0', require: false
26-
gem "rspec-puppet-facts", '~> 2.0', require: false
27-
gem "codecov", '~> 0.2', require: false
28-
gem "dependency_checker", '~> 0.2', require: false
29-
gem "parallel_tests", '~> 3.4', require: false
30-
gem "pry", '~> 0.10', require: false
31-
gem "simplecov-console", '~> 0.5', require: false
32-
gem "puppet-debugger", '~> 1.0', require: false
33-
gem "rubocop", '= 1.6.1', require: false
34-
gem "rubocop-performance", '= 1.9.1', require: false
35-
gem "rubocop-rspec", '= 2.0.1', require: false
36-
gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw]
37-
gem "github_changelog_generator", '= 1.15.2', require: false
17+
gem "json", '= 2.1.0', require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
18+
gem "json", '= 2.3.0', require: false if Gem::Requirement.create(['>= 2.7.0', '< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
19+
gem "json", '= 2.5.1', require: false if Gem::Requirement.create(['>= 3.0.0', '< 3.0.5']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
20+
gem "json", '= 2.6.1', require: false if Gem::Requirement.create(['>= 3.1.0', '< 3.1.3']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
21+
gem "json", '= 2.6.3', require: false if Gem::Requirement.create(['>= 3.2.0', '< 4.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
22+
gem "voxpupuli-puppet-lint-plugins", '~> 4.0', require: false
23+
gem "facterdb", '~> 1.18', require: false
24+
gem "metadata-json-lint", '>= 2.0.2', '< 4.0.0', require: false
25+
gem "puppetlabs_spec_helper", '~> 5.0', require: false
26+
gem "rspec-puppet-facts", '~> 2.0', require: false
27+
gem "codecov", '~> 0.2', require: false
28+
gem "dependency_checker", '~> 0.2', require: false
29+
gem "parallel_tests", '= 3.12.1', require: false
30+
gem "pry", '~> 0.10', require: false
31+
gem "simplecov-console", '~> 0.5', require: false
32+
gem "puppet-debugger", '~> 1.0', require: false
33+
gem "rubocop", '= 1.6.1', require: false
34+
gem "rubocop-performance", '= 1.9.1', require: false
35+
gem "rubocop-rspec", '= 2.0.1', require: false
36+
gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw]
37+
gem "github_changelog_generator", '= 1.15.2', require: false
3838
end
3939
group :system_tests do
40-
gem "puppet_litmus", '<= 0.34.6', require: false, platforms: [:ruby]
41-
gem "serverspec", '~> 2.41', require: false
40+
gem "puppet_litmus", '< 1.0.0', require: false, platforms: [:ruby, :x64_mingw]
41+
gem "serverspec", '~> 2.41', require: false
4242
end
4343

4444
puppet_version = ENV['PUPPET_GEM_VERSION']

Rakefile

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ require 'bundler'
44
require 'puppet_litmus/rake_tasks' if Bundler.rubygems.find_name('puppet_litmus').any?
55
require 'puppetlabs_spec_helper/rake_tasks'
66
require 'puppet-syntax/tasks/puppet-syntax'
7-
require 'puppet_blacksmith/rake_tasks' if Bundler.rubygems.find_name('puppet-blacksmith').any?
87
require 'github_changelog_generator/task' if Bundler.rubygems.find_name('github_changelog_generator').any?
98
require 'puppet-strings/tasks' if Bundler.rubygems.find_name('puppet-strings').any?
109

metadata.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,6 @@
8888
}
8989
],
9090
"template-url": "https://github.com/puppetlabs/pdk-templates.git#main",
91-
"template-ref": "2.7.1-0-g9a16c87",
92-
"pdk-version": "2.5.0"
91+
"template-ref": "heads/main-0-g604a3ec",
92+
"pdk-version": "2.7.1"
9393
}

0 commit comments

Comments
 (0)