Merge pull request #4097 from CocoaPods/seg-resolver-platforms-fix

[Resolver] Allow platform detection to work for nested dependencies

CHANGELOG.md

@@ -23,6 +23,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
   [Samuel Giddins](https://github.com/segiddins)
   [#4065](https://github.com/CocoaPods/CocoaPods/issues/4065)
 
+* Fix resolving to platform-compatible versions of transitive dependencies.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#4084](https://github.com/CocoaPods/CocoaPods/issues/4084)
+
 
 ## 0.39.0.beta.3 (2015-08-28)
 

lib/cocoapods/installer/analyzer.rb

@@ -537,7 +537,7 @@ module Pod
         end
 
         specs_by_target = nil
-        UI.section "Resolving dependencies of #{UI.path podfile.defined_in_file}" do
+        UI.section "Resolving dependencies of #{UI.path(podfile.defined_in_file) || 'Podfile'}" do
           resolver = Resolver.new(sandbox, podfile, locked_dependencies, sources)
           specs_by_target = resolver.resolve
           specs_by_target.values.flatten(1).each(&:validate_cocoapods_version)

lib/cocoapods/resolver.rb

@@ -38,6 +38,7 @@ module Pod
       @locked_dependencies = locked_dependencies
       @sources = Array(sources)
       @platforms_by_dependency = Hash.new { |h, k| h[k] = [] }
+      @cached_sets = {}
     end
 
     #-------------------------------------------------------------------------#
@@ -58,7 +59,6 @@ module Pod
           @platforms_by_dependency[dep].push(target.platform).uniq!
         end
       end
-      @cached_sets = {}
       @activated = Molinillo::Resolver.new(self, self).resolve(dependencies, locked_dependencies)
       specs_by_target.tap do |specs_by_target|
         specs_by_target.values.flatten.each do |spec|
@@ -409,10 +409,10 @@ module Pod
     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
+        pred + pred.map(&all_predecessors).reduce(Set.new, &:|) << vertex
       end
       vertex = dependency_graph.vertex_named(dependency.name)
-      predecessors = all_predecessors[vertex].reject { |v| v.explicit_requirements.empty? }
+      predecessors = all_predecessors[vertex].reject { |v| !dependency_graph.root_vertex_named(v.name) }
       platforms_to_satisfy = predecessors.flat_map(&:explicit_requirements).flat_map { |r| @platforms_by_dependency[r] }
 
       platforms_to_satisfy.all? do |platform_to_satisfy|

spec/unit/resolver_spec.rb

@@ -191,6 +191,30 @@ module Pod
         ]
       end
 
+      it 'selects only platform-compatible versions for transitive dependencies' do
+        spec = Pod::Spec.new do |s|
+          s.name = 'lib'
+          s.version = '1.0'
+          s.platform = :ios, '5.0'
+          s.subspec('Calendar') {}
+          s.subspec('Classes') { |ss| ss.dependency 'lib/Calendar' }
+          s.subspec('RequestManager') do |ss|
+            ss.dependency 'lib/Classes'
+            ss.dependency 'AFNetworking'
+          end
+          s.default_subspec = 'RequestManager'
+        end
+        @podfile = Podfile.new do
+          platform :ios, '5.0'
+          pod 'lib'
+        end
+        @resolver.stubs(:podfile).returns(@podfile)
+        @resolver.send(:cached_sets)['lib'] = stub(:all_specifications => [spec])
+        @resolver.resolve.values.flatten.map(&:to_s).sort.should == [
+          'AFNetworking (1.3.4)', 'lib (1.0)', 'lib/Calendar (1.0)', 'lib/Classes (1.0)', 'lib/RequestManager (1.0)'
+        ]
+      end
+
       it 'raises an informative error when version conflicts are caused by platform incompatibilities' do
         @podfile = Podfile.new do
           platform :osx, '10.7'