diff options
| author | The Bundler Bot <bot@bundler.io> | 2017-10-29 20:29:45 +0000 |
|---|---|---|
| committer | Samuel Giddins <segiddins@segiddins.me> | 2017-10-30 13:56:08 -0500 |
| commit | efd4dff28750f561e0bea0dcc657ea17998a7bc1 (patch) | |
| tree | ecaeb4c50561d841846ed3996e823d2564f0b51c | |
| parent | 82a1f0a8121af219b4650be70858ab6c8450c3ba (diff) | |
| download | bundler-efd4dff28750f561e0bea0dcc657ea17998a7bc1.tar.gz | |
Auto merge of #6131 - bundler:seg-molinillo-0.6.4, r=segiddins
Update vendored Molinillo to 0.6.4
### What was the end-user problem that led to this PR?
The problem was uncovered in #6114.
### What is your fix for the problem, implemented in this PR?
My fix updates molinillo to 0.6.4.
### Why did you choose this fix out of the possible options?
See https://github.com/CocoaPods/Molinillo/releases/tag/0.6.4 for release notes.
(cherry picked from commit b20214d10ac9883eb54b7c08bdeb3e2724bc018e)
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) |