cocoapods 1.5.3 → 1.6.0.beta.1

data/lib/cocoapods/installer/post_install_hooks_context.rb

@@ -4,22 +4,36 @@ module Pod
     # the context of the installer.
     #
     class PostInstallHooksContext
-      # @return [String] The path to the sandbox root (`Pods` directory).
+      # @return [Sandbox] The Sandbox for the project.
       #
-      attr_accessor :sandbox_root
+      attr_reader :sandbox
 
-      # @return [Project] The Pods Xcode project.
+      # @return [String] The path to the sandbox root (`Pods` directory).
       #
-      attr_accessor :pods_project
+      attr_reader :sandbox_root
 
-      # @return [Sandbox] The Sandbox for the project.
+      # @return [Xcodeproj::Project] The Pods Xcode project.
       #
-      attr_accessor :sandbox
+      attr_reader :pods_project
 
       # @return [Array<UmbrellaTargetDescription>] The list of
       #         the CocoaPods umbrella targets generated by the installer.
       #
-      attr_accessor :umbrella_targets
+      attr_reader :umbrella_targets
+
+      # Initialize a new instance
+      #
+      # @param [Sandbox] sandbox see #sandbox
+      # @param [String] sandbox_root see #sandbox_root
+      # @param [Xcodeproj::Project] pods_project see #pods_project
+      # @param [Array<UmbrellaTargetDescription>] umbrella_targets see #umbrella_targets
+      #
+      def initialize(sandbox, sandbox_root, pods_project, umbrella_targets)
+        @sandbox = sandbox
+        @sandbox_root = sandbox_root
+        @pods_project = pods_project
+        @umbrella_targets = umbrella_targets
+      end
 
       # @return [PostInstallHooksContext] Convenience class generator method
       #
@@ -34,24 +48,17 @@ module Pod
       #         static context.
       #
       def self.generate(sandbox, aggregate_targets)
-        umbrella_targets_descriptions = []
-        aggregate_targets.each do |umbrella|
-          desc = UmbrellaTargetDescription.new
-          desc.user_project = umbrella.user_project
-          desc.user_targets = umbrella.user_targets
-          desc.specs = umbrella.specs
-          desc.platform_name = umbrella.platform.name
-          desc.platform_deployment_target = umbrella.platform.deployment_target.to_s
-          desc.cocoapods_target_label = umbrella.label
-          umbrella_targets_descriptions << desc
+        umbrella_targets_descriptions = aggregate_targets.map do |umbrella|
+          user_project = umbrella.user_project
+          user_targets = umbrella.user_targets
+          specs = umbrella.specs
+          platform_name = umbrella.platform.name
+          platform_deployment_target = umbrella.platform.deployment_target.to_s
+          cocoapods_target_label = umbrella.label
+          UmbrellaTargetDescription.new(user_project, user_targets, specs, platform_name, platform_deployment_target, cocoapods_target_label)
         end
 
-        result = new
-        result.sandbox_root = sandbox.root.to_s
-        result.pods_project = sandbox.project
-        result.sandbox = sandbox
-        result.umbrella_targets = umbrella_targets_descriptions
-        result
+        new(sandbox, sandbox.root.to_s, sandbox.project, umbrella_targets_descriptions)
       end
 
       # Pure data class which describes and umbrella target.
@@ -60,7 +67,47 @@ module Pod
         # @return [Xcodeproj::Project] The user project into which this target
         #         is integrated.
         #
-        attr_accessor :user_project
+        attr_reader :user_project
+
+        # @return [Array<PBXNativeTarget>]
+        #         The list of user targets integrated by this umbrella target.
+        #
+        attr_reader :user_targets
+
+        # @return [Array<Specification>] The list of the
+        #         specifications of the target.
+        #
+        attr_reader :specs
+
+        # @return [Symbol] The platform (either `:ios`, `:watchos`, `:tvos`, or `:osx`).
+        #
+        attr_reader :platform_name
+
+        # @return [String] The deployment target.
+        #
+        attr_reader :platform_deployment_target
+
+        # @return [String] The label for the target.
+        #
+        attr_reader :cocoapods_target_label
+
+        # Initialize a new instance
+        #
+        # @param [Xcodeproj::Project] user_project see #user_project
+        # @param [Array<PBXNativeTarget>] user_targets see #user_targets
+        # @param [Array<Specification>] specs see #specs
+        # @param [Symbol] platform_name see #platform_name
+        # @param [String] platform_deployment_target see #platform_deployment_target
+        # @param [String] cocoapods_target_label see #cocoapods_target_label
+        #
+        def initialize(user_project, user_targets, specs, platform_name, platform_deployment_target, cocoapods_target_label)
+          @user_project = user_project
+          @user_targets = user_targets
+          @specs = specs
+          @platform_name = platform_name
+          @platform_deployment_target = platform_deployment_target
+          @cocoapods_target_label = cocoapods_target_label
+        end
 
         # @return [String] The path of the user project
         #         integrated by this target.
