cocoapods 1.3.0.beta.2 → 1.3.0.beta.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b333fa1137f2e1a7944d505a3980c5e70fbead9c
-  data.tar.gz: debc12d5f99d1c374220dfb216e144accac4242d
+  metadata.gz: 010a300e0d6351f5abbc7c2e9afe809565464c6f
+  data.tar.gz: 00b50e9d429fd07a81110a69dfe446fc41aedd98
 SHA512:
-  metadata.gz: 86fa795c0a553e257907a02a2b377ad19938f1eb279f75c57105bb7984d72ab823e97481f05c4cf44c0353c392be8ba383422872b254f57b63ae03f53058d537
-  data.tar.gz: d1d3136f5bec874fa203d453008a8b358e53caf14be96b93c7f66f7ff9cb4a0ed497ba1ccef4fc790870768251ed9cd2c880dc51b04e5e452b1761c5be805406
+  metadata.gz: 595776d077642917cc5ccd59586b899cef84ede1a8e1a03f84ad6965e09ea2427053f6ab33ee70baacaf41e40876f794f2284a40b2e63c086bee87803db2ccc6
+  data.tar.gz: 5b09a2b7b4a9ea17f2b12fa5eba83308257e28c9701b2c9786e23d7341214e8e323074f817fdbabd800e1ebef38757f43099c06097280bb0bd7a858be750f847

data/CHANGELOG.md

@@ -4,6 +4,49 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
 
 To install release candidates run `[sudo] gem install cocoapods --pre`
 
