cocoapods 1.4.0.beta.1 → 1.4.0.beta.2

data/lib/cocoapods/generator/xcconfig/xcconfig_helper.rb

@@ -63,8 +63,8 @@ module Pod
 
         # Configures the given Xcconfig
         #
-        # @param  [AggregateTarget] aggregate_target
-        #         The aggregate target, may be nil.
+        # @param  [Target] target
+        #         The root target, may be nil.
         #
         # @param  [PodTarget] pod_target
         #         The pod target, which holds the list of +Spec::FileAccessor+.
@@ -72,27 +72,30 @@ module Pod
         # @param  [Xcodeproj::Config] xcconfig
         #         The xcconfig to edit.
         #
+        # @param  [Boolean] include_ld_flags
+        #         Indicates whether or not to generate ld flags in addition to compile flags
+        #
         # @return [void]
         #
-        def self.add_settings_for_file_accessors_of_target(aggregate_target, pod_target, xcconfig)
+        def self.add_settings_for_file_accessors_of_target(target, pod_target, xcconfig, include_ld_flags = true)
           pod_target.file_accessors.each do |file_accessor|
-            if aggregate_target.nil? || !file_accessor.spec.test_specification?
-              XCConfigHelper.add_spec_build_settings_to_xcconfig(file_accessor.spec_consumer, xcconfig)
-              XCConfigHelper.add_static_dependency_build_settings(aggregate_target, pod_target, xcconfig, file_accessor)
+            if target.nil? || !file_accessor.spec.test_specification?
+              XCConfigHelper.add_spec_build_settings_to_xcconfig(file_accessor.spec_consumer, xcconfig) if include_ld_flags
+              XCConfigHelper.add_static_dependency_build_settings(target, pod_target, xcconfig, file_accessor, include_ld_flags)
             end
           end
-          XCConfigHelper.add_dynamic_dependency_build_settings(aggregate_target, pod_target, xcconfig)
+          XCConfigHelper.add_dynamic_dependency_build_settings(target, pod_target, xcconfig, include_ld_flags)
           if pod_target.requires_frameworks?
             pod_target.dependent_targets.each do |dependent_target|
-              XCConfigHelper.add_dynamic_dependency_build_settings(aggregate_target, dependent_target, xcconfig)
+              XCConfigHelper.add_dynamic_dependency_build_settings(target, dependent_target, xcconfig, include_ld_flags)
             end
           end
         end
 
         # Adds build settings for static vendored frameworks and libraries.
         #
-        # @param  [AggregateTarget] aggregate_target
-        #         The aggregate target, may be nil.
+        # @param  [Target] target
+        #         The root target, may be nil.
         #
         # @param [PodTarget] pod_target
         #        The pod target, which holds the list of +Spec::FileAccessor+.
@@ -103,16 +106,18 @@ module Pod
         # @param [Spec::FileAccessor] file_accessor
         #        The file accessor, which holds the list of static frameworks.
         #
+        # @param  [Boolean] include_ld_flags
+        #         Indicates whether or not to generate ld flags in addition to compile flags
+        #
         # @return [void]
         #
-        def self.add_static_dependency_build_settings(aggregate_target, pod_target, xcconfig, file_accessor)
-          if aggregate_target.nil? || !file_accessor.spec.test_specification?
+        def self.add_static_dependency_build_settings(target, pod_target, xcconfig, file_accessor, include_ld_flags)
+          if target.nil? || !file_accessor.spec.test_specification?
+            adds_other_ldflags = include_ld_flags && XCConfigHelper.links_dependency?(target, pod_target)
             file_accessor.vendored_static_frameworks.each do |vendored_static_framework|
-              adds_other_ldflags = XCConfigHelper.links_dependency?(aggregate_target, pod_target)
               XCConfigHelper.add_framework_build_settings(vendored_static_framework, xcconfig, pod_target.sandbox.root, adds_other_ldflags)
             end
             file_accessor.vendored_static_libraries.each do |vendored_static_library|
-              adds_other_ldflags = XCConfigHelper.links_dependency?(aggregate_target, pod_target)
               XCConfigHelper.add_library_build_settings(vendored_static_library, xcconfig, pod_target.sandbox.root, adds_other_ldflags)
             end
           end
