diff options
author | Samuel Giddins <segiddins@segiddins.me> | 2017-10-29 15:27:52 -0500 |
---|---|---|
committer | Samuel Giddins <segiddins@segiddins.me> | 2017-10-29 15:27:52 -0500 |
commit | d10774eb52029b39acec609b313484b8b5d1b8d0 (patch) | |
tree | 7e1f1def3ec89ffa8ddfc910288d46af97960158 | |
parent | 23316ffeafa83b460a86da95e51b3704c6faec12 (diff) | |
download | bundler-d10774eb52029b39acec609b313484b8b5d1b8d0.tar.gz |
Update vendored Molinillo to 0.6.4
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/vertex.rb b/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/vertex.rb index 16c7d65c4d..e4d016de24 100644 --- a/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/vertex.rb +++ b/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/vertex.rb @@ -33,7 +33,7 @@ module Bundler::Molinillo # @return [Array<Object>] all of the requirements that required # this vertex def requirements - incoming_edges.map(&:requirement) + explicit_requirements + (incoming_edges.map(&:requirement) + explicit_requirements).uniq end # @return [Array<Edge>] the edges of {#graph} that have `self` as their diff --git a/lib/bundler/vendor/molinillo/lib/molinillo/gem_metadata.rb b/lib/bundler/vendor/molinillo/lib/molinillo/gem_metadata.rb index 72af318831..3feb7be9b5 100644 --- a/lib/bundler/vendor/molinillo/lib/molinillo/gem_metadata.rb +++ b/lib/bundler/vendor/molinillo/lib/molinillo/gem_metadata.rb @@ -2,5 +2,5 @@ module Bundler::Molinillo # The version of Bundler::Molinillo. - VERSION = '0.6.3'.freeze + VERSION = '0.6.4'.freeze end diff --git a/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb b/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb index b038d5dcdf..0eb665d17a 100644 --- a/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb +++ b/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb @@ -218,7 +218,7 @@ module Bundler::Molinillo next unless vertex.payload latest_version = vertex.payload.possibilities.reverse_each.find do |possibility| - vertex.requirements.uniq.all? { |req| requirement_satisfied_by?(req, activated, possibility) } + vertex.requirements.all? { |req| requirement_satisfied_by?(req, activated, possibility) } end activated.set_payload(vertex.name, latest_version) |