From a67492e33c6d16e7c06da7b28a776204357e4151 Mon Sep 17 00:00:00 2001 From: Thomas Powell Date: Mon, 12 Aug 2024 15:38:22 -0400 Subject: [PATCH] move to chef maintained cleanroom Signed-off-by: Thomas Powell --- berkshelf.gemspec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/berkshelf.gemspec b/berkshelf.gemspec index 8857f4f77..7c4c7a778 100644 --- a/berkshelf.gemspec +++ b/berkshelf.gemspec @@ -34,7 +34,7 @@ Gem::Specification.new do |s| } s.add_dependency "mixlib-shellout", ">= 2.0", "< 4.0" - s.add_dependency "cleanroom", "~> 1.0" + s.add_dependency "chef-cleanroom", "~> 1.0" s.add_dependency "minitar", ">= 0.6" s.add_dependency "retryable", ">= 2.0", "< 4.0" s.add_dependency "solve", "~> 4.0" @@ -42,10 +42,13 @@ Gem::Specification.new do |s| s.add_dependency "octokit", "~> 4.0" s.add_dependency "mixlib-archive", ">= 1.1.4", "< 2.0" # needed for ruby 3.0 / Dir.chdir removal s.add_dependency "concurrent-ruby", "~> 1.0" + + s.add_dependency "ffi", "~> 1.9", "< 1.16.0" # + if RUBY_VERSION.match?(/3.0/) s.add_dependency "chef", "~> 17.0" # needed for --skip-syntax-check - elsif - s.add_dependency "chef", ">= 15.7.32" + elsif + s.add_dependency "chef", ">= 15.7.32" end s.add_dependency "chef-config" # this is required for Mixlib::Config#from_json