@@ -136,8 +141,8 @@ module Pod
 
         # Adds build settings for dynamic vendored frameworks and libraries.
         #
-        # @param  [AggregateTarget] aggregate_target
-        #         The aggregate target, may be nil.
+        # @param  [Target] target
+        #         The root target, may be nil.
         #
         # @param [PodTarget] pod_target
         #        The pod target, which holds the list of +Spec::FileAccessor+.
@@ -145,16 +150,19 @@ module Pod
         # @param [Xcodeproj::Config] xcconfig
         #        The xcconfig to edit.
         #
+        # @param  [Boolean] include_ld_flags
+        #         Indicates whether or not to generate ld flags in addition to compile flags
+        #
         # @return [void]
         #
-        def self.add_dynamic_dependency_build_settings(aggregate_target, pod_target, xcconfig)
+        def self.add_dynamic_dependency_build_settings(target, pod_target, xcconfig, include_ld_flags)
           pod_target.file_accessors.each do |file_accessor|
-            if aggregate_target.nil? || !file_accessor.spec.test_specification?
+            if target.nil? || !file_accessor.spec.test_specification?
               file_accessor.vendored_dynamic_frameworks.each do |vendored_dynamic_framework|
-                XCConfigHelper.add_framework_build_settings(vendored_dynamic_framework, xcconfig, pod_target.sandbox.root)
+                XCConfigHelper.add_framework_build_settings(vendored_dynamic_framework, xcconfig, pod_target.sandbox.root, include_ld_flags)
               end
               file_accessor.vendored_dynamic_libraries.each do |vendored_dynamic_library|
-                XCConfigHelper.add_library_build_settings(vendored_dynamic_library, xcconfig, pod_target.sandbox.root)
+                XCConfigHelper.add_library_build_settings(vendored_dynamic_library, xcconfig, pod_target.sandbox.root, include_ld_flags)
               end
             end
           end
@@ -190,15 +198,18 @@ module Pod
         # @param  [Pathname] sandbox_root
         #         The path retrieved from Sandbox#root.
         #
+        # @param  [Boolean] include_ld_flags
+        #         Indicates whether or not to generate ld flags in addition to compile flags
+        #
         # @return [void]
         #
-        def self.add_framework_build_settings(framework_path, xcconfig, sandbox_root, include_other_ldflags = true)
+        def self.add_framework_build_settings(framework_path, xcconfig, sandbox_root, include_ld_flags = true)
           name = File.basename(framework_path, '.framework')
           dirname = '${PODS_ROOT}/' + framework_path.dirname.relative_path_from(sandbox_root).to_s
           build_settings = {
             'FRAMEWORK_SEARCH_PATHS' => quote([dirname]),
           }
-          build_settings['OTHER_LDFLAGS'] = "-framework #{name}" if include_other_ldflags
+          build_settings['OTHER_LDFLAGS'] = "-framework #{name}" if include_ld_flags
           xcconfig.merge!(build_settings)
         end
 
@@ -214,16 +225,19 @@ module Pod
         # @param  [Pathname] sandbox_root
         #         The path retrieved from Sandbox#root.
         #
+        # @param  [Boolean] include_ld_flags
+        #         Indicates whether or not to generate ld flags in addition to compile flags
+        #
         # @return [void]
         #
-        def self.add_library_build_settings(library_path, xcconfig, sandbox_root, include_other_ldflags = true)
+        def self.add_library_build_settings(library_path, xcconfig, sandbox_root, include_ld_flags = true)
           extension = File.extname(library_path)
           name = File.basename(library_path, extension).sub(/\Alib/, '')
           dirname = '${PODS_ROOT}/' + library_path.dirname.relative_path_from(sandbox_root).to_s
           build_settings = {
             'LIBRARY_SEARCH_PATHS' => quote([dirname]),
           }
-          build_settings['OTHER_LDFLAGS'] = "-l#{name}" if include_other_ldflags
+          build_settings['OTHER_LDFLAGS'] = "-l#{name}" if include_ld_flags
           xcconfig.merge!(build_settings)
         end
 
@@ -350,25 +364,28 @@ module Pod
         # Add custom build settings and required build settings to link to
         # vendored libraries and frameworks.
         #
