diff options
author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2021-01-21 14:35:56 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-21 14:35:56 +0900 |
commit | 151e469a6259837246d88b3abbb4d9e46ff38b9d (patch) | |
tree | c071c3e89e5d9ce493f754ce0536499373eab286 /lib/bundler/definition.rb | |
parent | 41d0c708122d0f6389410d503b7f4e6342bf56a0 (diff) |
Merge RubyGems 3.2.6 and Bundler 2.2.6 (#4103)
Diffstat (limited to 'lib/bundler/definition.rb')
-rw-r--r-- | lib/bundler/definition.rb | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb index b22363d119..7683047984 100644 --- a/lib/bundler/definition.rb +++ b/lib/bundler/definition.rb @@ -818,11 +818,6 @@ module Bundler # commonly happens if the version changed in the gemspec next unless new_spec - new_runtime_deps = new_spec.dependencies.select {|d| d.type != :development } - old_runtime_deps = s.dependencies.select {|d| d.type != :development } - # If the dependencies of the path source have changed and locked spec can't satisfy new dependencies, unlock it - next unless new_runtime_deps.sort == old_runtime_deps.sort || new_runtime_deps.all? {|d| satisfies_locked_spec?(d) } - s.dependencies.replace(new_spec.dependencies) end @@ -897,7 +892,7 @@ module Bundler def expand_dependency_with_platforms(dep, platforms) platforms.map do |p| - DepProxy.new(dep, p) + DepProxy.get_proxy(dep, p) end end @@ -977,7 +972,7 @@ module Bundler next requirements if @locked_gems.dependencies[name] != dependency next requirements if dependency.source.is_a?(Source::Path) dep = Gem::Dependency.new(name, ">= #{locked_spec.version}") - requirements[name] = DepProxy.new(dep, locked_spec.platform) + requirements[name] = DepProxy.get_proxy(dep, locked_spec.platform) requirements end.values end |