From 5593ca8e6b542ddb64cdc9fbec763472ff3d8c9f Mon Sep 17 00:00:00 2001 From: Jurre Stender Date: Mon, 23 Aug 2021 15:22:01 +0200 Subject: [PATCH] Update native helpers to use new bundler terminology `lock_shared_dependencies` was renamed to `conservative` in https://github.com/rubygems/rubygems/commit/fb4a8a50a625c897b2be68683b304b94913c5a79 --- bundler/helpers/v2/lib/functions/force_updater.rb | 2 +- bundler/helpers/v2/lib/functions/version_resolver.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bundler/helpers/v2/lib/functions/force_updater.rb b/bundler/helpers/v2/lib/functions/force_updater.rb index a35e0ccaa2..49d88b2e30 100644 --- a/bundler/helpers/v2/lib/functions/force_updater.rb +++ b/bundler/helpers/v2/lib/functions/force_updater.rb @@ -106,7 +106,7 @@ def build_definition(dependencies_to_unlock:) gemfile_name, lockfile_name, gems: gems_to_unlock + subdependencies, - lock_shared_dependencies: true + conservative: true ) # Remove the Gemfile / gemspec requirements on the gems we're diff --git a/bundler/helpers/v2/lib/functions/version_resolver.rb b/bundler/helpers/v2/lib/functions/version_resolver.rb index b5e5d8a128..c11931496f 100644 --- a/bundler/helpers/v2/lib/functions/version_resolver.rb +++ b/bundler/helpers/v2/lib/functions/version_resolver.rb @@ -97,7 +97,7 @@ def build_definition(dependencies_to_unlock) gemfile_name, lockfile_name, gems: dependencies_to_unlock, - lock_shared_dependencies: true + conservative: true ) end