cocoapods 1.8.4 → 1.9.0.beta.1

data/lib/cocoapods/installer/project_cache/project_cache_analyzer.rb

@@ -22,6 +22,10 @@ module Pod
         #
         attr_reader :project_object_version
 
+        # @return [Hash<String, Hash>] The podfile plugins to be run for the installation.
+        #
+        attr_reader :podfile_plugins
+
         # @return [Array<PodTarget>] The list of pod targets.
         #
         attr_reader :pod_targets
@@ -40,15 +44,17 @@ module Pod
         # @param [ProjectInstallationCache] cache @see #cache
         # @param [Hash{String => Symbol}] build_configurations @see #build_configurations
         # @param [Integer] project_object_version @see #project_object_version
+        # @param [Hash<String, Hash>] podfile_plugins @see #podfile_plugins
         # @param [Array<PodTarget>] pod_targets @see #pod_targets
         # @param [Array<AggregateTarget>] aggregate_targets @see #aggregate_targets
         # @param [Bool] clean_install @see #clean_install
         #
-        def initialize(sandbox, cache, build_configurations, project_object_version, pod_targets, aggregate_targets,
+        def initialize(sandbox, cache, build_configurations, project_object_version, podfile_plugins, pod_targets, aggregate_targets,
                        clean_install: false)
           @sandbox = sandbox
           @cache = cache
           @build_configurations = build_configurations
+          @podfile_plugins = podfile_plugins
           @pod_targets = pod_targets
           @aggregate_targets = aggregate_targets
           @project_object_version = project_object_version
@@ -70,7 +76,9 @@ module Pod
           end
 
           # Bail out early since these properties affect all targets and their associate projects.
-          if cache.build_configurations != build_configurations || cache.project_object_version != project_object_version
+          if cache.build_configurations != build_configurations ||
+              cache.project_object_version != project_object_version ||
+              YAMLHelper.convert(cache.podfile_plugins) != YAMLHelper.convert(podfile_plugins)
             UI.message 'Ignoring project cache due to project configuration changes.'
             return full_install_results
           end

data/lib/cocoapods/installer/project_cache/project_installation_cache.rb

@@ -21,16 +21,23 @@ module Pod
         #
         attr_reader :project_object_version
 
+        # @return [Hash<String, Hash>]
+        #         Podfile plugins used with a particular install.
+        #
+        attr_reader :podfile_plugins
+
         # Initializes a new instance.
         #
         # @param [Hash{String => TargetCacheKey}] cache_key_by_target_label @see #cache_key_by_target_label
         # @param [Hash{String => Symbol}] build_configurations @see #build_configurations
         # @param [Integer] project_object_version @see #project_object_version
+        # @param [Hash<String, Hash>] podfile_plugins @see #podfile_plugins
         #
-        def initialize(cache_key_by_target_label = {}, build_configurations = nil, project_object_version = nil)
+        def initialize(cache_key_by_target_label = {}, build_configurations = nil, project_object_version = nil, podfile_plugins = {})
           @cache_key_by_target_label = cache_key_by_target_label
           @build_configurations = build_configurations
           @project_object_version = project_object_version
+          @podfile_plugins = podfile_plugins
         end
 
         def update_cache_key_by_target_label!(cache_key_by_target_label)
@@ -45,6 +52,10 @@ module Pod
           @project_object_version = project_object_version
         end
 
+        def update_podfile_plugins!(podfile_plugins)
+          @podfile_plugins = podfile_plugins
+        end
+
         def save_as(path)
           Pathname(path).dirname.mkpath
           Sandbox.update_changed_file(path, YAMLHelper.convert(to_hash))
@@ -59,7 +70,8 @@ module Pod
           end]
           project_object_version = contents['OBJECT_VERSION']
           build_configurations = contents['BUILD_CONFIGURATIONS']
-          ProjectInstallationCache.new(cache_key_by_target_label, build_configurations, project_object_version)
+          podfile_plugins = contents['PLUGINS']
+          ProjectInstallationCache.new(cache_key_by_target_label, build_configurations, project_object_version, podfile_plugins)
         end
 
         def to_hash