@@ -69,11 +116,6 @@ module Pod
           user_project.path if user_project
         end
 
-        # @return [Array<PBXNativeTarget>]
-        #         The list of user targets integrated by this umbrella target.
-        #
-        attr_accessor :user_targets
-
         # @return [Array<String>] The list of the UUIDs of the
         #         user targets integrated by this umbrella
         #         target.  They can be used to find the
@@ -84,23 +126,6 @@ module Pod
         def user_target_uuids
           user_targets.map(&:uuid)
         end
-
-        # @return [Array<Specification>] The list of the
-        #         specifications of the target.
-        #
-        attr_accessor :specs
-
-        # @return [Symbol] The platform (either `:ios`, `:watchos`, `:tvos`, or `:osx`).
-        #
-        attr_accessor :platform_name
-
-        # @return [String] The deployment target.
-        #
-        attr_accessor :platform_deployment_target
-
-        # @return [String] The label for the target.
-        #
-        attr_accessor :cocoapods_target_label
       end
     end
   end

data/lib/cocoapods/installer/pre_install_hooks_context.rb

@@ -4,21 +4,35 @@ module Pod
     # the context of the installer before analysis has been completed.
     #
     class PreInstallHooksContext
-      # @return [String] The path to the sandbox root (`Pods` directory).
-      #
-      attr_accessor :sandbox_root
-
       # @return [Podfile] The Podfile for the project.
       #
-      attr_accessor :podfile
+      attr_reader :podfile
 
       # @return [Sandbox] The Sandbox for the project.
       #
-      attr_accessor :sandbox
+      attr_reader :sandbox
+
+      # @return [String] The path to the sandbox root (`Pods` directory).
+      #
+      attr_reader :sandbox_root
 
       # @return [Lockfile] The Lockfile for the project.
       #
-      attr_accessor :lockfile
+      attr_reader :lockfile
+
+      # Initialize a new instance
+      #
+      # @param [Sandbox] sandbox see #sandbox
+      # @param [String] sandbox_root see #sandbox_root
+      # @param [Podfile] podfile see #podfile
+      # @param [Lockfile] lockfile see #lockfile
+      #
+      def initialize(podfile, sandbox, sandbox_root, lockfile)
+        @podfile = podfile
+        @sandbox = sandbox
+        @sandbox_root = sandbox_root
+        @lockfile = lockfile
+      end
 
       # @param  [Sandbox] sandbox see {#sandbox}
       #
@@ -30,12 +44,7 @@ module Pod
       #         static context.
       #
       def self.generate(sandbox, podfile, lockfile)
-        result = new
-        result.podfile = podfile
-        result.sandbox = sandbox
-        result.sandbox_root = sandbox.root.to_s
-        result.lockfile = lockfile
-        result
+        new(podfile, sandbox, sandbox.root.to_s, lockfile)
       end
     end
   end

data/lib/cocoapods/installer/source_provider_hooks_context.rb

@@ -20,7 +20,9 @@ module Pod
         @sources = []
       end
 
-      # @param [Source] Source object to be added to the installer
+      # @param [Source] source object to be added to the installer
+      #
+      # @return [void]
       #
       def add_source(source)
         unless source.nil?

data/lib/cocoapods/installer/user_project_integrator.rb

@@ -44,8 +44,6 @@ module Pod
       # @param  [Pathname] installation_root @see #installation_root
       # @param  [Array<AggregateTarget>]  targets @see #targets
       #
-      # @todo   Too many initialization arguments
-      #
       def initialize(podfile, sandbox, installation_root, targets)
         @podfile = podfile
         @sandbox = sandbox

data/lib/cocoapods/installer/user_project_integrator/target_integrator.rb

@@ -162,7 +162,7 @@ module Pod
           #
           def create_or_update_user_script_phases(script_phases, native_target)
             script_phase_names = script_phases.map { |k| k[:name] }
