Merge pull request #6948 from dnkoutso/orphaned_pod_targets

Wire dependencies for pod targets not part of any aggregate target

CHANGELOG.md

@@ -18,8 +18,9 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
 
 ##### Bug Fixes
 
-* None.
-
+* Wire dependencies for pod targets not part of any aggregate target  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#6948](https://github.com/CocoaPods/CocoaPods/pull/6948)
 
 ## 1.3.1 (2017-08-02)
 

lib/cocoapods/installer/xcode/pods_project_generator.rb

@@ -208,12 +208,14 @@ module Pod
         #
         def set_target_dependencies
           frameworks_group = project.frameworks_group
+          test_only_pod_targets = pod_targets.dup
           aggregate_targets.each do |aggregate_target|
             is_app_extension = !(aggregate_target.user_targets.map(&:symbol_type) &
                                  [:app_extension, :watch_extension, :watch2_extension, :tv_extension, :messages_extension]).empty?
             is_app_extension ||= aggregate_target.user_targets.any? { |ut| ut.common_resolved_build_setting('APPLICATION_EXTENSION_API_ONLY') == 'YES' }
 
             aggregate_target.pod_targets.each do |pod_target|
+              test_only_pod_targets.delete(pod_target)
               configure_app_extension_api_only_for_target(aggregate_target) if is_app_extension
 
               unless pod_target.should_build?
@@ -226,11 +228,26 @@ module Pod
               configure_app_extension_api_only_for_target(pod_target) if is_app_extension
 
               unless pod_target.static_framework?
-                add_dependent_targets_to_native_target(pod_target.dependent_targets, pod_target.native_target, is_app_extension, pod_target.requires_frameworks?, frameworks_group)
+                add_dependent_targets_to_native_target(pod_target.dependent_targets,
+                                                       pod_target.native_target, is_app_extension,
+                                                       pod_target.requires_frameworks?, frameworks_group)
                 add_pod_target_test_dependencies(pod_target, frameworks_group)
               end
             end
           end
+          # Wire up remaining pod targets used only by tests and are not used by any aggregate target.
+          test_only_pod_targets.each do |pod_target|
+            unless pod_target.should_build?
+              add_pod_target_test_dependencies(pod_target, frameworks_group)
+              next
+            end
+            unless pod_target.static_framework?
+              add_dependent_targets_to_native_target(pod_target.dependent_targets,
+                                                     pod_target.native_target, false,
+                                                     pod_target.requires_frameworks?, frameworks_group)
+              add_pod_target_test_dependencies(pod_target, frameworks_group)
+            end
+          end
         end
 
         # @param  [String] pod The root name of the development pod.

spec/unit/installer/xcode/pods_project_generator_spec.rb

@@ -291,6 +291,27 @@ module Pod
               @generator.send(:set_target_dependencies)
             end
 
+            it 'adds dependencies to pod targets that are not part of any aggregate target' do
+              @target.stubs(:pod_targets).returns([])
+              @generator.expects(:pod_targets).returns([@pod_target])
+              mock_native_target = mock('CoconutLib')
+
+              dependent_native_target = mock('DependentNativeTarget')
+              dependent_target = mock('dependent-target', :dependent_targets => [])
+              dependent_target.stubs(:should_build?).returns(true)
+              dependent_target.stubs(:native_target).returns(dependent_native_target)
+
+              @pod_target.stubs(:native_target).returns(mock_native_target)
+              @pod_target.stubs(:test_native_targets).returns([])
+              @pod_target.stubs(:dependent_targets).returns([dependent_target])
+              @pod_target.stubs(:test_dependent_targets).returns([])
+              @pod_target.stubs(:should_build? => true)
+
+              mock_native_target.expects(:add_dependency).with(dependent_native_target)
+
+              @generator.send(:set_target_dependencies)
+            end
+
             it 'adds test dependencies to test native targets for a pod target that should not be built' do
               mock_test_native_target = mock('CoconutLib-Unit-Tests')
               test_dependent_native_target = mock('TestDependentNativeTarget')