@@ -69,6 +81,7 @@ module Pod
           contents = { 'CACHE_KEYS' => cache_key_contents }
           contents['BUILD_CONFIGURATIONS'] = build_configurations if build_configurations
           contents['OBJECT_VERSION'] = project_object_version if project_object_version
+          contents['PLUGINS'] = podfile_plugins if podfile_plugins
           contents
         end
       end

data/lib/cocoapods/installer/project_cache/target_cache_key.rb

@@ -116,12 +116,14 @@ module Pod
         #
         def self.from_pod_target(sandbox, pod_target, is_local_pod: false, checkout_options: nil)
           build_settings = {}
-          build_settings[pod_target.label.to_s] = Digest::MD5.hexdigest(pod_target.build_settings.xcconfig.to_s)
-          pod_target.test_spec_build_settings.each do |name, settings|
-            build_settings[name] = Digest::MD5.hexdigest(settings.xcconfig.to_s)
+          build_settings[pod_target.label.to_s] = Hash[pod_target.build_settings.map do |k, v|
+            [k, Digest::MD5.hexdigest(v.xcconfig.to_s)]
+          end]
+          pod_target.test_spec_build_settings_by_config.each do |name, settings_by_config|
+            build_settings[name] = Hash[settings_by_config.map { |k, v| [k, Digest::MD5.hexdigest(v.xcconfig.to_s)] }]
           end
-          pod_target.app_spec_build_settings.each do |name, settings|
-            build_settings[name] = Digest::MD5.hexdigest(settings.xcconfig.to_s)
+          pod_target.app_spec_build_settings_by_config.each do |name, settings_by_config|
+            build_settings[name] = Hash[settings_by_config.map { |k, v| [k, Digest::MD5.hexdigest(v.xcconfig.to_s)] }]
           end
 
           contents = {

data/lib/cocoapods/installer/user_project_integrator.rb

@@ -92,7 +92,7 @@ module Pod
       # @return [void]
       #
       def create_workspace
-        all_projects = user_project_paths_to_integrate.sort.push(sandbox.project_path).uniq
+        all_projects = user_project_paths.sort.push(sandbox.project_path).uniq
         file_references = all_projects.map do |path|
           relative_path = path.relative_path_from(workspace_path.dirname).to_s
           Xcodeproj::Workspace::FileReference.new(relative_path, 'group')
@@ -221,15 +221,6 @@ module Pod
         end
       end
 
-      # @return [Array<Pathname>] the paths of all the user projects referenced
-      #         by the targets that require integration.
-      #
-      # @note   Empty target definitions are ignored.
-      #
-      def user_project_paths_to_integrate
-        targets_to_integrate.map(&:user_project_path).compact.uniq
-      end
-
       # @return [Array<Xcodeproj::Project>] the projects of all the targets that require integration.
       #
       # @note   Empty target definitions are ignored.

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

@@ -1,5 +1,5 @@
 require 'active_support/core_ext/string/inflections'
-require 'cocoapods/target/framework_paths'
+require 'cocoapods/xcode/framework_paths'
 
 module Pod
   class Installer
@@ -37,6 +37,10 @@ module Pod
         #
         EMBED_FRAMEWORK_PHASE_NAME = 'Embed Pods Frameworks'.freeze
 
+        # @return [String] the name of the embed frameworks phase
+        #
+        PREPARE_ARTIFACTS_PHASE_NAME = 'Prepare Artifacts'.freeze
+
         # @return [String] the name of the copy resources phase
         #
         COPY_PODS_RESOURCES_PHASE_NAME = 'Copy Pods Resources'.freeze
@@ -45,6 +49,10 @@ module Pod
         #
         MAX_INPUT_OUTPUT_PATHS = 1000
 
+        # @return [String] the path to the artifact lists file used in the prepare & embed scripts
+        #
+        ARTIFACT_LIST_FILE = '${BUILT_PRODUCTS_DIR}/cocoapods-artifacts-${CONFIGURATION}.txt'.freeze
+
         # @return [AggregateTarget] the target that should be integrated.
         #
         attr_reader :target
@@ -135,15 +143,52 @@ module Pod
             TargetIntegrator.set_input_output_paths(phase, input_paths_by_config, output_paths_by_config)
           end
 
+          # Adds a shell script build phase responsible to copy xcframeworks slices
+          # generated by the TargetDefinition to the build directory.
+          #
+          # @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 [Hash<Array, String>] input_paths_by_config
+          #        The input paths (if any) to include for this script phase.
+          #
+          # @param [Hash<Array, String>] output_paths_by_config
+          #        The output paths (if any) to include for this script phase.
+          #
+          # @return [void]
+          #
+          def create_or_update_prepare_artifacts_script_phase_to_target(native_target, script_path, input_paths_by_config = {}, output_paths_by_config = {})
+            phase = TargetIntegrator.create_or_update_shell_script_build_phase(native_target, BUILD_PHASE_PREFIX + PREPARE_ARTIFACTS_PHASE_NAME)
+            phase.shell_script = %("#{script_path}"\n)
+            reorder_script_phase(native_target, phase, :before_compile)
+            TargetIntegrator.set_input_output_paths(phase, input_paths_by_config, output_paths_by_config)
+          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)
+            remove_script_phase_from_target(native_target, EMBED_FRAMEWORK_PHASE_NAME)
+          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_prepare_artifacts_script_phase_from_target(native_target)
+            remove_script_phase_from_target(native_target, PREPARE_ARTIFACTS_PHASE_NAME)
+          end
+
+          def remove_script_phase_from_target(native_target, phase_name)
+            build_phase = native_target.shell_script_build_phases.find { |bp| bp.name && bp.name.end_with?(phase_name) }
+            return unless build_phase.present?
+            native_target.build_phases.delete(build_phase)
           end
 
           # Adds a shell script build phase responsible to copy the resources