-            # Delete script phases no longer present in the target definition.
+            # Delete script phases no longer present in the target.
             native_target_script_phases = native_target.shell_script_build_phases.select { |bp| !bp.name.nil? && bp.name.start_with?(USER_BUILD_PHASE_PREFIX) }
             native_target_script_phases.each do |script_phase|
               script_phase_name_without_prefix = script_phase.name.sub(USER_BUILD_PHASE_PREFIX, '')
@@ -171,16 +171,16 @@ module Pod
               end
             end
             # Create or update the ones that are expected to be.
-            script_phases.each do |td_script_phase|
-              name_with_prefix = USER_BUILD_PHASE_PREFIX + td_script_phase[:name]
+            script_phases.each do |script_phase|
+              name_with_prefix = USER_BUILD_PHASE_PREFIX + script_phase[:name]
               phase = TargetIntegrator.create_or_update_build_phase(native_target, name_with_prefix)
-              phase.shell_script = td_script_phase[:script]
-              phase.shell_path = td_script_phase[:shell_path] if td_script_phase.key?(:shell_path)
-              phase.input_paths = td_script_phase[:input_files] if td_script_phase.key?(:input_files)
-              phase.output_paths = td_script_phase[:output_files] if td_script_phase.key?(:output_files)
-              phase.show_env_vars_in_log = td_script_phase[:show_env_vars_in_log] ? '1' : '0' if td_script_phase.key?(:show_env_vars_in_log)
+              phase.shell_script = script_phase[:script]
+              phase.shell_path = script_phase[:shell_path] if script_phase.key?(:shell_path)
+              phase.input_paths = script_phase[:input_files] if script_phase.key?(:input_files)
+              phase.output_paths = script_phase[:output_files] if script_phase.key?(:output_files)
+              phase.show_env_vars_in_log = script_phase[:show_env_vars_in_log] ? '1' : '0' if script_phase.key?(:show_env_vars_in_log)
 
-              execution_position = td_script_phase[:execution_position]
+              execution_position = script_phase[:execution_position]
               unless execution_position == :any
                 compile_build_phase_index = native_target.build_phases.index do |bp|
                   bp.is_a?(Xcodeproj::Project::Object::PBXSourcesBuildPhase)
@@ -321,18 +321,24 @@ module Pod
         # @return [void]
         #
         def add_copy_resources_script_phase
-          native_targets.each do |native_target|
-            script_path = target.copy_resources_script_relative_path
-            resource_paths_by_config = target.resource_paths_by_config
-            if resource_paths_by_config.values.all?(&:empty?)
+          unless target.includes_resources?
+            native_targets.each do |native_target|
               TargetIntegrator.remove_copy_resources_script_phase_from_target(native_target)
-            else
-              resource_paths_flattened = resource_paths_by_config.values.flatten.uniq
-              input_paths = [target.copy_resources_script_relative_path, *resource_paths_flattened]
-              output_paths = TargetIntegrator.resource_output_paths(resource_paths_flattened)
-              TargetIntegrator.validate_input_output_path_limit(input_paths, output_paths)
-              TargetIntegrator.create_or_update_copy_resources_script_phase_to_target(native_target, script_path, input_paths, output_paths)
             end
+            return
+          end
+
+          script_path = target.copy_resources_script_relative_path
+          resource_paths_by_config = target.resource_paths_by_config
+          resource_paths_flattened = resource_paths_by_config.values.flatten.uniq
+          input_paths = [target.copy_resources_script_relative_path, *resource_paths_flattened]
+          output_paths = TargetIntegrator.resource_output_paths(resource_paths_flattened)
+          TargetIntegrator.validate_input_output_path_limit(input_paths, output_paths)
+
+          native_targets.each do |native_target|
+            # Static library targets cannot include resources. Skip this phase from being added instead.
+            next if native_target.symbol_type == :static_library
+            TargetIntegrator.create_or_update_copy_resources_script_phase_to_target(native_target, script_path, input_paths, output_paths)
           end
         end
 
@@ -356,17 +362,21 @@ module Pod
         # @return [void]
         #
         def add_embed_frameworks_script_phase
-          native_targets_to_embed_in.each do |native_target|
-            script_path = target.embed_frameworks_script_relative_path
-            framework_paths_by_config = target.framework_paths_by_config.values.flatten.uniq
-            if framework_paths_by_config.all?(&:empty?)
+          unless target.includes_frameworks?
+            native_targets_to_embed_in.each do |native_target|
               TargetIntegrator.remove_embed_frameworks_script_phase_from_target(native_target)