-        # @param  [AggregateTarget] aggregate_target
-        #         The aggregate target, may be nil.
+        # @param  [Target] target
+        #         The root target, may be nil.
         #
-        # @param  [Array<PodTarget] pod_targets
-        #         The pod targets to add the vendored build settings for.
+        # @param  [Array<PodTarget] dep_targets
+        #         The dependency targets to add the vendored build settings for.
         #
         # @param  [Xcodeproj::Config] xcconfig
         #         The xcconfig to edit.
         #
+        # @param  [Boolean] include_ld_flags
+        #         Indicates whether or not to generate ld flags in addition to compile flags
+        #
         # @note
         #   In case of generated pod targets, which require frameworks, the
         #   vendored frameworks and libraries are already linked statically
         #   into the framework binary and must not be linked again to the
         #   user target.
         #
-        def self.generate_vendored_build_settings(aggregate_target, pod_targets, xcconfig)
-          pod_targets.each do |pod_target|
-            unless pod_target.should_build? && pod_target.requires_frameworks? && !pod_target.static_framework?
-              XCConfigHelper.add_settings_for_file_accessors_of_target(aggregate_target, pod_target, xcconfig)
+        def self.generate_vendored_build_settings(target, dep_targets, xcconfig, include_ld_flags = true)
+          dep_targets.each do |dep_target|
+            unless dep_target.should_build? && dep_target.requires_frameworks? && !dep_target.static_framework?
+              XCConfigHelper.add_settings_for_file_accessors_of_target(target, dep_target, xcconfig, include_ld_flags)
             end
           end
         end

data/lib/cocoapods/installer.rb

@@ -355,7 +355,7 @@ module Pod
     end
 
     # Install the Pods. If the resolver indicated that a Pod should be
-    # installed and it exits, it is removed an then reinstalled. In any case if
+    # installed and it exits, it is removed and then reinstalled. In any case if
     # the Pod doesn't exits it is installed.
     #
     # @return [void]
@@ -423,6 +423,7 @@ module Pod
       unlock_pod_sources
       run_plugins_post_install_hooks
       warn_for_deprecations
+      warn_for_installed_script_phases
       lock_pod_sources
       print_post_install_message
     end
@@ -523,6 +524,24 @@ module Pod
       end
     end
 
+    # Prints a warning for any pods that included script phases
+    #
+    # @return [void]
+    #
+    def warn_for_installed_script_phases
+      pods_to_install = sandbox_state.added | sandbox_state.changed
+      pod_targets.each do |pod_target|
+        spec = pod_target.root_spec
+        if pods_to_install.include?(spec.name)
+          script_phase_count = pod_target.script_phases.count
+          unless script_phase_count.zero?
+            UI.warn "#{spec.name} has added #{pod_target.script_phases.count} #{'script phase'.pluralize(script_phase_count)}. " \
+              'Please inspect before executing a build. See `https://guides.cocoapods.org/syntax/podspec.html#script_phases` for more information.'
+          end
+        end
+      end
+    end
+
     # Writes the Podfile and the lock files.
     #
     # @todo   Pass the checkout options to the Lockfile.
@@ -626,19 +645,6 @@ module Pod
 
     #-------------------------------------------------------------------------#
 
-    public
-
-    # @return [Array<Library>] The targets of the development pods generated by
-    #         the installation process.
-    #
-    def development_pod_targets
-      pod_targets.select do |pod_target|
-        sandbox.development_pods.keys.include?(pod_target.pod_name)
-      end
-    end
-
-    #-------------------------------------------------------------------------#
-
     private
 
     # @!group Private helpers

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

@@ -147,6 +147,49 @@ module Pod
                 end
               end
           end