@@ -235,6 +280,7 @@ module Pod
               phase.output_paths = script_phase[:output_files]
               phase.input_file_list_paths = script_phase[:input_file_lists]
               phase.output_file_list_paths = script_phase[:output_file_lists]
+              phase.dependency_file = script_phase[:dependency_file]
               # At least with Xcode 10 `showEnvVarsInLog` is *NOT* set to any value even if it's checked and it only
               # gets set to '0' if the user has explicitly disabled this.
               if (show_env_vars_in_log = script_phase.fetch(:show_env_vars_in_log, '1')) == '0'
@@ -242,19 +288,22 @@ module Pod
               end
 
               execution_position = 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
+              reorder_script_phase(native_target, phase, execution_position)
+            end
+          end
+
+          def reorder_script_phase(native_target, script_phase, execution_position)
+            return if 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 == script_phase.name
+              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
@@ -318,7 +367,7 @@ module Pod
 
           # Returns the framework output paths for the given input paths
           #
-          # @param  [Array<Target::FrameworkPaths>] framework_input_paths
+          # @param  [Array<Xcode::FrameworkPaths>] framework_input_paths
           #         The framework input paths to map to output paths.
           #
           # @return [Array<String>] The framework output paths
@@ -351,6 +400,7 @@ module Pod
 
             add_pods_library
             add_embed_frameworks_script_phase
+            add_prepare_artifacts_script_phase
             remove_embed_frameworks_script_phase_from_embedded_targets
             add_copy_resources_script_phase
             add_check_manifest_lock_script_phase
@@ -454,7 +504,7 @@ module Pod
         # @return [void]
         #
         def add_embed_frameworks_script_phase
-          unless target.includes_frameworks?
+          unless target.includes_frameworks? || target.includes_xcframeworks?
             native_targets_to_embed_in.each do |native_target|
               TargetIntegrator.remove_embed_frameworks_script_phase_from_target(native_target)
             end
@@ -468,6 +518,7 @@ module Pod
             target.framework_paths_by_config.each do |config, framework_paths|
               input_paths_key = XCFileListConfigKey.new(target.embed_frameworks_script_input_files_path(config), target.embed_frameworks_script_input_files_relative_path)
               input_paths = input_paths_by_config[input_paths_key] = [script_path]
+              input_paths << ARTIFACT_LIST_FILE if target.includes_xcframeworks?
               framework_paths.each do |path|
                 input_paths.concat(path.all_paths)
               end
@@ -482,6 +533,36 @@ module Pod
           end
         end
 