-            else
-              input_paths = [target.embed_frameworks_script_relative_path, *framework_paths_by_config.map { |fw| [fw[:input_path], fw[:dsym_input_path]] }.flatten.compact]
-              output_paths = framework_paths_by_config.map { |fw| [fw[:output_path], fw[:dsym_output_path]] }.flatten.compact.uniq
-              TargetIntegrator.validate_input_output_path_limit(input_paths, output_paths)
-              TargetIntegrator.create_or_update_embed_frameworks_script_phase_to_target(native_target, script_path, input_paths, output_paths)
             end
+            return
+          end
+
+          script_path = target.embed_frameworks_script_relative_path
+          framework_paths_by_config = target.framework_paths_by_config.values.flatten.uniq
+          input_paths = [target.embed_frameworks_script_relative_path, *framework_paths_by_config.map { |fw| [fw[:input_path], fw[:dsym_input_path]] }.flatten.compact]
+          output_paths = framework_paths_by_config.map { |fw| [fw[:output_path], fw[:dsym_output_path]] }.flatten.compact.uniq
+          TargetIntegrator.validate_input_output_path_limit(input_paths, output_paths)
+
+          native_targets_to_embed_in.each do |native_target|
+            TargetIntegrator.create_or_update_embed_frameworks_script_phase_to_target(native_target, script_path, input_paths, output_paths)
           end
         end
 

data/lib/cocoapods/installer/user_project_integrator/target_integrator/xcconfig_integrator.rb

@@ -42,19 +42,14 @@ module Pod
           #         The build configuration.
           #
           def self.set_target_xcconfig(pod_bundle, target, config)
-            path = pod_bundle.xcconfig_relative_path(config.name)
-            group = config.project['Pods'] || config.project.new_group('Pods')
-            file_ref = group.files.find { |f| f.path == path }
-            existing = config.base_configuration_reference
+            file_ref = create_xcconfig_ref(pod_bundle, config)
+            path = file_ref.path
 
-            set_base_configuration_reference = ->() do
-              file_ref ||= group.new_file(path)
-              config.base_configuration_reference = file_ref
-            end
+            existing = config.base_configuration_reference
 
             if existing && existing != file_ref
               if existing.real_path.to_path.start_with?(pod_bundle.sandbox.root.to_path << '/')
-                set_base_configuration_reference.call
+                config.base_configuration_reference = file_ref
               elsif !xcconfig_includes_target_xcconfig?(config.base_configuration_reference, path)
                 unless existing_config_is_identical_to_pod_config?(existing.real_path, pod_bundle.xcconfig_path(config.name))
                   UI.warn 'CocoaPods did not set the base configuration of your ' \
@@ -66,7 +61,7 @@ module Pod
                 end
               end
             elsif config.base_configuration_reference.nil? || file_ref.nil?
-              set_base_configuration_reference.call
+              config.base_configuration_reference = file_ref
             end
           end
 
@@ -97,7 +92,7 @@ module Pod
             ]
             message = "The `#{target.name} [#{config.name}]` " \
               "target overrides the `#{key}` build setting defined in " \
-              "`#{pod_bundle.xcconfig_relative_path(config.name)}'. " \
+              "`#{pod_bundle.pod_bundle.xcconfig_relative_path(config.name)}'. " \
               'This can lead to problems with the CocoaPods installation'
             UI.warn(message, actions)
           end
@@ -139,6 +134,44 @@ module Pod
           def self.existing_config_is_identical_to_pod_config?(existing_config_path, pod_config_path)
             existing_config_path.file? && (!pod_config_path.file? || FileUtils.compare_file(existing_config_path, pod_config_path))
           end
+
+          # Creates a file reference to the xcconfig generated by
+          # CocoaPods (if needed).
+          # If the Pods group not exists, create the group and set
+          # the location to the `Pods` directory.
+          # If the file reference exists, the location is different
+          # with the xcconfig's path and the symlink target paths
+          # are different, we will update the location.
+          #
+          # @param  [Target::AggregateTarget] pod_bundle
+          #         The Pods bundle.
+          #
+          # @param  [Xcodeproj::XCBuildConfiguration] config
+          #         The build configuration.
+          #
+          # @return [PBXFileReference] the xcconfig reference.
+          #
+          def self.create_xcconfig_ref(pod_bundle, config)
+            # Xcode root group's path is absolute, we must get the relative path of the sandbox to the user project
+            group_path = pod_bundle.relative_pods_root_path
+            group = config.project['Pods'] || config.project.new_group('Pods', group_path)
+
+            # support user custom paths of Pods group and xcconfigs files.
+            group_path = Pathname.new(group.real_path)
+            xcconfig_path = Pathname.new(pod_bundle.xcconfig_path(config.name))
+            path = xcconfig_path.relative_path_from(group_path)
+
+            filename = path.basename.to_s
+            file_ref = group.files.find { |f| f.display_name == filename }
+            if file_ref && file_ref.path != path
+              file_ref_path = Pathname.new(file_ref.real_path)
+              if !file_ref_path.exist? || !xcconfig_path.exist? || file_ref_path.realpath != xcconfig_path.realpath
+                file_ref.path = path.to_s
+              end
+            end
+
+            file_ref || group.new_file(path.to_s)
+          end
         end
       end
     end

