Merge pull request #5266 from CocoaPods/seg-search-paths-inheritance

[PodXCConfig] Use recursive dependent targets

CHANGELOG.md

@@ -23,7 +23,9 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
 
 ##### Bug Fixes
 
-* None.  
+* Fix search paths inheritance when there are transitive dependencies.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#5264](https://github.com/CocoaPods/CocoaPods/issues/5264)
 
 
 ## 1.0.0.rc.2 (2016-05-04)

lib/cocoapods/generator/xcconfig/pod_xcconfig.rb

@@ -63,7 +63,7 @@ module Pod
             @xcconfig.merge!(file_accessor.spec_consumer.pod_target_xcconfig)
           end
           XCConfigHelper.add_target_specific_settings(target, @xcconfig)
-          @xcconfig.merge! XCConfigHelper.settings_for_dependent_targets(target, target.dependent_targets)
+          @xcconfig.merge! XCConfigHelper.settings_for_dependent_targets(target, target.recursive_dependent_targets)
           @xcconfig
         end
 

lib/cocoapods/target/pod_target.rb

@@ -184,6 +184,15 @@ module Pod
       end.uniq
     end
 
+    # @return [Array<PodTarget>] the recursive targets that this target has a
+    #         dependency upon.
+    #
+    def recursive_dependent_targets
+      targets = dependent_targets + dependent_targets.flat_map(&:recursive_dependent_targets)
+      targets.uniq!
+      targets
+    end
+
     # Checks if the target should be included in the build configuration with
     # the given name of a given target definition.
     #

cocoapods-integration-specs @ 4560c5c5

-Subproject commit ccf9b780f7d7f28395ec15bad15b8e3eee800d47
+Subproject commit 4560c5c5bbc2fe7d6efe055b41b5fae622640826

spec/integration.rb

@@ -286,6 +286,11 @@ describe_cli 'pod' do
       behaves_like cli_spec 'install_using_checkout_options',
                             'install --no-repo-update'
     end
+
+    describe 'Integrates a pod with search paths inheritance' do
+      behaves_like cli_spec 'install_search_paths_inheritance',
+                            'install --no-repo-update'
+    end
   end
 
   #--------------------------------------#