+        # Find or create a 'Prepare Artifacts' Copy Files Build Phase
+        #
+        # @return [void]
+        #
+        def add_prepare_artifacts_script_phase
+          unless target.includes_xcframeworks?
+            native_targets_to_embed_in.each do |native_target|
+              TargetIntegrator.remove_prepare_artifacts_script_phase_from_target(native_target)
+            end
+            return
+          end
+
+          script_path = target.prepare_artifacts_script_relative_path
+          input_paths_by_config = {}
+          output_paths_by_config = {}
+          if use_input_output_paths?
+            target.xcframeworks_by_config.each do |config, xcframeworks|
+              input_paths_key = XCFileListConfigKey.new(target.prepare_artifacts_script_input_files_path(config), target.prepare_artifacts_script_input_files_relative_path)
+              input_paths = input_paths_by_config[input_paths_key] = [script_path]
+              input_paths.concat(xcframeworks.map { |xcf| "${PODS_ROOT}/#{xcf.path.relative_path_from(target.sandbox.root)}" })
+
+              output_paths_key = XCFileListConfigKey.new(target.prepare_artifacts_script_output_files_path(config), target.prepare_artifacts_script_output_files_relative_path)
+              output_paths_by_config[output_paths_key] = [ARTIFACT_LIST_FILE]
+            end
+          end
+          native_targets_to_embed_in.each do |native_target|
+            TargetIntegrator.create_or_update_prepare_artifacts_script_phase_to_target(native_target, script_path, input_paths_by_config, output_paths_by_config)
+          end
+        end
+
         # Updates all target script phases for the current target, including creating or updating, deleting
         # and re-ordering.
         #

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

@@ -238,6 +238,9 @@ module Pod
                 environment_variables.assign_variable(:key => k, :value => v)
               end
               scheme.launch_action.environment_variables = environment_variables
+              if scheme_configuration.key?(:code_coverage)
+                scheme.test_action.code_coverage_enabled = scheme_configuration[:code_coverage]
+              end
               scheme.save!
             end
             Xcodeproj::XCScheme.share_scheme(project.path, scheme_name) if share_scheme

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

@@ -16,7 +16,7 @@ module Pod
               create_support_files_dir
               create_support_files_group
               create_xcconfig_file(native_target)
-              if target.host_requires_frameworks?
+              if target.build_as_framework?
                 create_info_plist_file(target.info_plist_path, native_target, target.version, target.platform)
                 create_module_map(native_target)
                 create_umbrella_header(native_target)
@@ -30,7 +30,8 @@ module Pod
               # cause an App Store rejection because frameworks cannot be
               # embedded in embedded targets.
               #
-              create_embed_frameworks_script if target.includes_frameworks? && !target.requires_host_target?
+              create_embed_frameworks_script if (target.includes_frameworks? || target.includes_xcframeworks?) && !target.requires_host_target?
+              create_prepare_artifacts_script if target.includes_xcframeworks? && !target.requires_host_target?
               create_bridge_support_file(native_target)
               create_copy_resources_script if target.includes_resources?
               create_acknowledgements
@@ -145,8 +146,8 @@ module Pod
           # Creates a script that embeds the frameworks to the bundle of the client
           # target.
           #
-          # @note   We can't use Xcode default copy bundle resource phase, because
-          #         we need to ensure that we only copy the resources, which are
+          # @note   We can't use Xcode default link libraries phase, because
+          #         we need to ensure that we only copy the frameworks which are
           #         relevant for the current build configuration.
           #
           # @return [void]
@@ -158,6 +159,30 @@ module Pod
             add_file_to_support_group(path)
           end
 
+          # Creates a script that prepares artifacts for embedding into a host target.
+          #
+          # @note   We can't use Xcode default link libraries phase, because
+          #         we need to ensure that we only copy the frameworks which are
+          #         relevant for the current build configuration.
+          #
+          # @return [void]
+          #
+          def create_prepare_artifacts_script
+            path = target.prepare_artifacts_script_path
+            generator = Generator::PrepareArtifactsScript.new(target.xcframeworks_by_config, sandbox.root, target.platform)
+            update_changed_file(generator, path)
+            add_file_to_support_group(path)
+
+            target.user_build_configurations.each_key do |config|
+              if (input_file_list = target.prepare_artifacts_script_input_files_path(config))
+                add_file_to_support_group(input_file_list)
+              end
+              if (output_file_list = target.prepare_artifacts_script_output_files_path(config))
+                add_file_to_support_group(output_file_list)
+              end
+            end
+          end
+
           # Generates the acknowledgement files (markdown and plist) for the target.
           #
           # @return [void]

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