data/lib/cocoapods/installer/xcode/pods_project_generator.rb

@@ -4,12 +4,18 @@ module Pod
       # The {PodsProjectGenerator} handles generation of the 'Pods/Pods.xcodeproj'
       #
       class PodsProjectGenerator
+        require 'cocoapods/installer/xcode/pods_project_generator/target_installer_helper'
         require 'cocoapods/installer/xcode/pods_project_generator/pod_target_integrator'
         require 'cocoapods/installer/xcode/pods_project_generator/target_installer'
+        require 'cocoapods/installer/xcode/pods_project_generator/target_installation_result'
         require 'cocoapods/installer/xcode/pods_project_generator/pod_target_installer'
         require 'cocoapods/installer/xcode/pods_project_generator/file_references_installer'
         require 'cocoapods/installer/xcode/pods_project_generator/aggregate_target_installer'
 
+        # @return [Sandbox] The sandbox where the Pods should be installed.
+        #
+        attr_reader :sandbox
+
         # @return [Pod::Project] the `Pods/Pods.xcodeproj` project.
         #
         attr_reader :project
@@ -20,10 +26,6 @@ module Pod
         #
         attr_reader :aggregate_targets
 
-        # @return [Sandbox] The sandbox where the Pods should be installed.
-        #
-        attr_reader :sandbox
-
         # @return [Array<PodTarget>] The model representations of pod targets.
         #
         attr_reader :pod_targets
@@ -43,16 +45,16 @@ module Pod
 
         # Initialize a new instance
         #
-        # @param  [Array<AggregateTarget>] aggregate_targets     @see aggregate_targets
-        # @param  [Sandbox]                sandbox               @see sandbox
-        # @param  [Array<PodTarget>]       pod_targets           @see pod_targets
-        # @param  [Analyzer]               analysis_result       @see analysis_result
-        # @param  [InstallationOptions]    installation_options  @see installation_options
-        # @param  [Config]                 config                @see config
+        # @param  [Sandbox]                sandbox               @see #sandbox
+        # @param  [Array<AggregateTarget>] aggregate_targets     @see #aggregate_targets
+        # @param  [Array<PodTarget>]       pod_targets           @see #pod_targets
+        # @param  [Analyzer]               analysis_result       @see #analysis_result
+        # @param  [InstallationOptions]    installation_options  @see #installation_options
+        # @param  [Config]                 config                @see #config
         #
-        def initialize(aggregate_targets, sandbox, pod_targets, analysis_result, installation_options, config)
-          @aggregate_targets = aggregate_targets
+        def initialize(sandbox, aggregate_targets, pod_targets, analysis_result, installation_options, config)
           @sandbox = sandbox
+          @aggregate_targets = aggregate_targets
           @pod_targets = pod_targets
           @analysis_result = analysis_result
           @installation_options = installation_options
@@ -62,9 +64,10 @@ module Pod
         def generate!
           prepare
           install_file_references
-          install_libraries
-          integrate_targets
-          set_target_dependencies
+          @target_installation_results = install_targets
+          integrate_targets(@target_installation_results.pod_target_installation_results)
+          wire_target_dependencies(@target_installation_results)
+          @target_installation_results
         end
 
         def write
@@ -76,11 +79,19 @@ module Pod
               UI.message('- Generating deterministic UUIDs') { project.predictabilize_uuids }
             end
             library_product_types = [:framework, :dynamic_library, :static_library]
+
+            pod_target_installation_results = @target_installation_results.pod_target_installation_results
+            results_by_native_target = Hash[pod_target_installation_results.map do |_, result|
+              [result.native_target, result]
+            end]
             project.recreate_user_schemes(false) do |scheme, target|
+              next unless target.respond_to?(:symbol_type)
               next unless library_product_types.include? target.symbol_type
