Skip to content

Commit ac4981b

Browse files
Merge pull request #313 from puppetlabs/MAINT-PDK_update
(MAINT) Run PDK update
2 parents 48f1df4 + e068e37 commit ac4981b

File tree

4 files changed

+15
-11
lines changed

4 files changed

+15
-11
lines changed

.pdkignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
/.fixtures.yml
3030
/Gemfile
3131
/.gitattributes
32+
/.github/
3233
/.gitignore
3334
/.pdkignore
3435
/.puppet-lint.rc

.vscode/extensions.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"recommendations": [
33
"puppet.puppet-vscode",
4-
"rebornix.Ruby"
4+
"Shopify.ruby-lsp"
55
]
66
}

Gemfile

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,26 +20,29 @@ group :development do
2020
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))
2121
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))
2222
gem "racc", '~> 1.4.0', require: false if Gem::Requirement.create(['>= 2.7.0', '< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
23+
gem "deep_merge", '~> 1.0', require: false
2324
gem "voxpupuli-puppet-lint-plugins", '~> 5.0', require: false
2425
gem "facterdb", '~> 1.18', require: false
25-
gem "metadata-json-lint", '~> 3.0', require: false
26-
gem "puppetlabs_spec_helper", '~> 6.0', require: false
27-
gem "rspec-puppet-facts", '~> 2.0', require: false
26+
gem "metadata-json-lint", '~> 4.0', require: false
27+
gem "rspec-puppet-facts", '~> 3.0', require: false
2828
gem "dependency_checker", '~> 1.0.0', require: false
2929
gem "parallel_tests", '= 3.12.1', require: false
3030
gem "pry", '~> 0.10', require: false
31+
gem "simplecov-console", '~> 0.9', require: false
3132
gem "puppet-debugger", '~> 1.0', require: false
3233
gem "rubocop", '~> 1.50.0', require: false
3334
gem "rubocop-performance", '= 1.16.0', require: false
3435
gem "rubocop-rspec", '= 2.19.0', require: false
35-
gem "puppet-strings", '~> 4.0', require: false
3636
gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw]
37-
gem 'simplecov', '~> 0.21.0', require: false
38-
gem 'simplecov-console', '~> 0.9.0', require: false
37+
end
38+
group :development, :release_prep do
39+
gem "puppet-strings", '~> 4.0', require: false
40+
gem "puppetlabs_spec_helper", '~> 7.0', require: false
3941
end
4042
group :system_tests do
41-
gem "puppet_litmus", '~> 1.0', require: false, platforms: [:ruby, :x64_mingw]
42-
gem "serverspec", '~> 2.41', require: false
43+
gem "puppet_litmus", '~> 1.0', require: false, platforms: [:ruby, :x64_mingw]
44+
gem "CFPropertyList", '< 3.0.7', require: false, platforms: [:mswin, :mingw, :x64_mingw]
45+
gem "serverspec", '~> 2.41', require: false
4346
end
4447

4548
puppet_version = ENV['PUPPET_GEM_VERSION']

metadata.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
"version_requirement": ">= 7.0.0 < 9.0.0"
7575
}
7676
],
77-
"pdk-version": "3.0.0",
77+
"pdk-version": "3.0.1",
7878
"template-url": "https://github.com/puppetlabs/pdk-templates.git#main",
79-
"template-ref": "tags/3.0.0-0-g5bfc1c0"
79+
"template-ref": "tags/3.2.0-0-gb257ef1"
8080
}

0 commit comments

Comments
 (0)