@@ -37,6 +37,10 @@ module Pod
           #
           attr_reader :add_main
 
+          # @return [Boolean] whether the app host installer should add a launch screen storyboard
+          #
+          attr_reader :add_launchscreen_storyboard
+
           # @return [Hash] Info.plist entries for the app host
           #
           attr_reader :info_plist_entries
@@ -52,7 +56,7 @@ module Pod
           # @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, info_plist_entries: {})
+          def initialize(sandbox, project, platform, subgroup_name, group_name, app_target_label, add_main: true, add_launchscreen_storyboard: platform == :ios, info_plist_entries: {})
             @sandbox = sandbox
             @project = project
             @platform = platform
@@ -60,6 +64,7 @@ module Pod
             @group_name = group_name
             @app_target_label = app_target_label
             @add_main = add_main
+            @add_launchscreen_storyboard = add_launchscreen_storyboard
             @info_plist_entries = info_plist_entries
             target_group = project.pod_group(group_name)
             @group = target_group[subgroup_name] || target_group.new_group(subgroup_name)
@@ -79,7 +84,7 @@ module Pod
             end
 
             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
+            Pod::Generator::AppTargetHelper.add_launchscreen_storyboard(project, app_host_target, @group, deployment_target, app_target_label) if add_launchscreen_storyboard
             create_info_plist_file_with_sandbox(sandbox, app_host_info_plist_path, app_host_target, '1.0.0', platform,
                                                 :appl, :additional_entries => additional_info_plist_entries)
             @group.new_file(app_host_info_plist_path)

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

@@ -1,3 +1,5 @@
+require 'cocoapods/xcode'
+
 module Pod
   class Installer
     class Xcode
@@ -56,6 +58,7 @@ module Pod
 
               add_files_to_build_phases(native_target, test_native_targets, app_native_targets)
               validate_targets_contain_sources(test_native_targets + app_native_targets + [native_target])
+              validate_xcframeworks_no_mixed_linkage
 
               create_xcconfig_file(native_target, resource_bundle_targets)
               create_test_xcconfig_files(test_native_targets, test_resource_bundle_targets)
@@ -69,7 +72,7 @@ module Pod
                   generator.imports += library_file_accessors.flat_map do |file_accessor|
                     header_dir = if !target.build_as_framework? && dir = file_accessor.spec_consumer.header_dir
                                    Pathname.new(dir)
-                    end
+                                 end
 
                     file_accessor.public_headers.map do |public_header|
                       public_header = if header_mappings_dir(file_accessor)
@@ -148,14 +151,18 @@ module Pod
           # Removes overrides of the `pod_target_xcconfig` settings from the target's
           # build configurations.
           #
-          # @return [Void]
-          #
-          # @param [Target::BuildSettings] build_settings
+          # @param [Hash{Symbol => Pod::Target::BuildSettings}] build_settings_by_config the build settings by config
+          #        of the target.
           #
           # @param [PBXNativeTarget] native_target
+          #        the native target to remove pod target xcconfig overrides from.
+          #
+          # @return [Void]
           #
-          def remove_pod_target_xcconfig_overrides_from_target(build_settings, native_target)
+          #
+          def remove_pod_target_xcconfig_overrides_from_target(build_settings_by_config, native_target)
             native_target.build_configurations.each do |configuration|
+              build_settings = build_settings_by_config[target.user_build_configurations[configuration.name]]
               build_settings.merged_pod_target_xcconfigs.each_key do |setting|
                 configuration.build_settings.delete(setting)
               end
@@ -365,9 +372,10 @@ module Pod
                 configuration.build_settings['CODE_SIGN_IDENTITY'] = '' if target.platform == :osx
               end
 
