Merge pull request #4264 from CocoaPods/seg-migrate-embed-frameworks-script

[TargetIntegrator] Ensure the embed frameworks script is added to exi…

lib/cocoapods/installer/user_project_integrator/target_integrator.rb

@@ -127,11 +127,16 @@ module Pod
         # @todo   This can be removed for CocoaPods 1.0
         #
         def update_to_cocoapods_0_39
-          requires_update = native_targets_to_embed_in.any? do |target|
-            !target.shell_script_build_phases.find { |bp| bp.name == 'Embed Pods Frameworks' }
+          targets_to_embed = native_targets.select do |target|
+            EMBED_FRAMEWORK_TARGET_TYPES.include?(target.symbol_type)
+          end
+          requires_update = targets_to_embed.any? do |target|
+            !target.shell_script_build_phases.find { |bp| bp.name == EMBED_FRAMEWORK_PHASE_NAME }
           end
           if requires_update
-            add_embed_frameworks_script_phase
+            targets_to_embed.each do |native_target|
+              add_embed_frameworks_script_phase_to_target(native_target)
+            end
           end
 
           frameworks = user_project.frameworks_group
@@ -190,12 +195,16 @@ module Pod
         #
         def add_embed_frameworks_script_phase
           native_targets_to_embed_in.each do |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)
+            add_embed_frameworks_script_phase_to_target(native_target)
           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)
+        end
+
         # Delete a 'Embed Pods Frameworks' Copy Files Build Phase if present
         #
         # @param [PBXNativeTarget] native_target

cocoapods-integration-specs @ e0b4cf0d

-Subproject commit 5d5cc41dd34abe88f20c797bd10a7a05bc76f33a
+Subproject commit e0b4cf0d8982adabdb5001536bfcb1b88a1e5534

spec/unit/installer/user_project_integrator/target_integrator_spec.rb

@@ -24,6 +24,9 @@ module Pod
         @pod_bundle.xcconfigs['Debug'] = configuration
         @pod_bundle.xcconfigs['Release'] = configuration
         @target_integrator = TargetIntegrator.new(@pod_bundle)
+        @target_integrator.private_methods.grep(/^update_to_cocoapods_/).each do |method|
+          @target_integrator.stubs(method)
+        end
       end
 
       describe '#integrate!' do
@@ -48,6 +51,7 @@ module Pod
         end
 
         it 'fixes the "Link binary with libraries" build phase of legacy installations' do
+          @target_integrator.unstub(:update_to_cocoapods_0_39)
           @pod_bundle.stubs(:requires_frameworks? => true)
           @target_integrator.integrate!
           target = @target_integrator.send(:native_targets).first