From 6cd93345ecdad0dcd8952276f8952e3ae7702753 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Thu, 9 May 2024 18:43:10 +0200 Subject: [PATCH] bolt: Allow >= 3.10 < 5 This also updates the orchestrator_client dependency. It requires faraday 1.x. Older versions of orchestrator_client also depend on faraday but didn't specify the version requirement. r10k 4 depends on a newer puppet_forge gem which in turn depends on faraday 2. If we only bump r10k we will downgrade orchestrator_client from 0.7.0 to 0.5.3, which we probably don't want. Result => orchestrator_client needs to be updated to work with faraday 2. (which is actually implemented but unreleased). This also contains https://github.com/puppetlabs/bolt/pull/3311 --- bolt.gemspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bolt.gemspec b/bolt.gemspec index 8beacbbff..e0827a037 100644 --- a/bolt.gemspec +++ b/bolt.gemspec @@ -55,12 +55,12 @@ Gem::Specification.new do |spec| spec.add_dependency "net-scp", ">= 1.2", "< 5.0" spec.add_dependency "net-ssh", ">= 4.0", "< 8.0" spec.add_dependency "net-ssh-krb", "~> 0.5" - spec.add_dependency "orchestrator_client", "~> 0.5" + spec.add_dependency "orchestrator_client", "~> 0.7" spec.add_dependency "puppet", ">= 6.18.0" spec.add_dependency "puppetfile-resolver", ">= 0.6.2", "< 1.0" spec.add_dependency "puppet-resource_api", ">= 1.8.1" spec.add_dependency "puppet-strings", ">= 2.3.0", "< 5.0" - spec.add_dependency "r10k", "~> 3.10" + spec.add_dependency "r10k", ">= 3.10", "< 5" spec.add_dependency "ruby_smb", "~> 1.0" spec.add_dependency "terminal-table", "~> 3.0" spec.add_dependency "winrm", "~> 2.0"