-              remove_pod_target_xcconfig_overrides_from_target(target.build_settings_for_spec(test_spec), test_native_target)
+              remove_pod_target_xcconfig_overrides_from_target(target.test_spec_build_settings_by_config[test_spec.name], test_native_target)
 
               # Test native targets also need frameworks and resources to be copied over to their xctest bundle.
+              create_test_target_prepare_artifacts_script(test_spec)
               create_test_target_embed_frameworks_script(test_spec)
               create_test_target_copy_resources_script(test_spec)
 
@@ -411,8 +419,11 @@ module Pod
               app_target_label = target.app_target_label(app_spec)
               platform = Platform.new(target.platform.symbolic_name, target.deployment_target_for_non_library_spec(app_spec))
               info_plist_entries = spec_consumer.info_plist
+              resources = target.file_accessors.find { |fa| fa.spec == app_spec }.resources
+              add_launchscreen_storyboard = resources.none? { |resource| resource.basename.to_s == 'LaunchScreen.storyboard' } && platform.name == :ios
               app_native_target = AppHostInstaller.new(sandbox, project, platform, subspec_name, spec_name,
                                                        app_target_label, :add_main => false,
+                                                                         :add_launchscreen_storyboard => add_launchscreen_storyboard,
                                                                          :info_plist_entries => info_plist_entries).install!
 
               app_native_target.product_reference.name = app_target_label
@@ -454,11 +465,11 @@ module Pod
                 end
               end
 
-              remove_pod_target_xcconfig_overrides_from_target(target.build_settings_for_spec(app_spec), app_native_target)
+              remove_pod_target_xcconfig_overrides_from_target(target.app_spec_build_settings_by_config[app_spec.name], app_native_target)
 
               create_app_target_embed_frameworks_script(app_spec)
               create_app_target_copy_resources_script(app_spec)
-              add_resources_to_target(target.file_accessors.find { |fa| fa.spec == app_spec }.resources, app_native_target)
+              add_resources_to_target(resources, app_native_target)
 
               app_native_target
             end
@@ -489,7 +500,7 @@ module Pod
           # @param  [Array<Sandbox::FileAccessor>] file_accessors
           #         the file accessors list to generate resource bundles for.
           #
-          # @return [Array<PBXNativeTarget>] the resource bundle native targets created.
+          # @return [Hash{String=>Array<PBXNativeTarget>}] the resource bundle native targets created.
           #
           def add_resources_bundle_targets(file_accessors)
             file_accessors.each_with_object({}) do |file_accessor, hash|
@@ -548,7 +559,7 @@ module Pod
                   end
                 end
 
-                remove_pod_target_xcconfig_overrides_from_target(target.build_settings_for_spec(file_accessor.spec), resource_bundle_target)
+                remove_pod_target_xcconfig_overrides_from_target(target.build_settings_by_config_for_spec(file_accessor.spec), resource_bundle_target)
 
                 resource_bundle_target
               end
@@ -566,12 +577,14 @@ module Pod
           # @return [void]
           #
           def create_xcconfig_file(native_target, resource_bundle_targets)
-            path = target.xcconfig_path
-            update_changed_file(target.build_settings, path)
-            xcconfig_file_ref = add_file_to_support_group(path)
+            target.user_config_names_by_config_type.each do |config, names|
+              path = target.xcconfig_path(config)
+              update_changed_file(target.build_settings[config], path)
+              xcconfig_file_ref = add_file_to_support_group(path)
 
-            # also apply the private config to resource bundle targets.
-            apply_xcconfig_file_ref_to_targets([native_target] + resource_bundle_targets, xcconfig_file_ref)
+              # also apply the private config to resource bundle targets.
+              apply_xcconfig_file_ref_to_targets([native_target] + resource_bundle_targets, xcconfig_file_ref, names)
+            end
           end
 
           # Generates the contents of the xcconfig file used for each test target type and saves it to disk.
@@ -588,19 +601,22 @@ module Pod
             target.test_specs.each do |test_spec|
               spec_consumer = test_spec.consumer(target.platform)
               test_type = spec_consumer.test_type
