Merge pull request #7368 from dnkoutso/always_update_paths

Always update input/output paths even if they are empty

CHANGELOG.md

@@ -22,6 +22,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
 
 ##### Bug Fixes
 
+* Always update input/output paths even if they are empty  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#7368](https://github.com/CocoaPods/CocoaPods/pull/7368)
+
 * Unique all available pre-release versions when displaying  
   [Samuel Giddins](https://github.com/segiddins)
   [#7353](https://github.com/CocoaPods/CocoaPods/pull/7353)

lib/cocoapods/installer/user_project_integrator/target_integrator.rb

@@ -71,15 +71,11 @@ module Pod
           #
           # @return [void]
           #
-          def add_embed_frameworks_script_phase_to_target(native_target, script_path, input_paths = [], output_paths = [])
+          def create_or_update_embed_frameworks_script_phase_to_target(native_target, script_path, input_paths = [], output_paths = [])
             phase = TargetIntegrator.create_or_update_build_phase(native_target, BUILD_PHASE_PREFIX + 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
+            phase.input_paths = input_paths
+            phase.output_paths = output_paths
           end
 
           # Delete a 'Embed Pods Frameworks' Copy Files Build Phase if present
@@ -111,16 +107,12 @@ module Pod
           #
           # @return [void]
           #
-          def add_copy_resources_script_phase_to_target(native_target, script_path, input_paths = [], output_paths = [])
+          def create_or_update_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, BUILD_PHASE_PREFIX + 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
+            phase.input_paths = input_paths
+            phase.output_paths = output_paths
           end
 
           # Creates or update a shell script build phase for the given target.
@@ -289,7 +281,7 @@ module Pod
                 File.join(base_path, File.basename(input_path, File.extname(input_path)) + output_extension)
               end.uniq
             end
-            TargetIntegrator.add_copy_resources_script_phase_to_target(native_target, script_path, input_paths, output_paths)
+            TargetIntegrator.create_or_update_copy_resources_script_phase_to_target(native_target, script_path, input_paths, output_paths)
           end
         end
 
@@ -322,7 +314,7 @@ module Pod
               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
             end
-            TargetIntegrator.add_embed_frameworks_script_phase_to_target(native_target, script_path, input_paths, output_paths)
+            TargetIntegrator.create_or_update_embed_frameworks_script_phase_to_target(native_target, script_path, input_paths, output_paths)
           end
         end
 

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

@@ -64,7 +64,7 @@ module Pod
                 File.join(base_path, File.basename(input_path, File.extname(input_path)) + output_extension)
               end
             end
-            UserProjectIntegrator::TargetIntegrator.add_copy_resources_script_phase_to_target(native_target, script_path, input_paths, output_paths)
+            UserProjectIntegrator::TargetIntegrator.create_or_update_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
@@ -81,7 +81,7 @@ module Pod
               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
-            UserProjectIntegrator::TargetIntegrator.add_embed_frameworks_script_phase_to_target(native_target, script_path, input_paths, output_paths)
+            UserProjectIntegrator::TargetIntegrator.create_or_update_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

spec/unit/installer/user_project_integrator/target_integrator_spec.rb

@@ -370,6 +370,29 @@ module Pod
           phase.output_paths.should.be.empty
         end
 
+        it 'updates embed frameworks phase if it becomes empty' do
+          debug_non_vendored_framework = { :name => 'DebugCompiledFramework.framework',
+                                           :input_path => '${BUILT_PRODUCTS_DIR}/DebugCompiledFramework/DebugCompiledFramework.framework',
+                                           :output_path => '${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DebugCompiledFramework.framework' }
+          framework_paths_by_config = {
+            'Debug' => [debug_non_vendored_framework],
+          }
+          @pod_bundle.stubs(:framework_paths_by_config => framework_paths_by_config)
+          @target_integrator.integrate!
+          target = @target_integrator.send(:native_targets).first
+          phase = target.shell_script_build_phases.find { |bp| bp.name == @embed_framework_phase_name }
+          phase.input_paths.sort.should == %w(
+            ${BUILT_PRODUCTS_DIR}/DebugCompiledFramework/DebugCompiledFramework.framework
+            ${SRCROOT}/../Pods/Target\ Support\ Files/Pods/Pods-frameworks.sh
+          )
+          # Now pretend the same target has no more framework paths, it should update the targets input/output paths
+          @pod_bundle.stubs(:framework_paths_by_config => {})
+          @target_integrator.integrate!
+          target = @target_integrator.send(:native_targets).first
+          phase = target.shell_script_build_phases.find { |bp| bp.name == @embed_framework_phase_name }
+          phase.input_paths.sort.should.be.empty
+        end
+
         it 'adds embed frameworks build phase input and output paths for vendored and non vendored frameworks' do
           debug_vendored_framework = { :name => 'DebugVendoredFramework.framework',
                                        :input_path => '${PODS_ROOT}/DebugVendoredFramework/ios/DebugVendoredFramework.framework',