diff options
author | David RodrÃguez <deivid.rodriguez@riseup.net> | 2022-07-06 22:29:13 +0200 |
---|---|---|
committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2022-10-18 16:33:15 +0900 |
commit | cef7f6b2241565f51bb724c19b89b8320825b98a (patch) | |
tree | 16b898f2ab4964f98948afc7bfbea9078b9ba932 | |
parent | 8c4bd1e58d426ff014a3958ac197d40b4e367f00 (diff) |
[rubygems/rubygems] Remove now unnecessary parameter to `expand_dependencies`
We just call it once for resolution, so we can simplify things.
https://github.com/rubygems/rubygems/commit/99c144fbe3
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/6578
-rw-r--r-- | lib/bundler/definition.rb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb index 6537ba1de8..1cf0bbbdb4 100644 --- a/lib/bundler/definition.rb +++ b/lib/bundler/definition.rb @@ -479,7 +479,7 @@ module Bundler end def expanded_dependencies - @expanded_dependencies ||= expand_dependencies(dependencies + metadata_dependencies, true) + @expanded_dependencies ||= expand_dependencies(dependencies + metadata_dependencies) end def filter_specs(specs, deps) @@ -791,11 +791,10 @@ module Bundler ] end - def expand_dependencies(dependencies, remote = false) + def expand_dependencies(dependencies) deps = [] dependencies.each do |dep| - next unless remote || dep.current_platform? - target_platforms = dep.gem_platforms(remote ? @platforms : [generic_local_platform]) + target_platforms = dep.gem_platforms(@platforms) deps += expand_dependency_with_platforms(dep, target_platforms) end deps |