-              path = target.xcconfig_path("#{test_type.capitalize}-#{target.subspec_label(test_spec)}")
-              test_spec_build_settings = target.build_settings_for_spec(test_spec)
-              update_changed_file(test_spec_build_settings, path)
-              test_xcconfig_file_ref = add_file_to_support_group(path)
-
               test_native_target = test_native_target_from_spec(spec_consumer.spec, test_native_targets)
+
+              target.user_config_names_by_config_type.each do |config, names|
+                path = target.xcconfig_path("#{test_type.capitalize}-#{target.subspec_label(test_spec)}.#{config}")
+                test_spec_build_settings = target.build_settings_for_spec(test_spec, :configuration => config)
+                update_changed_file(test_spec_build_settings, path)
+                test_xcconfig_file_ref = add_file_to_support_group(path)
+
+                # also apply the private config to resource bundle test targets related to this test spec.
+                scoped_test_resource_bundle_targets = test_resource_bundle_targets[test_spec.name]
+                apply_xcconfig_file_ref_to_targets([test_native_target] + scoped_test_resource_bundle_targets, test_xcconfig_file_ref, names)
+              end
+
               test_native_target.build_configurations.each do |test_native_target_bc|
                 test_target_swift_debug_hack(test_spec, test_native_target_bc)
               end
-
-              # also apply the private config to resource bundle test targets related to this test spec.
-              scoped_test_resource_bundle_targets = test_resource_bundle_targets[test_spec.name]
-              apply_xcconfig_file_ref_to_targets([test_native_target] + scoped_test_resource_bundle_targets, test_xcconfig_file_ref)
             end
           end
 
@@ -613,12 +629,11 @@ 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|
+            resource_paths_by_config = target.user_build_configurations.each_with_object({}) do |(config_name, config), resources_by_config|
+              resources_by_config[config_name] = target.dependent_targets_for_test_spec(test_spec, :configuration => config).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
@@ -632,6 +647,33 @@ module Pod
             end
           end
 
