From 9f801503d9ae464af8de5b84282152ebe05afb44 Mon Sep 17 00:00:00 2001 From: Dave Armstrong <david.armstrong@puppet.com> Date: Wed, 31 Mar 2021 10:55:14 +0100 Subject: [PATCH] (GH-419) Removal of win32 gems All platform-specific runtime dependencies are included by the PDK supported versions of Puppet, therefore these are no longer required. --- moduleroot/Gemfile.erb | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/moduleroot/Gemfile.erb b/moduleroot/Gemfile.erb index f9c32dc..2e5f391 100644 --- a/moduleroot/Gemfile.erb +++ b/moduleroot/Gemfile.erb @@ -114,16 +114,6 @@ gems['puppet'] = location_for(puppet_version) gems['facter'] = location_for(facter_version) if facter_version gems['hiera'] = location_for(hiera_version) if hiera_version -if Gem.win_platform? && puppet_version =~ %r{^(file:///|git://)} - # If we're using a Puppet gem on Windows which handles its own win32-xxx gem - # dependencies (>= 3.5.0), set the maximum versions (see PUP-6445). - gems['win32-dir'] = ['<= 0.4.9', require: false] - gems['win32-eventlog'] = ['<= 0.6.5', require: false] - gems['win32-process'] = ['<= 0.7.5', require: false] - gems['win32-security'] = ['<= 0.2.5', require: false] - gems['win32-service'] = ['0.8.8', require: false] -end - gems.each do |gem_name, gem_params| gem gem_name, *gem_params end -- GitLab