+
+          # Updates all target script phases for the current target, including creating or updating, deleting
+          # and re-ordering.
+          #
+          # @return [void]
+          #
+          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.
+            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, '')
+              unless script_phase_names.include?(script_phase_name_without_prefix)
+                native_target.build_phases.delete(script_phase)
+              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]
+              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)
+
+              execution_position = td_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)
+                end
+                unless compile_build_phase_index.nil?
+                  script_phase_index = native_target.build_phases.index do |bp|
+                    bp.is_a?(Xcodeproj::Project::Object::PBXShellScriptBuildPhase) && !bp.name.nil? && bp.name == name_with_prefix
+                  end
+                  if (execution_position == :before_compile && script_phase_index > compile_build_phase_index) ||
+                    (execution_position == :after_compile && script_phase_index < compile_build_phase_index)
+                    native_target.build_phases.move_from(script_phase_index, compile_build_phase_index)
+                  end
+                end
+              end
+            end
+          end
         end
 
         # Integrates the user project targets. Only the targets that do **not**
@@ -164,7 +207,7 @@ module Pod
             remove_embed_frameworks_script_phase_from_embedded_targets
             add_copy_resources_script_phase
             add_check_manifest_lock_script_phase
-            update_target_script_phases
+            add_user_script_phases
           end
         end
 
@@ -265,38 +308,9 @@ module Pod
         #
         # @return [void]
         #
-        def update_target_script_phases
-          target_definition_script_phases = target.target_definition.script_phases
-          target_definition_script_phase_names = target_definition_script_phases.map { |k| k[:name] }
+        def add_user_script_phases
           native_targets.each do |native_target|
-            # Delete script phases no longer present in the target definition.
-            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, '')
-              unless target_definition_script_phase_names.include?(script_phase_name_without_prefix)
-                native_target.build_phases.delete(script_phase)
-              end
-            end
-
-            # Create or update the ones that are expected to be.
-            target_definition_script_phases.each do |td_script_phase|
-              phase = TargetIntegrator.create_or_update_build_phase(native_target, USER_BUILD_PHASE_PREFIX + td_script_phase[:name])
-              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)
-            end
-
-            # Move script phases to their correct index if the order has changed.
-            offset = native_target.build_phases.count - target_definition_script_phases.count
-            target_definition_script_phases.each_with_index do |td_script_phase, index|
-              current_index = native_target.build_phases.index do |bp|
-                bp.is_a?(Xcodeproj::Project::Object::PBXShellScriptBuildPhase) && bp.name.sub(USER_BUILD_PHASE_PREFIX, '') == td_script_phase[:name]
-              end
-              expected_index = offset + index
-              native_target.build_phases.insert(expected_index, native_target.build_phases.delete_at(current_index)) if current_index != expected_index
-            end
+            TargetIntegrator.create_or_update_user_script_phases(target.target_definition.script_phases, native_target)
           end
         end
 

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

@@ -4,7 +4,7 @@ module Pod
       # The {PodsProjectGenerator} handles generation of the 'Pods/Pods.xcodeproj'
       #
       class PodsProjectGenerator
-        require 'cocoapods/installer/pods_project_integrator/pod_target_integrator'
+        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/pod_target_installer'
         require 'cocoapods/installer/xcode/pods_project_generator/file_references_installer'
@@ -63,7 +63,7 @@ module Pod
           prepare
           install_file_references
           install_libraries
-          integrate_test_targets
+          integrate_targets
           set_target_dependencies
         end
 
@@ -124,6 +124,8 @@ module Pod
             analysis_result.all_user_build_configurations.each do |name, type|
               @project.add_build_configuration(name, type)
             end
+            # Reset symroot just in case the user has added a new build configuration other than 'Debug' or 'Release'.
+            @project.symroot = Pod::Project::LEGACY_BUILD_ROOT
 
             pod_names = pod_targets.map(&:pod_name).uniq
             pod_names.each do |pod_name|
@@ -177,12 +179,12 @@ module Pod
           end
         end
 
-        def integrate_test_targets
-          pod_targets_with_test_targets = pod_targets.reject { |pt| pt.test_native_targets.empty? }
-          unless pod_targets_with_test_targets.empty?
-            UI.message '- Integrating test targets' do
-              pod_targets_with_test_targets.each do |pod_target|
-                Pod::Installer::PodTargetIntegrator.new(pod_target).integrate!
+        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?
+            UI.message '- Integrating targets' do
+              pod_targets_to_integrate.each do |pod_target|
+                PodTargetIntegrator.new(pod_target).integrate!
               end
             end
           end