-              pod_target = pod_targets.find { |pt| pt.native_target == target }
-              next if pod_target.nil? || pod_target.test_native_targets.empty?
-              pod_target.test_native_targets.each { |test_native_target| scheme.add_test_target(test_native_target) }
+              installation_result = results_by_native_target[target]
+              next unless installation_result
+              installation_result.test_native_targets.each do |test_native_target|
+                scheme.add_test_target(test_native_target)
+              end
             end
             project.save
           end
@@ -95,8 +106,8 @@ module Pod
             next unless share_scheme_for_development_pod?(pod_target.pod_name)
             Xcodeproj::XCScheme.share_scheme(project.path, pod_target.label)
             if pod_target.contains_test_specifications?
-              pod_target.supported_test_types.each do |test_type|
-                Xcodeproj::XCScheme.share_scheme(project.path, pod_target.test_target_label(test_type))
+              pod_target.test_specs.each do |test_spec|
+                Xcodeproj::XCScheme.share_scheme(project.path, pod_target.test_target_label(test_spec))
               end
             end
           end
@@ -104,6 +115,8 @@ module Pod
 
         private
 
+        InstallationResults = Struct.new(:pod_target_installation_results, :aggregate_target_installation_results)
+
         def create_project
           if object_version = aggregate_targets.map(&:user_project).compact.map { |p| p.object_version.to_i }.min
             Pod::Project.new(sandbox.project_path, false, object_version)
@@ -163,49 +176,59 @@ module Pod
           installer.install!
         end
 
-        def install_libraries
+        def install_targets
           UI.message '- Installing targets' do
             umbrella_headers_by_dir = pod_targets.map do |pod_target|
               next unless pod_target.should_build? && pod_target.defines_module?
               pod_target.umbrella_header_path
             end.compact.group_by(&:dirname)
 
-            pod_targets.sort_by(&:name).each do |pod_target|
-              target_installer = PodTargetInstaller.new(sandbox, pod_target)
-              target_installer.umbrella_headers_by_dir = umbrella_headers_by_dir
-              target_installer.install!
-            end
+            pod_target_installation_results = Hash[pod_targets.sort_by(&:name).map do |pod_target|
+              umbrella_headers_in_header_dir = umbrella_headers_by_dir[pod_target.module_map_path.dirname]
+              target_installer = PodTargetInstaller.new(sandbox, @project, pod_target, umbrella_headers_in_header_dir)
+              [pod_target.name, target_installer.install!]
+            end]
 
-            aggregate_targets.sort_by(&:name).each do |target|
-              target_installer = AggregateTargetInstaller.new(sandbox, target)
-              target_installer.install!
+            # Hook up system framework dependencies for the pod targets that were just installed.
+            pod_target_installation_result_values = pod_target_installation_results.values.compact
+            unless pod_target_installation_result_values.empty?
+              add_system_framework_dependencies(pod_target_installation_result_values)
             end
 
-            add_system_framework_dependencies
+            aggregate_target_installation_results = Hash[aggregate_targets.sort_by(&:name).map do |target|
+              target_installer = AggregateTargetInstaller.new(sandbox, @project, target)
+              [target.name, target_installer.install!]
+            end]
+
+            InstallationResults.new(pod_target_installation_results, aggregate_target_installation_results)
           end
         end
 
-        def integrate_targets
-          pod_targets_to_integrate = pod_targets.select { |pt| !pt.test_native_targets.empty? || pt.contains_script_phases? }
-          unless pod_targets_to_integrate.empty?
+        def integrate_targets(pod_target_installation_results)
+          pod_installations_to_integrate = pod_target_installation_results.values.select do |pod_target_installation_result|
+            pod_target = pod_target_installation_result.target
+            !pod_target_installation_result.test_native_targets.empty? || pod_target.contains_script_phases?
+          end
+          unless pod_installations_to_integrate.empty?
             UI.message '- Integrating targets' do
-              pod_targets_to_integrate.each do |pod_target|
-                PodTargetIntegrator.new(pod_target).integrate!
+              pod_installations_to_integrate.each do |pod_target_installation_result|
+                PodTargetIntegrator.new(pod_target_installation_result).integrate!
               end
             end
           end
         end
 
