Reverted the gemspecs, mostly, to pre chef18

Signed-off-by: John McCrae <john.mccrae@progress.com>

2 files changed, 18 insertions, 39 deletions

diff --git a/chef-x64-mingw-ucrt.gemspec b/chef-x64-mingw-ucrt.gemspec
deleted file mode 100644
index 0f73be5528..0000000000
--- a/chef-x64-mingw-ucrt.gemspec
+++ /dev/null
@@ -1,23 +0,0 @@
-gemspec = instance_eval(File.read(File.expand_path("chef.gemspec", __dir__)))
-
-gemspec.platform = Gem::Platform.new(%w{x64 mingw ucrt})
-
-# gemspec.add_dependency "win32-api", "~> 1.10.0"
-# gemspec.add_dependency "win32-event", "~> 0.6.1"
-# # TODO: Relax this pin and make the necessary updaets. The issue originally
-# # leading to this pin has been fixed in 0.6.5.
-# gemspec.add_dependency "win32-eventlog", "0.6.3"
-# gemspec.add_dependency "win32-mmap", "~> 0.4.1"
-# gemspec.add_dependency "win32-mutex", "~> 0.4.2"
-# gemspec.add_dependency "win32-process", "~> 0.9"
-# gemspec.add_dependency "win32-service", ">= 2.1.5", "< 3.0"
-# gemspec.add_dependency "wmi-lite", "~> 1.0"
-# gemspec.add_dependency "win32-taskscheduler", "~> 2.0"
-# gemspec.add_dependency "iso8601", ">= 0.12.1", "< 0.14" # validate 0.14 when it comes out
-# gemspec.add_dependency "win32-certstore", "~> 0.6.15" # 0.5+ required for specifying user vs. system store
-# gemspec.add_dependency "chef-powershell", "~> 1.0.12" # The guts of the powershell_exec code have been moved to its own gem, chef-powershell. It's part of the chef-powershell-shim repo.
-gemspec.extensions << "ext/win32-eventlog/Rakefile"
-gemspec.files += Dir.glob("{distro,ext}/**/*")
-gemspec.required_ruby_version = ">= 3.1.2"
-
-gemspec
diff --git a/chef.gemspec b/chef.gemspec
index e23476d25b..f44a1d5a1d 100644
--- a/chef.gemspec
+++ b/chef.gemspec
@@ -26,22 +26,22 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = ">= 3.1.0"
 
-  # Adding Windows support in here
-  if RUBY_PLATFORM == "x64-mingw-ucrt"
-    s.add_dependency "win32-mmap", "~> 0.4.1"
-    s.add_dependency "win32-mutex", "~> 0.4.2"
-    s.add_dependency "chef-powershell", "~> 1.0.12"
-    s.add_dependency "win32-api", "~> 1.10.0"
-    s.add_dependency "win32-service", ">= 2.1.5", "< 3.0"
-    s.add_dependency "win32-event", "~> 0.6.1"
-    s.add_dependency "win32-taskscheduler", "~> 2.0"
-    s.add_dependency "win32-eventlog", "0.6.3"
-    s.add_dependency "win32-process", "~> 0.10"
-    s.add_dependency "wmi-lite", "~> 1.0"
-    s.add_dependency "iso8601", ">= 0.12.1", "< 0.14"
-    s.add_dependency "win32-certstore", "~> 0.6.15"
-    s.extensions << "ext/win32-eventlog/Rakefile"
-  end
+  # # Adding Windows support in here
+  # if RUBY_PLATFORM == "x64-mingw-ucrt"
+  #   s.add_dependency "win32-mmap", "~> 0.4.1"
+  #   s.add_dependency "win32-mutex", "~> 0.4.2"
+  #   s.add_dependency "chef-powershell", "~> 1.0.12"
+  #   s.add_dependency "win32-api", "~> 1.10.0"
+  #   s.add_dependency "win32-service", ">= 2.1.5", "< 3.0"
+  #   s.add_dependency "win32-event", "~> 0.6.1"
+  #   s.add_dependency "win32-taskscheduler", "~> 2.0"
+  #   s.add_dependency "win32-eventlog", "0.6.3"
+  #   s.add_dependency "win32-process", "~> 0.10"
+  #   s.add_dependency "wmi-lite", "~> 1.0"
+  #   s.add_dependency "iso8601", ">= 0.12.1", "< 0.14"
+  #   s.add_dependency "win32-certstore", "~> 0.6.15"
+  #   s.extensions << "ext/win32-eventlog/Rakefile"
+  # end
 
   s.add_dependency "chef-config", "= #{Chef::VERSION}"
   s.add_dependency "chef-utils", "= #{Chef::VERSION}"
@@ -78,6 +78,8 @@ Gem::Specification.new do |s|
 
   s.add_dependency "proxifier", "~> 1.0"
 
+  s.required_ruby_version = ">= 3.1"
+
   s.add_dependency "aws-sdk-s3", "~> 1.91" # s3 recipe-url support
   s.add_dependency "aws-sdk-secretsmanager", "~> 1.46"
   s.add_dependency "vault", "~> 0.16" # hashi vault official client gem