@@ -227,10 +229,11 @@ module Pod
               aggregate_target.native_target.add_dependency(pod_target.native_target)
               configure_app_extension_api_only_for_target(pod_target) if is_app_extension
 
+              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_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
@@ -285,11 +288,16 @@ module Pod
 
         def add_pod_target_test_dependencies(pod_target, frameworks_group)
           test_dependent_targets = pod_target.all_test_dependent_targets
-          pod_target.test_native_targets.each do |test_native_target|
+          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
 

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

@@ -17,7 +17,7 @@ module Pod
               create_support_files_group
               create_xcconfig_file
               if target.requires_frameworks?
-                create_info_plist_file
+                create_info_plist_file(target.info_plist_path, native_target, target.version, target.platform)
                 create_module_map
                 create_umbrella_header
               end

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

@@ -19,14 +19,17 @@ module Pod
             UI.message "- Installing target `#{target.name}` #{target.platform}" do
               add_target
               create_support_files_dir
-              add_test_targets if target.contains_test_specifications?
+              if target.contains_test_specifications?
+                add_test_targets
+                add_test_app_host_targets
+              end
               add_resources_bundle_targets
               add_files_to_build_phases
               create_xcconfig_file
               create_test_xcconfig_files if target.contains_test_specifications?
               if target.requires_frameworks?
                 unless target.static_framework?
-                  create_info_plist_file
+                  create_info_plist_file(target.info_plist_path, native_target, target.version, target.platform)
                 end
                 create_module_map
                 create_umbrella_header do |generator|
@@ -45,13 +48,33 @@ module Pod
                   create_build_phase_to_move_static_framework_archive
                 end
               end
-              create_prefix_header
+              unless skip_pch?(target.non_test_specs)
+                path = target.prefix_header_path
+                file_accessors = target.file_accessors.reject { |f| f.spec.test_specification? }
+                create_prefix_header(path, file_accessors, target.platform, [native_target])
+              end
+              unless skip_pch?(target.test_specs)
+                target.supported_test_types.each do |test_type|
+                  path = target.prefix_header_path_for_test_type(test_type)
+                  file_accessors = target.file_accessors.select { |f| f.spec.test_specification? }
+                  create_prefix_header(path, file_accessors, target.platform, target.test_native_targets)
+                end
+              end
               create_dummy_source
             end
           end
 
           private
 
+          # @param [Array<Specification>] specs
+          #        the specs to check against whether `.pch` generation should be skipped or not.
+          #
+          # @return [Boolean] Whether the target should build a pch file.
+          #
+          def skip_pch?(specs)
+            specs.any? { |spec| spec.prefix_header_file.is_a?(FalseClass) }
+          end
+
           # Remove the default headers folder path settings for static library pod
           # targets.
           #
@@ -172,6 +195,43 @@ module Pod
             end
           end
 
+          # Adds the test app host targets for the library to the Pods project with the
+          # appropriate build configurations.
+          #
+          # @return [void]
+          #
+          def add_test_app_host_targets
+            target.test_specs.each do |test_spec|
+              next unless test_spec.consumer(target.platform).requires_app_host?
+              name = target.app_host_label(test_spec.test_type)
+              platform_name = target.platform.name
+              app_host_target = project.targets.find { |t| t.name == name }
+              if app_host_target.nil?
+                app_host_target = Pod::Generator::AppTargetHelper.add_app_target(project, platform_name, deployment_target, name)
+                app_host_target.build_configurations.each do |configuration|
+                  configuration.build_settings.merge!(custom_build_settings)
+                  configuration.build_settings['PRODUCT_NAME'] = name
+                  configuration.build_settings['PRODUCT_BUNDLE_IDENTIFIER'] = 'org.cocoapods.${PRODUCT_NAME:rfc1034identifier}'
+                  configuration.build_settings['CODE_SIGN_IDENTITY'] = '' if target.platform == :osx
+                end
+                Pod::Generator::AppTargetHelper.add_app_host_main_file(project, app_host_target, platform_name, name)
+                app_host_info_plist_path = project.path.dirname.+("#{name}/Info.plist")
+                create_info_plist_file(app_host_info_plist_path, app_host_target, '1.0.0', target.platform, :appl)
+              end
+              # Wire all test native targets with the app host.
+              native_test_target = target.native_target_for_spec(test_spec)
+              native_test_target.build_configurations.each do |configuration|
+                test_host = "$(BUILT_PRODUCTS_DIR)/#{name}.app/"
+                test_host << 'Contents/MacOS/' if target.platform == :osx
+                test_host << name.to_s
+                configuration.build_settings['TEST_HOST'] = test_host
+              end
+              target_attributes = project.root_object.attributes['TargetAttributes'] || {}
+              target_attributes[native_test_target.uuid.to_s] = { 'TestTargetID' => app_host_target.uuid.to_s }
+              project.root_object.attributes['TargetAttributes'] = target_attributes
+            end
+          end
+
           # Adds the test targets for the library to the Pods project with the
           # appropriate build configurations.
           #
