cocoapods 1.7.5 → 1.8.0.beta.1

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

@@ -112,7 +112,7 @@ module Pod
             regex = %r{
               ^(
                 (\s*                                  # Possible, but unlikely, space before include statement
-                  \#include\s+                        # Include statement
+                  \#include(\?)?\s+                   # Include statement
                   ['"]                                # Open quote
                   (.*\/)?                             # Possible prefix to path
                   #{Regexp.quote(target_config_path)} # The path should end in the target_config_path

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

@@ -13,7 +13,9 @@ module Pod
           # Generate container Pods.xcodeproj.
           container_project = create_container_project(aggregate_targets, sandbox.project_path)
 
-          project_paths_by_pod_targets = pod_targets.group_by { |pod_target| sandbox.pod_target_project_path(pod_target.pod_name) }
+          project_paths_by_pod_targets = pod_targets.group_by do |pod_target|
+            sandbox.pod_target_project_path(pod_target.project_name)
+          end
           projects_by_pod_targets = Hash[project_paths_by_pod_targets.map do |project_path, pod_targets|
             project = create_pods_project(pod_targets, project_path, container_project)
             [project, pod_targets]

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

@@ -59,8 +59,8 @@ module Pod
                 # Hit the cache
                 is_local = sandbox.local?(pod_target.pod_name)
                 cached_dependency = metadata_cache.target_label_by_metadata[pod_target.label]
-                project.add_cached_pod_subproject(cached_dependency, is_local)
-                Project.add_cached_dependency(aggregate_native_target, cached_dependency)
+                project.add_cached_pod_subproject(sandbox, cached_dependency, is_local)
+                Project.add_cached_dependency(sandbox, aggregate_native_target, cached_dependency)
               end
             end
           end

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

@@ -37,6 +37,10 @@ module Pod
           #
           attr_reader :add_main
 
+          # @return [Hash] Info.plist entries for the app host
+          #
+          attr_reader :info_plist_entries
+
           # Initialize a new instance
           #
           # @param [Sandbox] sandbox @see #sandbox
@@ -46,8 +50,9 @@ module Pod
           # @param [String] group_name @see #group_name
           # @param [String] app_target_label see #app_target_label
           # @param [Boolean] add_main see #add_main
+          # @param [Hash] info_plist_entries see #info_plist_entries
           #
-          def initialize(sandbox, project, platform, subgroup_name, group_name, app_target_label, add_main: true)
+          def initialize(sandbox, project, platform, subgroup_name, group_name, app_target_label, add_main: true, info_plist_entries: {})
             @sandbox = sandbox
             @project = project
             @platform = platform
@@ -55,6 +60,7 @@ module Pod
             @group_name = group_name
             @app_target_label = app_target_label
             @add_main = add_main
+            @info_plist_entries = info_plist_entries
             target_group = project.pod_group(group_name)
             @group = target_group[subgroup_name] || target_group.new_group(subgroup_name)
           end
@@ -74,9 +80,8 @@ module Pod
 
             Pod::Generator::AppTargetHelper.add_app_host_main_file(project, app_host_target, platform_name, @group, app_target_label) if add_main
             Pod::Generator::AppTargetHelper.add_launchscreen_storyboard(project, app_host_target, @group, deployment_target, app_target_label) if platform == :ios
-            additional_entries = ADDITIONAL_INFO_PLIST_ENTRIES.merge(platform == :ios ? ADDITIONAL_IOS_INFO_PLIST_ENTRIES : {})
             create_info_plist_file_with_sandbox(sandbox, app_host_info_plist_path, app_host_target, '1.0.0', platform,
-                                                :appl, additional_entries)
+                                                :appl, :additional_entries => additional_info_plist_entries)
             @group.new_file(app_host_info_plist_path)
             app_host_target
           end
@@ -104,6 +109,16 @@ module Pod
             ),
           }.freeze
 
+          # @return [Hash] the additional Info.plist entries to be included
+          #
+          def additional_info_plist_entries
+            result = {}
+            result.merge!(ADDITIONAL_INFO_PLIST_ENTRIES)
+            result.merge!(ADDITIONAL_IOS_INFO_PLIST_ENTRIES) if platform == :ios
+            result.merge!(info_plist_entries) if info_plist_entries
+            result
+          end
+
           # @return [Pathname] The absolute path of the Info.plist to use for an app host.
           #
           def app_host_info_plist_path

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

@@ -6,6 +6,10 @@ module Pod
       class PodTargetDependencyInstaller
         require 'cocoapods/native_target_extension.rb'
 
+        # @return [Sandbox] The sandbox used for this installation.
+        #
+        attr_reader :sandbox
+
         # @return [TargetInstallationResults] The target installation results for pod targets.
         #
         attr_reader :pod_target_installation_results
@@ -14,10 +18,6 @@ module Pod
         #
         attr_reader :metadata_cache
 
-        # @return [Sandbox] The sandbox used for this installation.
-        #
-        attr_reader :sandbox
-
         # Initialize a new instance.
         #
         # @param [Sandbox] sandbox @see #sandbox
@@ -85,8 +85,8 @@ module Pod
             else
               # Hit the cache
               cached_dependency = metadata_cache.target_label_by_metadata[dependent_target.label]
-              project.add_cached_pod_subproject(cached_dependency, is_local)
-              Project.add_cached_dependency(native_target, cached_dependency)
+              project.add_cached_pod_subproject(sandbox, cached_dependency, is_local)
+              Project.add_cached_dependency(sandbox, native_target, cached_dependency)
             end
           end
         end
@@ -98,7 +98,7 @@ module Pod
               test_native_target.add_dependency(test_resource_bundle_target)
             end
 
-            test_dependent_targets = pod_target.test_dependent_targets_by_spec_name.fetch(test_spec.name, []).unshift(pod_target).uniq
+            test_dependent_targets = pod_target.test_dependent_targets_by_spec_name.fetch(test_spec.name, []).+([pod_target]).uniq
             test_dependent_targets.each do |test_dependent_target|
               is_local = sandbox.local?(test_dependent_target.pod_name)
               if dependency_installation_result = pod_target_installation_results[test_dependent_target.name]
@@ -111,10 +111,52 @@ module Pod
               else
                 # Hit the cache
                 cached_dependency = metadata_cache.target_label_by_metadata[test_dependent_target.label]
-                project.add_cached_pod_subproject(cached_dependency, is_local)
-                Project.add_cached_dependency(test_native_target, cached_dependency)
+                project.add_cached_pod_subproject(sandbox, cached_dependency, is_local)
+                Project.add_cached_dependency(sandbox, test_native_target, cached_dependency)
+              end
+            end
+
+            if app_host_target_label = pod_target.app_host_target_label(test_spec)
+              app_host_pod_target_label, app_host_target_label = *app_host_target_label
+              wire_test_native_target_app_host(test_native_target, pod_target, pod_target_installation_results, project, metadata_cache, app_host_pod_target_label, app_host_target_label)
+            end
+          end
+        end
+
+        def wire_test_native_target_app_host(test_native_target, pod_target, pod_target_installation_results, project, metadata_cache, app_host_pod_target_label, app_host_target_label)
+          if dependency_installation_result = pod_target_installation_results[app_host_pod_target_label]
+            unless app_native_target = dependency_installation_result.app_host_target_labelled(app_host_target_label)
+              raise Informative, "Did not find target with label #{app_host_target_label} in the set of targets installed for #{app_host_pod_target_label}."
+            end
+
+            dependent_test_project = app_native_target.project
+            if dependent_test_project != project
+              project.add_subproject_reference(dependent_test_project, project.dependencies_group)
+            end
+
+            app_host_target_names = app_native_target.resolved_build_setting('PRODUCT_NAME', true)
+            test_native_target.build_configurations.each do |configuration|
+              app_host_target_name = app_host_target_names[configuration.name] || target.name
+              case test_native_target.symbol_type
+              when :unit_test_bundle
+                test_host = "$(BUILT_PRODUCTS_DIR)/#{app_host_target_name}.app/"
+                test_host << 'Contents/MacOS/' if pod_target.platform == :osx
+                test_host << app_host_target_name.to_s
+                configuration.build_settings['BUNDLE_LOADER'] = '$(TEST_HOST)'
+                configuration.build_settings['TEST_HOST'] = test_host
+              when :ui_test_bundle
+                configuration.build_settings['TEST_TARGET_NAME'] = app_host_target_name
               end
             end
+            target_attributes = project.root_object.attributes['TargetAttributes'] || {}
+            target_attributes[test_native_target.uuid.to_s] = { 'TestTargetID' => app_native_target.uuid.to_s }
+            project.root_object.attributes['TargetAttributes'] = target_attributes
+            test_native_target.add_dependency(app_native_target)
+          else
+            # Hit the cache
+            cached_dependency = metadata_cache.target_label_by_metadata[app_host_target_label]
+            project.add_cached_subproject_reference(sandbox, cached_dependency, project.dependencies_group)
+            Project.add_cached_dependency(sandbox, test_native_target, cached_dependency)
           end
         end
 
@@ -144,8 +186,8 @@ module Pod
               else
                 # Hit the cache
                 cached_dependency = metadata_cache.target_label_by_metadata[app_dependent_target.label]
-                project.add_cached_pod_subproject(cached_dependency, is_local)
-                Project.add_cached_dependency(native_target, cached_dependency)
+                project.add_cached_pod_subproject(sandbox, cached_dependency, is_local)
+                Project.add_cached_dependency(sandbox, native_target, cached_dependency)
               end
             end
           end

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

@@ -48,7 +48,7 @@ module Pod
               resource_bundle_targets = add_resources_bundle_targets(library_file_accessors).values.flatten
 
               test_native_targets = add_test_targets
-              test_app_host_targets = add_test_app_host_targets(test_native_targets)
+              test_app_host_targets = add_test_app_host_targets
               test_resource_bundle_targets = add_resources_bundle_targets(test_file_accessors)
 
               app_native_targets = add_app_targets
@@ -72,8 +72,8 @@ module Pod
                     end
 
                     file_accessor.public_headers.map do |public_header|
-                      public_header = if header_mappings_dir
-                                        public_header.relative_path_from(header_mappings_dir)
+                      public_header = if header_mappings_dir(file_accessor)
+                                        public_header.relative_path_from(header_mappings_dir(file_accessor))
                                       else
                                         public_header.basename
                                       end
@@ -88,7 +88,7 @@ module Pod
 
               if target.build_as_framework?
                 unless skip_info_plist?(native_target)
-                  create_info_plist_file(target.info_plist_path, native_target, target.version, target.platform)
+                  create_info_plist_file(target.info_plist_path, native_target, target.version, target.platform, :additional_entries => target.info_plist_entries)
                 end
                 create_build_phase_to_symlink_header_folders(native_target)
               end
@@ -303,7 +303,7 @@ module Pod
 
               header_file_refs = project_file_references_array(headers, 'header')
               native_target.add_file_references(header_file_refs) do |build_file|
-                add_header(build_file, public_headers, private_headers, native_target)
+                add_header(file_accessor, build_file, public_headers, private_headers, native_target)
               end
 
               other_file_refs = project_file_references_array(other_source_files, 'other source')
@@ -331,7 +331,9 @@ module Pod
               name = target.test_target_label(test_spec)
               platform_name = target.platform.name
               language = target.uses_swift_for_spec?(test_spec) ? :swift : :objc
-              test_native_target = project.new_target(product_type, name, platform_name, deployment_target, nil, language)
+              test_native_target = project.new_target(product_type, name, platform_name,
+                                                      target.deployment_target_for_non_library_spec(test_spec), nil,
+                                                      language)
               test_native_target.product_reference.name = name
 
               target.user_build_configurations.each do |bc_name, type|
@@ -372,7 +374,9 @@ module Pod
               # Generate vanilla Info.plist for test target similar to the one Xcode generates for new test target.
               # This creates valid test bundle accessible at the runtime, allowing tests to load bundle resources
               # defined in podspec.
-              create_info_plist_file(target.info_plist_path_for_spec(test_spec), test_native_target, '1.0', target.platform, :bndl)
+              additional_entries = spec_consumer.info_plist
+              path = target.info_plist_path_for_spec(test_spec)
+              create_info_plist_file(path, test_native_target, '1.0', target.platform, :bndl, :additional_entries => additional_entries)
 
               test_native_target
             end
@@ -381,32 +385,17 @@ module Pod
           # Adds the test app host targets for the library to the Pods project with the
           # appropriate build configurations.
           #
-          # @param  [Array<PBXNativeTarget>] test_native_targets
-          #         the test native targets that have been created to use as a lookup when linking the app host to.
-          #
           # @return [Array<PBXNativeTarget>] the app host targets created.
           #
-          def add_test_app_host_targets(test_native_targets)
-            target.test_spec_consumers.select(&:requires_app_host?).group_by(&:test_type).map do |test_type, test_spec_consumers|
-              platform = target.platform
-              name = "AppHost-#{target.label}-#{test_type.capitalize}-Tests"
-              app_host_target = AppHostInstaller.new(sandbox, project, platform, name, target.pod_name, name).install!
-              # Wire test native targets to the generated app host.
-              test_spec_consumers.each do |test_spec_consumer|
-                test_native_target = test_native_target_from_spec(test_spec_consumer.spec, test_native_targets)
-                test_native_target.build_configurations.each do |configuration|
-                  test_host = "$(BUILT_PRODUCTS_DIR)/#{app_host_target.name}.app/"
-                  test_host << 'Contents/MacOS/' if platform == :osx
-                  test_host << app_host_target.name.to_s
-                  configuration.build_settings['TEST_HOST'] = test_host
-                end
-                target_attributes = project.root_object.attributes['TargetAttributes'] || {}
-                target_attributes[test_native_target.uuid.to_s] = { 'TestTargetID' => app_host_target.uuid.to_s }
-                project.root_object.attributes['TargetAttributes'] = target_attributes
-                test_native_target.add_dependency(app_host_target)
-              end
-              app_host_target
+          def add_test_app_host_targets
+            target.test_spec_consumers.reject(&:requires_app_host?).select(&:app_host_name).each do |test_spec_consumer|
+              raise Informative, "`#{target.label}-#{test_spec_consumer.test_type}-Tests` manually specifies an app host but has not specified `requires_app_host = true`."
             end
+
+            target.test_spec_consumers.select(&:requires_app_host?).reject(&:app_host_name).group_by { |consumer| target.app_host_target_label(consumer.spec) }.
+              map do |(_, target_name), _|
+                AppHostInstaller.new(sandbox, project, target.platform, target_name, target.pod_name, target_name).install!
+              end
           end
 
           # Adds the app targets for the library to the Pods project with the
@@ -416,12 +405,15 @@ module Pod
           #
           def add_app_targets
             target.app_specs.map do |app_spec|
+              spec_consumer = app_spec.consumer(target.platform)
               spec_name = app_spec.parent.name
               subspec_name = target.subspec_label(app_spec)
               app_target_label = target.app_target_label(app_spec)
-              platform = target.platform
+              platform = Platform.new(target.platform.symbolic_name, target.deployment_target_for_non_library_spec(app_spec))
+              info_plist_entries = spec_consumer.info_plist
               app_native_target = AppHostInstaller.new(sandbox, project, platform, subspec_name, spec_name,
-                                                       app_target_label, :add_main => false).install!
+                                                       app_target_label, :add_main => false,
+                                                                         :info_plist_entries => info_plist_entries).install!
 
               app_native_target.product_reference.name = app_target_label
               target.user_build_configurations.each do |bc_name, type|
@@ -507,8 +499,11 @@ module Pod
                 target.user_build_configurations.each do |bc_name, type|
                   resource_bundle_target.add_build_configuration(bc_name, type)
                 end
-                resource_bundle_target.deployment_target = deployment_target
-
+                resource_bundle_target.deployment_target = if file_accessor.spec.non_library_specification?
+                                                             target.deployment_target_for_non_library_spec(file_accessor.spec)
+                                                           else
+                                                             deployment_target
+                                                           end
                 # Create Info.plist file for bundle
                 path = target.info_plist_path
                 path.dirname.mkdir unless path.dirname.exist?
@@ -524,6 +519,10 @@ module Pod
                     configuration.build_settings['CONFIGURATION_BUILD_DIR'] = target.configuration_build_dir('$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)')
                   end
 
+                  # Set the 'IBSC_MODULE' build settings for resource bundles so that Storyboards and Xibs can load
+                  # classes from the parent module.
+                  configuration.build_settings['IBSC_MODULE'] = target.product_module_name
+
                   # Set the `SWIFT_VERSION` build setting for resource bundles that could have resources that get
                   # compiled such as an `xcdatamodeld` file which has 'Swift' as its code generation language.
                   if contains_compile_phase_refs && file_accessors.any? { |fa| target.uses_swift_for_spec?(fa.spec) }
@@ -608,16 +607,22 @@ module Pod
           def create_test_target_copy_resources_script(test_spec)
             path = target.copy_resources_script_path_for_spec(test_spec)
             pod_targets = target.dependent_targets_for_test_spec(test_spec)
+            host_target_spec_names = target.app_host_dependent_targets_for_spec(test_spec).flat_map do |pt|
+              pt.specs.map(&:name)
+            end.uniq
             resource_paths_by_config = target.user_build_configurations.keys.each_with_object({}) do |config, resources_by_config|
               resources_by_config[config] = pod_targets.flat_map do |pod_target|
                 spec_paths_to_include = pod_target.library_specs.map(&:name)
+                spec_paths_to_include -= host_target_spec_names
                 spec_paths_to_include << test_spec.name if pod_target == target
                 pod_target.resource_paths.values_at(*spec_paths_to_include).flatten.compact
               end
             end
-            generator = Generator::CopyResourcesScript.new(resource_paths_by_config, target.platform)
-            update_changed_file(generator, path)
-            add_file_to_support_group(path)
+            unless resource_paths_by_config.each_value.all?(&:empty?)
+              generator = Generator::CopyResourcesScript.new(resource_paths_by_config, target.platform)
+              update_changed_file(generator, path)
+              add_file_to_support_group(path)
+            end
           end
 
           # Creates a script that embeds the frameworks to the bundle of the test target.
@@ -630,16 +635,22 @@ module Pod
           def create_test_target_embed_frameworks_script(test_spec)
             path = target.embed_frameworks_script_path_for_spec(test_spec)
             pod_targets = target.dependent_targets_for_test_spec(test_spec)
+            host_target_spec_names = target.app_host_dependent_targets_for_spec(test_spec).flat_map do |pt|
+              pt.specs.map(&:name)
+            end.uniq
             framework_paths_by_config = target.user_build_configurations.keys.each_with_object({}) do |config, paths_by_config|
               paths_by_config[config] = pod_targets.flat_map do |pod_target|
                 spec_paths_to_include = pod_target.library_specs.map(&:name)
+                spec_paths_to_include -= host_target_spec_names
                 spec_paths_to_include << test_spec.name if pod_target == target
                 pod_target.framework_paths.values_at(*spec_paths_to_include).flatten.compact.uniq
               end
             end
-            generator = Generator::EmbedFrameworksScript.new(framework_paths_by_config)
-            update_changed_file(generator, path)
-            add_file_to_support_group(path)
+            unless framework_paths_by_config.each_value.all?(&:empty?)
+              generator = Generator::EmbedFrameworksScript.new(framework_paths_by_config)
+              update_changed_file(generator, path)
+              add_file_to_support_group(path)
+            end
           end
 
           # Generates the contents of the xcconfig file used for each app target type and saves it to disk.
@@ -684,9 +695,11 @@ module Pod
                 pod_target.resource_paths.values_at(*spec_paths_to_include).flatten.compact
               end
             end
-            generator = Generator::CopyResourcesScript.new(resource_paths_by_config, target.platform)
-            update_changed_file(generator, path)
-            add_file_to_support_group(path)
+            unless resource_paths_by_config.each_value.all?(&:empty?)
+              generator = Generator::CopyResourcesScript.new(resource_paths_by_config, target.platform)
+              update_changed_file(generator, path)
+              add_file_to_support_group(path)
+            end
           end
 
           # Creates a script that embeds the frameworks to the bundle of the app target.
@@ -706,9 +719,11 @@ module Pod
                 pod_target.framework_paths.values_at(*spec_paths_to_include).flatten.compact.uniq
               end
             end
-            generator = Generator::EmbedFrameworksScript.new(framework_paths_by_config)
-            update_changed_file(generator, path)
-            add_file_to_support_group(path)
+            unless framework_paths_by_config.each_value.all?(&:empty?)
+              generator = Generator::EmbedFrameworksScript.new(framework_paths_by_config)
+              update_changed_file(generator, path)
+              add_file_to_support_group(path)
+            end
           end
 
           # Manually add `libswiftSwiftOnoneSupport.dylib` as it seems there is an issue with tests that do not include it for Debug configurations.
@@ -736,13 +751,21 @@ module Pod
           # @return [void]
           #
           def create_build_phase_to_symlink_header_folders(native_target)
-            return unless target.platform.name == :osx && header_mappings_dir
+            return unless target.platform.name == :osx && any_header_mapping_dirs?
 
             build_phase = native_target.new_shell_script_build_phase('Create Symlinks to Header Folders')
             build_phase.shell_script = <<-eos.strip_heredoc
-          base="$CONFIGURATION_BUILD_DIR/$WRAPPER_NAME"
-          ln -fs "$base/${PUBLIC_HEADERS_FOLDER_PATH\#$WRAPPER_NAME/}" "$base/${PUBLIC_HEADERS_FOLDER_PATH\#\$CONTENTS_FOLDER_PATH/}"
-          ln -fs "$base/${PRIVATE_HEADERS_FOLDER_PATH\#\$WRAPPER_NAME/}" "$base/${PRIVATE_HEADERS_FOLDER_PATH\#\$CONTENTS_FOLDER_PATH/}"
+              cd "$CONFIGURATION_BUILD_DIR/$WRAPPER_NAME" || exit 1
+
+              public_path="${PUBLIC_HEADERS_FOLDER_PATH\#\$CONTENTS_FOLDER_PATH/}"
+              if [ ! -f "$public_path" ]; then
+                ln -fs "${PUBLIC_HEADERS_FOLDER_PATH\#$WRAPPER_NAME/}" "$public_path"
+              fi
+
+              private_path="${PRIVATE_HEADERS_FOLDER_PATH\#\$CONTENTS_FOLDER_PATH/}"
+              if [ ! -f "$private_path" ]; then
+                ln -fs "${PRIVATE_HEADERS_FOLDER_PATH\#\$WRAPPER_NAME/}" "$private_path"
+              fi
             eos
           end
 
@@ -868,20 +891,25 @@ module Pod
           def project_file_references_array(files, file_type)
             files.map do |sf|
               project.reference_for_path(sf).tap do |ref|
-                raise Informative, "Unable to find #{file_type} ref for #{sf} for target #{target.name}." unless ref
+                raise Informative, "Unable to find #{file_type} ref for `#{sf.basename}` for target `#{target.name}`." unless ref
               end
             end
           end
 
-          def header_mappings_dir
-            return @header_mappings_dir if defined?(@header_mappings_dir)
-            file_accessor = target.file_accessors.first
-            @header_mappings_dir = if dir = file_accessor.spec_consumer.header_mappings_dir
-                                     file_accessor.path_list.root + dir
-                                   end
+          def any_header_mapping_dirs?
+            return @any_header_mapping_dirs if defined?(@any_header_mapping_dirs)
+            @any_header_mapping_dirs = target.file_accessors.any? { |fa| fa.spec_consumer.header_mappings_dir }
+          end
+
+          def header_mappings_dir(file_accessor)
+            @header_mappings_dirs ||= {}
+            return @header_mappings_dirs[file_accessor] if @header_mappings_dirs.key?(file_accessor)
+            @header_mappings_dirs[file_accessor] = if dir = file_accessor.spec_consumer.header_mappings_dir
+                                                     file_accessor.path_list.root + dir
+                                                   end
           end
 
-          def add_header(build_file, public_headers, private_headers, native_target)
+          def add_header(file_accessor, build_file, public_headers, private_headers, native_target)
             file_ref = build_file.file_ref
             acl = if !target.build_as_framework? # Headers are already rooted at ${PODS_ROOT}/Headers/P*/[pod]/...
                     'Project'
@@ -893,8 +921,12 @@ module Pod
                     'Project'
                   end
 
-            if target.build_as_framework? && header_mappings_dir && acl != 'Project'
-              relative_path = file_ref.real_path.relative_path_from(header_mappings_dir)
+            if target.build_as_framework? && any_header_mapping_dirs? && acl != 'Project'
+              relative_path = if mapping_dir = header_mappings_dir(file_accessor)
+                                file_ref.real_path.relative_path_from(mapping_dir)
+                              else
+                                file_ref.real_path.relative_path_from(file_accessor.path_list.root)
+                              end
               sub_dir = relative_path.dirname
               copy_phase_name = "Copy #{sub_dir} #{acl} Headers"
               copy_phase = native_target.copy_files_build_phases.find { |bp| bp.name == copy_phase_name } ||