-        def add_system_framework_dependencies
-          # @TODO: Add Specs
-          pod_targets.select(&:should_build?).sort_by(&:name).each do |pod_target|
-            test_file_accessors, file_accessors = pod_target.file_accessors.partition { |fa| fa.spec.test_specification? }
-            file_accessors.each do |file_accessor|
-              add_system_frameworks_to_native_target(file_accessor, pod_target.native_target)
-            end
-            test_file_accessors.each do |test_file_accessor|
-              native_target = pod_target.native_target_for_spec(test_file_accessor.spec)
-              add_system_frameworks_to_native_target(test_file_accessor, native_target)
+        def add_system_framework_dependencies(pod_target_installation_results)
+          sorted_installation_results = pod_target_installation_results.sort_by do |pod_target_installation_result|
+            pod_target_installation_result.target.name
+          end
+          sorted_installation_results.each do |target_installation_result|
+            pod_target = target_installation_result.target
+            next unless pod_target.should_build?
+            next if !pod_target.requires_frameworks? || pod_target.static_framework?
+            pod_target.file_accessors.each do |file_accessor|
+              native_target = target_installation_result.native_target_for_spec(file_accessor.spec)
+              add_system_frameworks_to_native_target(native_target, file_accessor)
             end
           end
         end
@@ -213,53 +236,70 @@ module Pod
         # Adds a target dependency for each pod spec to each aggregate target and
         # links the pod targets among each other.
         #
+        # @param  [Array[Hash{String=>TargetInstallationResult}]] target_installation_results
+        #         the installation results that were produced when all targets were installed. This includes
+        #         pod target installation results and aggregate target installation results.
+        #
         # @return [void]
         #
-        def set_target_dependencies
+        def wire_target_dependencies(target_installation_results)
           frameworks_group = project.frameworks_group
-          test_only_pod_targets = pod_targets.dup
-          aggregate_targets.each do |aggregate_target|
+          pod_target_installation_results_hash = target_installation_results.pod_target_installation_results
+          aggregate_target_installation_results_hash = target_installation_results.aggregate_target_installation_results
+
+          # Wire up aggregate targets
+          aggregate_target_installation_results_hash.values.each do |aggregate_target_installation_result|
+            aggregate_target = aggregate_target_installation_result.target
+            aggregate_native_target = aggregate_target_installation_result.native_target
             is_app_extension = !(aggregate_target.user_targets.map(&:symbol_type) &
-                                 [:app_extension, :watch_extension, :watch2_extension, :tv_extension, :messages_extension]).empty?
+                [: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' }
-
+            configure_app_extension_api_only_to_native_target(aggregate_native_target) if is_app_extension
+            # Wire up dependencies that are part of inherit search paths for this aggregate target.
             aggregate_target.search_paths_aggregate_targets.each do |search_paths_target|
-              aggregate_target.native_target.add_dependency(search_paths_target.native_target)
+              aggregate_native_target.add_dependency(aggregate_target_installation_results_hash[search_paths_target.name].native_target)
             end
-
+            # Wire up all pod target dependencies to aggregate target.
             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?
-                add_resource_bundles_to_native_target(pod_target, aggregate_target.native_target)
-                add_pod_target_test_dependencies(pod_target, frameworks_group)
-                next
-              end
-
-              aggregate_target.native_target.add_dependency(pod_target.native_target)
-              configure_app_extension_api_only_for_target(pod_target) if is_app_extension
+              pod_target_native_target = pod_target_installation_results_hash[pod_target.name].native_target
+              aggregate_native_target.add_dependency(pod_target_native_target)
+              configure_app_extension_api_only_to_native_target(pod_target_native_target) if is_app_extension
+            end
+          end
 
-              add_dependent_targets_to_native_target(pod_target.dependent_targets,
-                                                     pod_target.native_target, is_app_extension,
-                                                     pod_target.requires_frameworks? && !pod_target.static_framework?,
-                                                     frameworks_group)
-              unless pod_target.static_framework?
-                add_pod_target_test_dependencies(pod_target, frameworks_group)
+          # Wire up pod targets
+          pod_target_installation_results_hash.values.each do |pod_target_installation_result|
+            pod_target = pod_target_installation_result.target
+            native_target = pod_target_installation_result.native_target
+            # First, wire up all resource bundles.
+            pod_target_installation_result.resource_bundle_targets.each do |resource_bundle_target|
+              native_target.add_dependency(resource_bundle_target)
+              if pod_target.requires_frameworks? && pod_target.should_build?
+                native_target.add_resources([resource_bundle_target.product_reference])
               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
+            # Wire up all dependencies to this pod target, if any.
+            dependent_targets = pod_target.dependent_targets
+            dependent_targets.each do |dependent_target|
+              native_target.add_dependency(pod_target_installation_results_hash[dependent_target.name].native_target)
+              add_framework_file_reference_to_native_target(native_target, pod_target, dependent_target, frameworks_group)
             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)