+          # Creates a script that prepares artifacts for the test target.
+          #
+          # @param [Specification] test_spec
+          #        The test spec to create the script for.
+          #
+          # @return [void]
+          #
+          def create_test_target_prepare_artifacts_script(test_spec)
+            path = target.prepare_artifacts_script_path_for_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
+            frameworks_by_config = target.user_build_configurations.each_with_object({}) do |(config_name, config), paths_by_config|
+              paths_by_config[config_name] = target.dependent_targets_for_test_spec(test_spec, :configuration => config).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.xcframeworks.values_at(*spec_paths_to_include).flatten.compact.uniq
+              end
+            end
+            unless frameworks_by_config.each_value.all?(&:empty?)
+              generator = Generator::PrepareArtifactsScript.new(frameworks_by_config, target.sandbox.root, 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.
           #
           # @param [Specification] test_spec
@@ -641,12 +683,11 @@ 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|
+            framework_paths_by_config = target.user_build_configurations.each_with_object({}) do |(config_name, config), paths_by_config|
+              paths_by_config[config_name] = target.dependent_targets_for_test_spec(test_spec, :configuration => config).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
@@ -673,15 +714,18 @@ module Pod
           def create_app_xcconfig_files(app_native_targets, app_resource_bundle_targets)
             target.app_specs.each do |app_spec|
               spec_consumer = app_spec.consumer(target.platform)
-              path = target.xcconfig_path(target.subspec_label(app_spec))
-              update_changed_file(target.build_settings_for_spec(app_spec), path)
-              app_xcconfig_file_ref = add_file_to_support_group(path)
-
               app_native_target = app_native_target_from_spec(spec_consumer.spec, app_native_targets)
 
-              # also apply the private config to resource bundle app targets related to this app spec.
-              scoped_app_resource_bundle_targets = app_resource_bundle_targets[app_spec.name]
-              apply_xcconfig_file_ref_to_targets([app_native_target] + scoped_app_resource_bundle_targets, app_xcconfig_file_ref)
+              target.user_config_names_by_config_type.each do |config, names|
+                path = target.xcconfig_path("#{target.subspec_label(app_spec)}.#{config}")
+                app_spec_build_settings = target.build_settings_for_spec(app_spec, :configuration => config)
+                update_changed_file(app_spec_build_settings, path)
+                app_xcconfig_file_ref = add_file_to_support_group(path)
+
+                # also apply the private config to resource bundle app targets related to this app spec.
+                scoped_app_resource_bundle_targets = app_resource_bundle_targets[app_spec.name]
+                apply_xcconfig_file_ref_to_targets([app_native_target] + scoped_app_resource_bundle_targets, app_xcconfig_file_ref, names)
+              end
             end
           end
 
@@ -694,9 +738,9 @@ module Pod
           #
           def create_app_target_copy_resources_script(app_spec)
             path = target.copy_resources_script_path_for_spec(app_spec)
-            pod_targets = target.dependent_targets_for_app_spec(app_spec)
-            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|
+            resource_paths_by_config = target.user_build_configurations.each_with_object({}) do |(config_name, config), resources_by_config|
+              pod_targets = target.dependent_targets_for_app_spec(app_spec, :configuration => config)
+              resources_by_config[config_name] = pod_targets.flat_map do |pod_target|
                 spec_paths_to_include = pod_target.library_specs.map(&:name)
                 spec_paths_to_include << app_spec.name if pod_target == target
                 pod_target.resource_paths.values_at(*spec_paths_to_include).flatten.compact
@@ -718,9 +762,9 @@ module Pod
           #
           def create_app_target_embed_frameworks_script(app_spec)
             path = target.embed_frameworks_script_path_for_spec(app_spec)
-            pod_targets = target.dependent_targets_for_app_spec(app_spec)
-            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|
+            framework_paths_by_config = target.user_build_configurations.each_with_object({}) do |(config_name, config), paths_by_config|
+              pod_targets = target.dependent_targets_for_app_spec(app_spec, :configuration => config)
+              paths_by_config[config_name] = pod_targets.flat_map do |pod_target|
                 spec_paths_to_include = pod_target.library_specs.map(&:name)
                 spec_paths_to_include << app_spec.name if pod_target == target
                 pod_target.framework_paths.values_at(*spec_paths_to_include).flatten.compact.uniq
@@ -841,9 +885,10 @@ module Pod
             flags * ' '
           end
 
-          def apply_xcconfig_file_ref_to_targets(targets, xcconfig_file_ref)
+          def apply_xcconfig_file_ref_to_targets(targets, xcconfig_file_ref, configurations)
             targets.each do |config_target|
               config_target.build_configurations.each do |configuration|
+                next unless configurations.include?(configuration.name)
                 configuration.base_configuration_reference = xcconfig_file_ref
               end
             end
@@ -928,16 +973,20 @@ module Pod
                     'Project'
                   end
 
-            if target.build_as_framework? && any_header_mapping_dirs? && acl != 'Project'
+            if target.build_as_framework? && !header_mappings_dir(file_accessor).nil? && 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
+              compile_build_phase_index = native_target.build_phases.index do |bp|
+                bp.is_a?(Xcodeproj::Project::Object::PBXSourcesBuildPhase)
+              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 } ||
                 native_target.new_copy_files_build_phase(copy_phase_name)
+              native_target.build_phases.move(copy_phase, compile_build_phase_index - 1) unless compile_build_phase_index.nil?
               copy_phase.symbol_dst_subfolder_spec = :products_directory
               copy_phase.dst_path = "$(#{acl.upcase}_HEADERS_FOLDER_PATH)/#{sub_dir}"
               copy_phase.add_file_reference(file_ref, true)
@@ -1035,6 +1084,18 @@ module Pod
             end
           end
 
+          # Raises if a vendored xcframework contains frameworks of mixed linkage
+          #
+          def validate_xcframeworks_no_mixed_linkage
+            target.xcframeworks.each_value do |xcframeworks|
+              xcframeworks.each do |xcframework|
+                dynamic_slices, static_slices = xcframework.slices.partition { |slice| Pod::Xcode::LinkageAnalyzer.dynamic_binary?(slice.path) }
+                if !dynamic_slices.empty? && !static_slices.empty?
+                  raise Informative, "Unable to install vendored xcframework `#{xcframework.name}` for Pod `#{target.label}`, because it contains both static and dynamic frameworks."
+                end
+              end
+            end
+          end
           #-----------------------------------------------------------------------#
         end
       end