Skip to content

Commit

Permalink
Update native helpers to use new bundler terminology
Browse files Browse the repository at this point in the history
`lock_shared_dependencies` was renamed to `conservative` in rubygems/rubygems@fb4a8a5
  • Loading branch information
jurre committed Aug 23, 2021
1 parent 5a5b555 commit 5593ca8
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion bundler/helpers/v2/lib/functions/force_updater.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion bundler/helpers/v2/lib/functions/version_resolver.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 5593ca8

Please sign in to comment.