+## 1.3.0.beta.3 (2017-07-19)
+
+##### Enhancements
+
+* Protect rsync tmp files from being deleted if two targets sync at the same time  
+  [Justin Martin](https://github.com/justinseanmartin)
+  [#6873](https://github.com/CocoaPods/CocoaPods/pull/6873)
+
+* Include test schemes within library schemes  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#6765](https://github.com/CocoaPods/CocoaPods/issues/6765)
+
+* Truncate extra groups in Development Pods when they are parents of all files  
+  [Eric Amorde](https://github.com/amorde)
+  [#6814](https://github.com/CocoaPods/CocoaPods/pull/6814)
+
+* Do not re-write generated files that have not changed  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [dingjingpisces2015](https://github.com/dingjingpisces2015)
+  [#6825](https://github.com/CocoaPods/CocoaPods/pull/6825)
+
+##### Bug Fixes
+
+* Set the test xcconfig file to resource bundles used only by tests  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#6886](https://github.com/CocoaPods/CocoaPods/pull/6886)
+
+* Integrate test targets to embed frameworks and resources  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#6828](https://github.com/CocoaPods/CocoaPods/pull/6828)
+
+* Ensure resource bundle and test dependencies are set for test native targets  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#6829](https://github.com/CocoaPods/CocoaPods/pull/6829)
+
+* Provide a better error message when references are missing for non-source files
+  [David Airapetyan](https://github.com/davidair)
+  [#4887](https://github.com/CocoaPods/CocoaPods/issues/4887)
+
+* Select unique module_name(s) across host target's and embedded targets' pod targets  
+  [Anand Biligiri](https://github.com/abiligiri)
+  [#6711](https://github.com/CocoaPods/CocoaPods/issues/6711)
+
 ## 1.3.0.beta.2 (2017-06-22)
 
 ##### Enhancements

data/lib/cocoapods/gem_version.rb

@@ -1,5 +1,5 @@
 module Pod
   # The version of the CocoaPods command line tool.
   #
-  VERSION = '1.3.0.beta.2'.freeze unless defined? Pod::VERSION
+  VERSION = '1.3.0.beta.3'.freeze unless defined? Pod::VERSION
 end

data/lib/cocoapods/generator/copy_resources_script.rb

@@ -104,6 +104,10 @@ RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy-${TARGETNAME}.txt
 
 XCASSET_FILES=()
 
+# This protects against multiple targets copying the same framework dependency at the same time. The solution
+# was originally proposed here: https://lists.samba.org/archive/rsync/2008-February/020158.html
+RSYNC_PROTECT_TMP_FILES=(--filter "P .*.??????")
+
 case "${TARGETED_DEVICE_FAMILY}" in
   1,2)
     TARGET_DEVICE_ARGS="--target-device ipad --target-device iphone"
@@ -150,8 +154,8 @@ EOM
     *.framework)
       echo "mkdir -p ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" || true
       mkdir -p "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
-      echo "rsync --delete -av $RESOURCE_PATH ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" || true
-      rsync --delete -av "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
+      echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" $RESOURCE_PATH ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" || true
+      rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
       ;;
     *.xcdatamodel)
       echo "xcrun momc \\"$RESOURCE_PATH\\" \\"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH"`.mom\\"" || true
@@ -180,10 +184,10 @@ EOS
       RSYNC_CALL = <<EOS
 
 mkdir -p "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
-rsync --delete -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
+rsync --delete -avr --copy-links --no-relative "${RSYNC_PROTECT_TMP_FILES[@]}" --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
 if [[ "${ACTION}" == "install" ]] && [[ "${SKIP_INSTALL}" == "NO" ]]; then
   mkdir -p "${INSTALL_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
-  rsync --delete -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${INSTALL_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
+  rsync --delete -avr --copy-links --no-relative "${RSYNC_PROTECT_TMP_FILES[@]}" --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${INSTALL_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
 fi
 rm -f "$RESOURCES_TO_COPY"
 EOS

data/lib/cocoapods/generator/embed_frameworks_script.rb

@@ -43,6 +43,10 @@ module Pod
 
           SWIFT_STDLIB_PATH="${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}"
 
+          # This protects against multiple targets copying the same framework dependency at the same time. The solution
+          # was originally proposed here: https://lists.samba.org/archive/rsync/2008-February/020158.html
+          RSYNC_PROTECT_TMP_FILES=(--filter "P .*.??????")
+
           install_framework()
           {
             if [ -r "${BUILT_PRODUCTS_DIR}/$1" ]; then
@@ -60,9 +64,9 @@ module Pod
                 source="$(readlink "${source}")"
             fi
 
-            # use filter instead of exclude so missing patterns dont' throw errors
-            echo "rsync --delete -av --filter \\"- CVS/\\" --filter \\"- .svn/\\" --filter \\"- .git/\\" --filter \\"- .hg/\\" --filter \\"- Headers\\" --filter \\"- PrivateHeaders\\" --filter \\"- Modules\\" \\"${source}\\" \\"${destination}\\""
-            rsync --delete -av --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${destination}"
+            # Use filter instead of exclude so missing patterns don't throw errors.
+            echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \\"- CVS/\\" --filter \\"- .svn/\\" --filter \\"- .git/\\" --filter \\"- .hg/\\" --filter \\"- Headers\\" --filter \\"- PrivateHeaders\\" --filter \\"- Modules\\" \\"${source}\\" \\"${destination}\\""
+            rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${destination}"
 
             local basename
             basename="$(basename -s .framework "$1")"
@@ -95,8 +99,8 @@ module Pod
           install_dsym() {
             local source="$1"
             if [ -r "$source" ]; then
-              echo "rsync --delete -av --filter \\"- CVS/\\" --filter \\"- .svn/\\" --filter \\"- .git/\\" --filter \\"- .hg/\\" --filter \\"- Headers\\" --filter \\"- PrivateHeaders\\" --filter \\"- Modules\\" \\"${source}\\" \\"${DWARF_DSYM_FOLDER_PATH}\\""
-              rsync --delete -av --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${DWARF_DSYM_FOLDER_PATH}"
+              echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \\"- CVS/\\" --filter \\"- .svn/\\" --filter \\"- .git/\\" --filter \\"- .hg/\\" --filter \\"- Headers\\" --filter \\"- PrivateHeaders\\" --filter \\"- Modules\\" \\"${source}\\" \\"${DWARF_DSYM_FOLDER_PATH}\\""
+              rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${DWARF_DSYM_FOLDER_PATH}"
             fi
           }
 

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

@@ -70,10 +70,10 @@ module Pod
           end
           XCConfigHelper.add_target_specific_settings(target, @xcconfig)
           recursive_dependent_targets = target.recursive_dependent_targets
-          @xcconfig.merge! XCConfigHelper.settings_for_dependent_targets(target, recursive_dependent_targets)
+          @xcconfig.merge! XCConfigHelper.settings_for_dependent_targets(target, recursive_dependent_targets, @test_xcconfig)
           if @test_xcconfig
             test_dependent_targets = [target, *target.test_dependent_targets]
-            @xcconfig.merge! XCConfigHelper.settings_for_dependent_targets(target, test_dependent_targets - recursive_dependent_targets)
+            @xcconfig.merge! XCConfigHelper.settings_for_dependent_targets(target, test_dependent_targets - recursive_dependent_targets, @test_xcconfig)
             XCConfigHelper.generate_vendored_build_settings(nil, test_dependent_targets, @xcconfig)
             XCConfigHelper.generate_other_ld_flags(nil, test_dependent_targets, @xcconfig)
             XCConfigHelper.generate_ld_runpath_search_paths(target, false, true, @xcconfig)

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

@@ -265,9 +265,12 @@ module Pod
         # @param  [Array<PodTarget>] dependent_targets
         #         The pod targets the given target depends on.
         #
+        # @param  [Boolean] test_xcconfig
+        #         Whether the settings for dependent targets are being generated for a test xcconfig or not.
+        #
         # @return [Hash<String, String>] the settings
         #
-        def self.settings_for_dependent_targets(target, dependent_targets)
+        def self.settings_for_dependent_targets(target, dependent_targets, test_xcconfig = false)
           dependent_targets = dependent_targets.select(&:should_build?)
 
           # Alias build dirs to avoid recursive definitions for pod targets and depending
@@ -277,8 +280,8 @@ module Pod
             CONFIGURATION_BUILD_DIR_VARIABLE[1..-1] => "#{BUILD_DIR_VARIABLE}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)",
           }
 
-          # Scope pod targets
-          if target.respond_to?(:configuration_build_dir)
+          # Scope pod targets as long as they are not test targets.
+          if !test_xcconfig && target.respond_to?(:configuration_build_dir)
             build_settings['CONFIGURATION_BUILD_DIR'] = target.configuration_build_dir(CONFIGURATION_BUILD_DIR_VARIABLE)
           end
 

data/lib/cocoapods/installer.rb

@@ -279,10 +279,18 @@ module Pod
     #
     def clean_sandbox
       sandbox.public_headers.implode!
+      target_support_dirs = sandbox.target_support_files_root.children.select(&:directory?)
       pod_targets.each do |pod_target|
         pod_target.build_headers.implode!
+        target_support_dirs.delete(pod_target.support_files_dir)
       end
 
+      aggregate_targets.each do |aggregate_target|
+        target_support_dirs.delete(aggregate_target.support_files_dir)
+      end
+
+      target_support_dirs.each { |dir| FileUtils.rm_rf(dir) }
+
       unless sandbox_state.deleted.empty?
         title_options = { :verbose_prefix => '-> '.red }
         sandbox_state.deleted.each do |pod_name|

data/lib/cocoapods/installer/pods_project_integrator/pod_target_integrator.rb

@@ -0,0 +1,85 @@
+module Pod
+  class Installer
+    # This class is responsible for integrating a pod target. This includes integrating
+    # the test targets included by each pod target.
+    #
+    class PodTargetIntegrator
+      # @return [PodTarget] the target that should be integrated.
+      #
+      attr_reader :target
+
+      # Init a new PodTargetIntegrator.
+      #
+      # @param  [PodTarget] target @see #target
+      #
+      def initialize(target)
+        @target = target
+      end
+
+      # Integrates the pod target.
+      #
+      # @return [void]
+      #
+      def integrate!
+        UI.section(integration_message) do
+          target.test_native_targets.each do |native_target|
+            add_embed_frameworks_script_phase(native_target)
+            add_copy_resources_script_phase(native_target)
+          end
+        end
+      end
+
+      # @return [String] a string representation suitable for debugging.
+      #
+      def inspect
+        "#<#{self.class} for target `#{target.label}'>"
+      end
+
+      private
+
+      # @!group Integration steps
+      #---------------------------------------------------------------------#
+
+      # Find or create a 'Copy Pods Resources' build phase
+      #
+      # @return [void]
+      #
+      def add_copy_resources_script_phase(native_target)
+        test_type = target.test_type_for_product_type(native_target.symbol_type)
+        script_path = "${PODS_ROOT}/#{target.copy_resources_script_path_for_test_type(test_type).relative_path_from(target.sandbox.root)}"
+        resource_paths = [target, *target.test_dependent_targets].flat_map(&:resource_paths)
+        input_paths = []
+        output_paths = []
+        unless resource_paths.empty?
+          input_paths = [script_path, *resource_paths.flatten.uniq]
+          output_paths = ['${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}']
+        end
+        Pod::Installer::UserProjectIntegrator::TargetIntegrator.add_copy_resources_script_phase_to_target(native_target, script_path, input_paths, output_paths)
+      end
+
+      # Find or create a 'Embed Pods Frameworks' Copy Files Build Phase
+      #
+      # @return [void]
+      #
+      def add_embed_frameworks_script_phase(native_target)
+        test_type = target.test_type_for_product_type(native_target.symbol_type)
+        script_path = "${PODS_ROOT}/#{target.embed_frameworks_script_path_for_test_type(test_type).relative_path_from(target.sandbox.root)}"
+        framework_paths = [target, *target.test_dependent_targets].flat_map(&:framework_paths)
+        input_paths = []
+        output_paths = []
+        unless framework_paths.empty?
+          input_paths = [script_path, *framework_paths.map { |fw| [fw[:input_path], fw[:dsym_input_path]] }.flatten.compact]
+          output_paths = framework_paths.map { |fw| [fw[:output_path], fw[:dsym_output_path]] }.flatten.compact
+        end
+        Pod::Installer::UserProjectIntegrator::TargetIntegrator.add_embed_frameworks_script_phase_to_target(native_target, script_path, input_paths, output_paths)
+      end
+
+      # @return [String] the message that should be displayed for the target
+      #         integration.
+      #
+      def integration_message
+        "Integrating target `#{target.name}`"
+      end
+    end
+  end
+end

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

@@ -9,7 +9,7 @@ module Pod
       class TargetIntegrator
         autoload :XCConfigIntegrator, 'cocoapods/installer/user_project_integrator/target_integrator/xcconfig_integrator'
 
-        # @return [String] the PACKAGE emoji to use as prefix for every build phase aded to the user project
+        # @return [String] the PACKAGE emoji to use as prefix for every build phase added to the user project
         #
         BUILD_PHASE_PREFIX = '[CP] '.freeze
 
@@ -47,6 +47,104 @@ module Pod
           @target = target
         end
 
+        class << self
+          # Adds a shell script build phase responsible to copy (embed) the frameworks
+          # generated by the TargetDefinition to the bundle of the product of the
+          # targets.
+          #
+          # @param [PBXNativeTarget] native_target
+          #        The native target to add the script phase into.
+          #
+          # @param [String] script_path
+          #        The script path to execute as part of this script phase.
+          #
+          # @param [Array<String>] input_paths
+          #        The input paths (if any) to include for this script phase.
+          #
+          # @param [Array<String>] output_paths
+          #        The output paths (if any) to include for this script phase.
+          #
+          # @return [void]
+          #
+          def add_embed_frameworks_script_phase_to_target(native_target, script_path, input_paths = [], output_paths = [])
+            phase = TargetIntegrator.create_or_update_build_phase(native_target, EMBED_FRAMEWORK_PHASE_NAME)
+            phase.shell_script = %("#{script_path}"\n)
+            unless input_paths.empty?
+              phase.input_paths = input_paths
+            end
+            unless output_paths.empty?
+              phase.output_paths = output_paths
+            end
+          end
+
+          # Delete a 'Embed Pods Frameworks' Copy Files Build Phase if present
+          #
+          # @param [PBXNativeTarget] native_target
+          #        The native target to remove the script phase from.
+          #
+          def remove_embed_frameworks_script_phase_from_target(native_target)
+            embed_build_phase = native_target.shell_script_build_phases.find { |bp| bp.name && bp.name.end_with?(EMBED_FRAMEWORK_PHASE_NAME) }
+            return unless embed_build_phase.present?
+            native_target.build_phases.delete(embed_build_phase)
+          end
+
+          # Adds a shell script build phase responsible to copy the resources
+          # generated by the TargetDefinition to the bundle of the product of the
+          # targets.
+          #
+          # @param [PBXNativeTarget] native_target
+          #        The native target to add the script phase into.
+          #
+          # @param [String] script_path
+          #        The script path to execute as part of this script phase.
+          #
+          # @param [Array<String>] input_paths
+          #        The input paths (if any) to include for this script phase.
+          #
+          # @param [Array<String>] output_paths
+          #        The output paths (if any) to include for this script phase.
+          #
+          # @return [void]
+          #
+          def add_copy_resources_script_phase_to_target(native_target, script_path, input_paths = [], output_paths = [])
+            phase_name = COPY_PODS_RESOURCES_PHASE_NAME
+            phase = TargetIntegrator.create_or_update_build_phase(native_target, phase_name)
+            phase.shell_script = %("#{script_path}"\n)
+            unless input_paths.empty?
+              phase.input_paths = input_paths
+            end
+            unless output_paths.empty?
+              phase.output_paths = output_paths
+            end
+          end
+
+          # Creates or update a shell script build phase for the given target.
+          #
+          # @param [PBXNativeTarget] native_target
+          #        The native target to add the script phase into.
+          #
+          # @param [String] phase_name
+          #        The name of the phase to use.
+          #
+          # @param [Class] phase_class
+          #        The class of the phase to use.
+          #
+          # @return [void]
+          #
+          def create_or_update_build_phase(native_target, phase_name, phase_class = Xcodeproj::Project::Object::PBXShellScriptBuildPhase)
+            prefixed_phase_name = BUILD_PHASE_PREFIX + phase_name
+            build_phases = native_target.build_phases.grep(phase_class)
+            build_phases.find { |phase| phase.name && phase.name.end_with?(phase_name) }.tap { |p| p.name = prefixed_phase_name if p } ||
+              native_target.project.new(phase_class).tap do |phase|
+                UI.message("Adding Build Phase '#{prefixed_phase_name}' to project.") do
+                  phase.name = prefixed_phase_name
+                  phase.show_env_vars_in_log = '0'
+                  native_target.build_phases << phase
+                end
+              end
+          end
+        end
+
         # Integrates the user project targets. Only the targets that do **not**
         # already have the Pods library in their frameworks build phase are
         # processed.
@@ -106,13 +204,21 @@ module Pod
           end
         end
 
-        # Find or create a 'Embed Pods Frameworks' Copy Files Build Phase
+        # Find or create a 'Copy Pods Resources' build phase
         #
         # @return [void]
         #
-        def add_embed_frameworks_script_phase
-          native_targets_to_embed_in.each do |native_target|
-            add_embed_frameworks_script_phase_to_target(native_target)
+        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
+            input_paths = []
+            output_paths = []
+            unless resource_paths_by_config.values.all?(&:empty?)
+              input_paths = [target.copy_resources_script_relative_path, *resource_paths_by_config.values.flatten.uniq]
+              output_paths = ['${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}']
+            end
+            TargetIntegrator.add_copy_resources_script_phase_to_target(native_target, script_path, input_paths, output_paths)
           end
         end
 
@@ -126,49 +232,26 @@ module Pod
           return unless target.requires_host_target?
           native_targets.each do |native_target|
             if AggregateTarget::EMBED_FRAMEWORKS_IN_HOST_TARGET_TYPES.include? native_target.symbol_type
-              remove_embed_frameworks_script_phase(native_target)
+              TargetIntegrator.remove_embed_frameworks_script_phase_from_target(native_target)
             end
           end
         end
 
-        def add_embed_frameworks_script_phase_to_target(native_target)
-          phase = create_or_update_build_phase(native_target, EMBED_FRAMEWORK_PHASE_NAME)
-          script_path = target.embed_frameworks_script_relative_path
-          phase.shell_script = %("#{script_path}"\n)
-          framework_paths_by_config = target.framework_paths_by_config.values.flatten.uniq
-          unless framework_paths_by_config.all?(&:empty?)
-            phase.input_paths = [target.embed_frameworks_script_relative_path, *framework_paths_by_config.map { |fw| [fw[:input_path], fw[:dsym_input_path]] }.flatten.compact]
-            phase.output_paths = framework_paths_by_config.map { |fw| [fw[:output_path], fw[:dsym_output_path]] }.flatten.compact
-          end
-        end
-
-        # Delete a 'Embed Pods Frameworks' Copy Files Build Phase if present
-        #
-        # @param [PBXNativeTarget] native_target
-        #
-        def remove_embed_frameworks_script_phase(native_target)
-          embed_build_phase = native_target.shell_script_build_phases.find { |bp| bp.name && bp.name.end_with?(EMBED_FRAMEWORK_PHASE_NAME) }
-          return unless embed_build_phase.present?
-          native_target.build_phases.delete(embed_build_phase)
-        end
-
-        # Adds a shell script build phase responsible to copy the resources
-        # generated by the TargetDefinition to the bundle of the product of the
-        # targets.
+        # Find or create a 'Embed Pods Frameworks' Copy Files Build Phase
         #
         # @return [void]
         #
-        def add_copy_resources_script_phase
-          phase_name = COPY_PODS_RESOURCES_PHASE_NAME
-          native_targets.each do |native_target|
-            phase = create_or_update_build_phase(native_target, phase_name)
-            script_path = target.copy_resources_script_relative_path
-            phase.shell_script = %("#{script_path}"\n)
-            resource_paths_by_config = target.resource_paths_by_config
-            unless resource_paths_by_config.values.all?(&:empty?)
-              phase.input_paths = [target.copy_resources_script_relative_path, *resource_paths_by_config.values.flatten.uniq]
-              phase.output_paths = ['${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}']
+        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
+            input_paths = []
+            output_paths = []
+            unless framework_paths_by_config.all?(&:empty?)
+              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
             end
+            TargetIntegrator.add_embed_frameworks_script_phase_to_target(native_target, script_path, input_paths, output_paths)
           end
         end
 
@@ -184,7 +267,7 @@ module Pod
         def add_check_manifest_lock_script_phase
           phase_name = CHECK_MANIFEST_PHASE_NAME
           native_targets.each do |native_target|
-            phase = create_or_update_build_phase(native_target, phase_name)
+            phase = TargetIntegrator.create_or_update_build_phase(native_target, phase_name)
             native_target.build_phases.unshift(phase).uniq! unless native_target.build_phases.first == phase
             phase.shell_script = <<-SH.strip_heredoc
               diff "${PODS_PODFILE_DIR_PATH}/Podfile.lock" "${PODS_ROOT}/Manifest.lock" > /dev/null
@@ -246,19 +329,6 @@ module Pod
           "Integrating target `#{target.name}` " \
             "(#{UI.path target.user_project_path} project)"
         end
-
-        def create_or_update_build_phase(target, phase_name, phase_class = Xcodeproj::Project::Object::PBXShellScriptBuildPhase)
-          prefixed_phase_name = BUILD_PHASE_PREFIX + phase_name
-          build_phases = target.build_phases.grep(phase_class)
-          build_phases.find { |phase| phase.name && phase.name.end_with?(phase_name) }.tap { |p| p.name = prefixed_phase_name if p } ||
-            target.project.new(phase_class).tap do |phase|
-              UI.message("Adding Build Phase '#{prefixed_phase_name}' to project.") do
-                phase.name = prefixed_phase_name
-                phase.show_env_vars_in_log = '0'
-                target.build_phases << phase
-              end
-            end
-        end
       end
     end
   end