Merge pull request #4312 from CocoaPods/seg-molinillo-0.4

Update Molinillo to 0.4

Gemfile

@@ -22,7 +22,7 @@ group :development do
   cp_gem 'cocoapods-stats',      'cocoapods-stats'
   cp_gem 'cocoapods-trunk',      'cocoapods-trunk'
   cp_gem 'cocoapods-try',        'cocoapods-try'
-  cp_gem 'molinillo',            'Molinillo', '0.3-stable'
+  cp_gem 'molinillo',            'Molinillo'
   cp_gem 'xcodeproj',            'Xcodeproj'
 
   gem 'cocoapods-dependencies'

Gemfile.lock

@@ -17,10 +17,10 @@ GIT
 
 GIT
   remote: https://github.com/CocoaPods/Molinillo.git
-  revision: 604847cee4a460590bb6c67ffac4279ea3c02b8f
-  branch: 0.3-stable
+  revision: 3aa370af87ec94e316a57a79f3e4b5a7a616837e
+  branch: master
   specs:
-    molinillo (0.3.1)
+    molinillo (0.4.0)
 
 GIT
   remote: https://github.com/CocoaPods/Xcodeproj.git
@@ -92,7 +92,7 @@ PATH
       cocoapods-try (~> 0.5.1)
       colored (~> 1.2)
       escape (~> 0.0.4)
-      molinillo (~> 0.3.1)
+      molinillo (~> 0.4.0)
       nap (~> 1.0)
       xcodeproj (~> 0.28.0)
 

cocoapods.gemspec

@@ -36,7 +36,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'cocoapods-stats',      '~> 0.6.1'
   s.add_runtime_dependency 'cocoapods-try',        '~> 0.5.1'
   s.add_runtime_dependency 'cocoapods-trunk',      '~> 0.6.4'
-  s.add_runtime_dependency 'molinillo',            '~> 0.3.1'
+  s.add_runtime_dependency 'molinillo',            '~> 0.4.0'
 
   s.add_runtime_dependency 'colored',       '~> 1.2'
   s.add_runtime_dependency 'escape',        '~> 0.0.4'

lib/cocoapods/installer/analyzer/locking_dependency_analyzer.rb

@@ -24,7 +24,7 @@ module Pod
             explicit_dependencies = lockfile.to_hash['DEPENDENCIES'] || []
             explicit_dependencies.each do |string|
               dependency = Dependency.new(string)
-              dependency_graph.add_root_vertex(dependency.name, nil)
+              dependency_graph.add_vertex(dependency.name, nil, true)
             end
 
             pods = lockfile.to_hash['PODS'] || []

lib/cocoapods/resolver.rb

@@ -422,12 +422,9 @@ module Pod
     #
     # @return [Bool]
     def spec_is_platform_compatible?(dependency_graph, dependency, spec)
-      all_predecessors = ->(vertex) do
-        pred = vertex.predecessors
-        pred + pred.map(&all_predecessors).reduce(Set.new, &:|) << vertex
-      end
       vertex = dependency_graph.vertex_named(dependency.name)
-      predecessors = all_predecessors[vertex].reject { |v| !dependency_graph.root_vertex_named(v.name) }
+      predecessors = vertex.recursive_predecessors.select(&:root)
+      predecessors << vertex if vertex.root?
       platforms_to_satisfy = predecessors.flat_map(&:explicit_requirements).flat_map { |r| @platforms_by_dependency[r] }
 
       platforms_to_satisfy.all? do |platform_to_satisfy|
@@ -461,9 +458,7 @@ module Pod
     def edge_is_valid_for_target?(edge, target)
       dependencies_for_target_platform =
         edge.origin.payload.all_dependencies(target.platform).map(&:name)
-      edge.requirements.any? do |dependency|
-        dependencies_for_target_platform.include?(dependency.name)
-      end
+      dependencies_for_target_platform.include?(edge.requirement.name)
     end
   end
 end

spec/unit/resolver_spec.rb

@@ -2,7 +2,7 @@ require File.expand_path('../../spec_helper', __FILE__)
 
 def dependency_graph_from_array(locked_dependencies)
   locked_dependencies.reduce(Molinillo::DependencyGraph.new) do |graph, dep|
-    graph.add_root_vertex(dep.name, dep)
+    graph.add_vertex(dep.name, dep, true)
     graph
   end
 end