diff options
| author | The Bundler Bot <bot@bundler.io> | 2017-09-06 22:11:19 +0000 |
|---|---|---|
| committer | Samuel Giddins <segiddins@segiddins.me> | 2017-09-06 21:35:31 -0500 |
| commit | 30a5ec7dafc9888462598af402e7a206113c5dd6 (patch) | |
| tree | f5bbc4e055c404fe390628de18a673f2e08f2ebc | |
| parent | eb63e80fd2c2d1ce01430411fcc1801c5c3ef6b6 (diff) | |
| download | bundler-30a5ec7dafc9888462598af402e7a206113c5dd6.tar.gz | |
Auto merge of #6009 - bundler:seg-molinillo-0-6-3, r=segiddins
Update vendored Molinillo to 0.6.3
See https://github.com/CocoaPods/Molinillo/releases/0.6.3.
(cherry picked from commit 5548a238d4cf38ff2fbec9388e8ab64049c421ed)
| -rw-r--r-- | lib/bundler/vendor/molinillo/lib/molinillo/gem_metadata.rb | 2 | ||||
| -rw-r--r-- | lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/lib/bundler/vendor/molinillo/lib/molinillo/gem_metadata.rb b/lib/bundler/vendor/molinillo/lib/molinillo/gem_metadata.rb index 17ed085673..72af318831 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.2'.freeze + VERSION = '0.6.3'.freeze end diff --git a/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb b/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb index d5a181ea14..b038d5dcdf 100644 --- a/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb +++ b/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb @@ -461,11 +461,15 @@ module Bundler::Molinillo # @param [UnwindDetails] details of the conflict just unwound from # @return [void] def filter_possibilities_for_primary_unwind(unwind_details) - all_requirements = unwind_details.conflicting_requirements + unwinds_to_state = unused_unwind_options.select { |uw| uw.state_index == unwind_details.state_index } + unwinds_to_state << unwind_details + unwind_requirement_sets = unwinds_to_state.map(&:conflicting_requirements) state.possibilities.reject! do |possibility_set| possibility_set.possibilities.none? do |poss| - possibility_satisfies_requirements?(poss, all_requirements) + unwind_requirement_sets.any? do |requirements| + possibility_satisfies_requirements?(poss, requirements) + end end end end |