lib/bundler/definition.rb in bundler-2.2.5 vs lib/bundler/definition.rb in bundler-2.2.6

- old
+ new

@@ -816,15 +816,10 @@ # If the spec is no longer in the path source, unlock it. This # 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 converged << s end @@ -895,11 +890,11 @@ deps end def expand_dependency_with_platforms(dep, platforms) platforms.map do |p| - DepProxy.new(dep, p) + DepProxy.get_proxy(dep, p) end end def source_requirements # Load all specs from remote sources @@ -975,10 +970,10 @@ dependency = dependencies_by_name[name] next requirements unless dependency 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 def equivalent_rubygems_remotes?(source)