+            # Wire up test native targets.
+            unless pod_target_installation_result.test_native_targets.empty?
+              pod_target_installation_result.test_specs_by_native_target.each do |test_native_target, test_specs|
+                test_dependent_targets = test_specs.flat_map { |s| pod_target.test_dependent_targets_by_spec_name[s.name] }.compact.unshift(pod_target).uniq
+                test_dependent_targets.each do |test_dependent_target|
+                  dependency_installation_result = pod_target_installation_results_hash[test_dependent_target.name]
+                  resource_bundle_native_targets = dependency_installation_result.test_resource_bundle_targets[test_specs.first.name]
+                  unless resource_bundle_native_targets.nil?
+                    resource_bundle_native_targets.each do |test_resource_bundle_target|
+                      test_native_target.add_dependency(test_resource_bundle_target)
+                    end
+                  end
+                  test_native_target.add_dependency(dependency_installation_result.native_target)
+                  add_framework_file_reference_to_native_target(test_native_target, pod_target, test_dependent_target, frameworks_group)
+                end
+              end
             end
           end
         end
@@ -295,55 +335,25 @@ module Pod
 
         # @! group Private Helpers
 
-        private
-
-        def add_pod_target_test_dependencies(pod_target, frameworks_group)
-          test_dependent_targets = pod_target.all_dependent_targets
-          pod_target.test_specs_by_native_target.each do |test_native_target, test_specs|
-            test_dependent_targets.reject(&:should_build?).each do |test_dependent_target|
-              add_resource_bundles_to_native_target(test_dependent_target, test_native_target)
-            end
-            add_dependent_targets_to_native_target(test_dependent_targets, test_native_target, false, pod_target.requires_frameworks?, frameworks_group)
-            test_spec_consumers = test_specs.map { |test_spec| test_spec.consumer(pod_target.platform) }
-            if test_spec_consumers.any?(&:requires_app_host?)
-              app_host_target = project.targets.find { |t| t.name == pod_target.app_host_label(test_specs.first.test_type) }
-              test_native_target.add_dependency(app_host_target)
-            end
-          end
-        end
-
-        def add_dependent_targets_to_native_target(dependent_targets, native_target, is_app_extension, requires_frameworks, frameworks_group)
-          dependent_targets.each do |pod_dependency_target|
-            next unless pod_dependency_target.should_build?
-            native_target.add_dependency(pod_dependency_target.native_target)
-            configure_app_extension_api_only_for_target(pod_dependency_target) if is_app_extension
-
-            if requires_frameworks
-              product_ref = frameworks_group.files.find { |f| f.path == pod_dependency_target.product_name } ||
-                  frameworks_group.new_product_ref_for_target(pod_dependency_target.product_basename, pod_dependency_target.product_type)
-              native_target.frameworks_build_phase.add_file_reference(product_ref, true)
-            end
-          end
-        end
-
-        def add_system_frameworks_to_native_target(file_accessor, native_target)
+        def add_system_frameworks_to_native_target(native_target, file_accessor)
           file_accessor.spec_consumer.frameworks.each do |framework|
             native_target.add_system_framework(framework)
           end
         end
 
-        def add_resource_bundles_to_native_target(dependent_target, native_target)
-          resource_bundle_targets = dependent_target.resource_bundle_targets + dependent_target.test_resource_bundle_targets
-          resource_bundle_targets.each do |resource_bundle_target|
-            native_target.add_dependency(resource_bundle_target)
+        def add_framework_file_reference_to_native_target(native_target, pod_target, dependent_target, frameworks_group)
+          if pod_target.should_build? && pod_target.requires_frameworks? && !pod_target.static_framework? && dependent_target.should_build?
+            product_ref = frameworks_group.files.find { |f| f.path == dependent_target.product_name } ||
+                frameworks_group.new_product_ref_for_target(dependent_target.product_basename, dependent_target.product_type)
+            native_target.frameworks_build_phase.add_file_reference(product_ref, true)
           end
         end
 
         # Sets the APPLICATION_EXTENSION_API_ONLY build setting to YES for all
-        # configurations of the given target
+        # configurations of the given native target.
         #
-        def configure_app_extension_api_only_for_target(target)
-          target.native_target.build_configurations.each do |config|
+        def configure_app_extension_api_only_to_native_target(native_target)
+          native_target.build_configurations.each do |config|
             config.build_settings['APPLICATION_EXTENSION_API_ONLY'] = 'YES'
           end
         end