From ac51bf9515f07697d39d6184bfc5f6f615d74fc2 Mon Sep 17 00:00:00 2001 From: Samuel Giddins Date: Mon, 22 Aug 2016 12:35:03 -0500 Subject: Always use DepProxy in the resolver --- lib/bundler/definition.rb | 3 ++- lib/bundler/resolver.rb | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb index 2d328e0de1..e1826746ff 100644 --- a/lib/bundler/definition.rb +++ b/lib/bundler/definition.rb @@ -816,7 +816,8 @@ module Bundler def additional_base_requirements_for_resolve return [] unless @locked_gems && Bundler.settings[:only_update_to_newer_versions] @locked_gems.specs.reduce({}) do |requirements, locked_spec| - requirements[locked_spec.name] = Gem::Dependency.new(locked_spec.name, ">= #{locked_spec.version}") + dep = Gem::Dependency.new(locked_spec.name, ">= #{locked_spec.version}") + requirements[locked_spec.name] = DepProxy.new(dep, locked_spec.platform) requirements end.values end diff --git a/lib/bundler/resolver.rb b/lib/bundler/resolver.rb index 6814d52c65..e1d993831f 100644 --- a/lib/bundler/resolver.rb +++ b/lib/bundler/resolver.rb @@ -193,7 +193,7 @@ module Bundler dep = Dependency.new(ls.name, ls.version) @base_dg.add_vertex(ls.name, DepProxy.new(dep, ls.platform), true) end - additional_base_requirements.each {|d| @base_dg.add_vertex(d.name, DepProxy.new(d, Gem::Platform::RUBY)) } + additional_base_requirements.each {|d| @base_dg.add_vertex(d.name, d) } @ruby_version = ruby_version @gem_version_promoter = gem_version_promoter end -- cgit v1.2.1