@@ -201,6 +261,8 @@ module Pod
                 configuration.build_settings['PRODUCT_NAME'] = name
                 # We must codesign iOS XCTest bundles that contain binary frameworks to allow them to be launchable in the simulator
                 configuration.build_settings['CODE_SIGNING_REQUIRED'] = 'YES' unless target.platform == :osx
+                # For macOS we do not code sign the XCTest bundle because we do not code sign the frameworks either.
+                configuration.build_settings['CODE_SIGN_IDENTITY'] = '' if target.platform == :osx
               end
 
               # Test native targets also need frameworks and resources to be copied over to their xctest bundle.
@@ -259,7 +321,7 @@ module Pod
                 path = target.info_plist_path
                 path.dirname.mkdir unless path.dirname.exist?
                 info_plist_path = path.dirname + "ResourceBundle-#{bundle_name}-#{path.basename}"
-                generator = Generator::InfoPlistFile.new(target, :bundle_package_type => :bndl)
+                generator = Generator::InfoPlistFile.new(target.version, target.platform, :bndl)
                 update_changed_file(generator, info_plist_path)
                 add_file_to_support_group(info_plist_path)
 
@@ -407,6 +469,8 @@ module Pod
           mkdir -p "${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.framework/Modules"
           cp "${BUILT_PRODUCTS_DIR}/lib${PRODUCT_NAME}.a" "${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.framework/${PRODUCT_NAME}"
           cp "${MODULEMAP_FILE}" "${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.framework/Modules/module.modulemap"
+          # If there's a .swiftmodule, copy it into the framework's Modules folder
+          cp -r "${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}".swiftmodule "${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.framework/Modules/" 2>/dev/null || :
             eos
           end
 
@@ -414,17 +478,30 @@ module Pod
           # to the platform of the target. This file also include any prefix header
           # content reported by the specification of the pods.
           #
+          # @param [Pathname] path
+          #        the path to generate the prefix header for.
+          #
+          # @param [Array<Sandbox::FileAccessor>] file_accessors
+          #        the file accessors to use for this prefix header that point to a path of a prefix header.
+          #
+          # @param [Platform] platform
+          #        the platform to use for this prefix header.
+          #
+          # @param [Array<PBXNativetarget>] native_targets
+          #        the native targets on which the prefix header should be configured for.
+          #
           # @return [void]
           #
-          def create_prefix_header
-            path = target.prefix_header_path
-            generator = Generator::PrefixHeader.new(target.file_accessors, target.platform)
+          def create_prefix_header(path, file_accessors, platform, native_targets)
+            generator = Generator::PrefixHeader.new(file_accessors, platform)
             update_changed_file(generator, path)
             add_file_to_support_group(path)
 
-            native_target.build_configurations.each do |c|
-              relative_path = path.relative_path_from(project.path.dirname)
-              c.build_settings['GCC_PREFIX_HEADER'] = relative_path.to_s
+            native_targets.each do |native_target|
+              native_target.build_configurations.each do |c|
+                relative_path = path.relative_path_from(project.path.dirname)
+                c.build_settings['GCC_PREFIX_HEADER'] = relative_path.to_s
+              end
             end
           end
 
@@ -433,7 +510,7 @@ module Pod
             :osx => Version.new('10.8'),
             :watchos => Version.new('2.0'),
             :tvos => Version.new('9.0'),
-          }
+          }.freeze
 
           # Returns the compiler flags for the source files of the given specification.
           #