cocoapods 1.9.1 → 1.10.0.rc.1

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

@@ -32,11 +32,12 @@ module Pod
           def integrate!
             UI.section(integration_message) do
               target_installation_result.non_library_specs_by_native_target.each do |native_target, spec|
-                add_prepare_artifacts_script_phase(native_target, spec)
                 add_embed_frameworks_script_phase(native_target, spec)
                 add_copy_resources_script_phase(native_target, spec)
                 UserProjectIntegrator::TargetIntegrator.create_or_update_user_script_phases(script_phases_for_specs(spec), native_target)
               end
+              add_copy_dsyms_script_phase(target_installation_result.native_target)
+              add_copy_xcframeworks_script_phase(target_installation_result.native_target)
               UserProjectIntegrator::TargetIntegrator.create_or_update_user_script_phases(script_phases_for_specs(target.library_specs), target_installation_result.native_target)
             end
           end
@@ -138,15 +139,12 @@ module Pod
               input_file_list_path = target.embed_frameworks_script_input_files_path_for_spec(spec)
               input_file_list_relative_path = "${PODS_ROOT}/#{input_file_list_path.relative_path_from(target.sandbox.root)}"
               input_paths_key = UserProjectIntegrator::TargetIntegrator::XCFileListConfigKey.new(input_file_list_path, input_file_list_relative_path)
-              input_paths = input_paths_by_config[input_paths_key] = [script_path]
-              framework_paths.each do |path|
-                input_paths.concat(path.all_paths)
-              end
+              input_paths_by_config[input_paths_key] = [script_path] + UserProjectIntegrator::TargetIntegrator.embed_frameworks_input_paths(framework_paths, [])
 
               output_file_list_path = target.embed_frameworks_script_output_files_path_for_spec(spec)
               output_file_list_relative_path = "${PODS_ROOT}/#{output_file_list_path.relative_path_from(target.sandbox.root)}"
               output_paths_key = UserProjectIntegrator::TargetIntegrator::XCFileListConfigKey.new(output_file_list_path, output_file_list_relative_path)
-              output_paths_by_config[output_paths_key] = UserProjectIntegrator::TargetIntegrator.framework_output_paths(framework_paths)
+              output_paths_by_config[output_paths_key] = UserProjectIntegrator::TargetIntegrator.embed_frameworks_output_paths(framework_paths, [])
             end
 
             if framework_paths.empty?
@@ -162,34 +160,18 @@ module Pod
           # @param [PBXNativeTarget] native_target
           #         the native target for which to add the prepare artifacts script
           #
-          # @param [Pod::Specification] spec
-          #         the specification to integrate
-          #
           # @return [void]
           #
-          def add_prepare_artifacts_script_phase(native_target, spec)
-            script_path = "${PODS_ROOT}/#{target.prepare_artifacts_script_path_for_spec(spec).relative_path_from(target.sandbox.root)}"
+          def add_copy_xcframeworks_script_phase(native_target)
+            script_path = "${PODS_ROOT}/#{target.copy_xcframeworks_script_path.relative_path_from(target.sandbox.root)}"
 
             input_paths_by_config = {}
             output_paths_by_config = {}
 
-            dependent_targets = if spec.test_specification?
-                                  target.dependent_targets_for_test_spec(spec)
-                                else
-                                  target.dependent_targets_for_app_spec(spec)
-                                end
-            host_target_spec_names = target.app_host_dependent_targets_for_spec(spec).flat_map do |pt|
-              pt.specs.map(&:name)
-            end.uniq
-            xcframeworks = dependent_targets.flat_map do |dependent_target|
-              spec_paths_to_include = dependent_target.library_specs.map(&:name)
-              spec_paths_to_include -= host_target_spec_names
-              spec_paths_to_include << spec.name if dependent_target == target
-              dependent_target.xcframeworks.values_at(*spec_paths_to_include).flatten.compact
-            end.uniq
+            xcframeworks = target.xcframeworks.values.flatten
 
             if use_input_output_paths? && !xcframeworks.empty?
-              input_file_list_path = target.prepare_artifacts_script_input_files_path_for_spec(spec)
+              input_file_list_path = target.copy_xcframeworks_script_input_files_path
               input_file_list_relative_path = "${PODS_ROOT}/#{input_file_list_path.relative_path_from(target.sandbox.root)}"
               input_paths_key = UserProjectIntegrator::TargetIntegrator::XCFileListConfigKey.new(input_file_list_path, input_file_list_relative_path)
               input_paths = input_paths_by_config[input_paths_key] = [script_path]
@@ -197,20 +179,69 @@ module Pod
               framework_paths = xcframeworks.map { |xcf| "${PODS_ROOT}/#{xcf.path.relative_path_from(target.sandbox.root)}" }
               input_paths.concat framework_paths
 
-              output_file_list_path = target.prepare_artifacts_script_output_files_path_for_spec(spec)
+              output_file_list_path = target.copy_xcframeworks_script_output_files_path
               output_file_list_relative_path = "${PODS_ROOT}/#{output_file_list_path.relative_path_from(target.sandbox.root)}"
               output_paths_key = UserProjectIntegrator::TargetIntegrator::XCFileListConfigKey.new(output_file_list_path, output_file_list_relative_path)
-              output_paths_by_config[output_paths_key] = [UserProjectIntegrator::TargetIntegrator::ARTIFACT_LIST_FILE]
+              output_paths_by_config[output_paths_key] = xcframeworks.map do |xcf|
+                "#{Target::BuildSettings::XCFRAMEWORKS_BUILD_DIR_VARIABLE}/#{xcf.name}"
+              end
             end
 
             if xcframeworks.empty?
-              UserProjectIntegrator::TargetIntegrator.remove_prepare_artifacts_script_phase_from_target(native_target)
+              UserProjectIntegrator::TargetIntegrator.remove_copy_xcframeworks_script_phase_from_target(native_target)
             else
-              UserProjectIntegrator::TargetIntegrator.create_or_update_prepare_artifacts_script_phase_to_target(
+              UserProjectIntegrator::TargetIntegrator.create_or_update_copy_xcframeworks_script_phase_to_target(
                 native_target, script_path, input_paths_by_config, output_paths_by_config)
             end
           end
 
+          # Adds a script phase that copies and strips dSYMs that are part of this target. Note this only deals with
+          # vendored dSYMs.
+          #
+          # @param [PBXNativeTarget] native_target
+          #         the native target for which to add the the copy dSYM files build phase.
+          #
+          # @return [void]
+          #
+          def add_copy_dsyms_script_phase(native_target)
+            script_path = "${PODS_ROOT}/#{target.copy_dsyms_script_path.relative_path_from(target.sandbox.root)}"
+            dsym_paths = PodTargetInstaller.dsym_paths(target)
+            bcsymbolmap_paths = PodTargetInstaller.bcsymbolmap_paths(target)
+
+            if dsym_paths.empty? && bcsymbolmap_paths.empty?
+              script_phase = native_target.shell_script_build_phases.find do |bp|
+                bp.name && bp.name.end_with?(UserProjectIntegrator::TargetIntegrator::COPY_DSYM_FILES_PHASE_NAME)
+              end
+              native_target.build_phases.delete(script_phase) if script_phase.present?
+              return
+            end
+
+            phase_name = UserProjectIntegrator::TargetIntegrator::BUILD_PHASE_PREFIX + UserProjectIntegrator::TargetIntegrator::COPY_DSYM_FILES_PHASE_NAME
+            phase = UserProjectIntegrator::TargetIntegrator.create_or_update_shell_script_build_phase(native_target, phase_name)
+            phase.shell_script = %("#{script_path}"\n)
+
+            input_paths_by_config = {}
+            output_paths_by_config = {}
+            if use_input_output_paths?
+              input_file_list_path = target.copy_dsyms_script_input_files_path
+              input_file_list_relative_path = "${PODS_ROOT}/#{input_file_list_path.relative_path_from(target.sandbox.root)}"
+              input_paths_key = UserProjectIntegrator::TargetIntegrator::XCFileListConfigKey.new(input_file_list_path, input_file_list_relative_path)
+              input_paths = input_paths_by_config[input_paths_key] = []
+              input_paths.concat([dsym_paths, *bcsymbolmap_paths].flatten.compact)
+
+              output_file_list_path = target.copy_dsyms_script_output_files_path
+              output_file_list_relative_path = "${PODS_ROOT}/#{output_file_list_path.relative_path_from(target.sandbox.root)}"
+              output_paths_key = UserProjectIntegrator::TargetIntegrator::XCFileListConfigKey.new(output_file_list_path, output_file_list_relative_path)
+              output_paths = output_paths_by_config[output_paths_key] = []
+
+              dsym_output_paths = dsym_paths.map { |dsym_path| "${DWARF_DSYM_FOLDER_PATH}/#{File.basename(dsym_path)}" }
+              bcsymbolmap_output_paths = bcsymbolmap_paths.map { |bcsymbolmap_path| "${DWARF_DSYM_FOLDER_PATH}/#{File.basename(bcsymbolmap_path)}" }
+              output_paths.concat([dsym_output_paths, *bcsymbolmap_output_paths].flatten.compact)
+            end
+
+            UserProjectIntegrator::TargetIntegrator.set_input_output_paths(phase, input_paths_by_config, output_paths_by_config)
+          end
+
           # @return [String] the message that should be displayed for the target
           #         integration.
           #

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

@@ -30,7 +30,7 @@ module Pod
         #
         attr_reader :platforms
 
-        # @return [String] Object version for the Xcode project.
+        # @return [Integer] Object version for the Xcode project.
         #
         attr_reader :object_version
 
@@ -50,7 +50,7 @@ module Pod
         # @param [Array<PodTarget>] pod_targets @see #pod_targets
         # @param [Hash{String=>Symbol}] build_configurations @see #build_configurations
         # @param [Array<Platform>] platforms @see #platforms
-        # @param [String] object_version @see #object_version
+        # @param [Integer] object_version @see #object_version
         # @param [String] podfile_path @see #podfile_path
         #
         def initialize(sandbox, path, pod_targets, build_configurations, platforms,
@@ -110,6 +110,7 @@ module Pod
               build_configuration.build_settings['TVOS_DEPLOYMENT_TARGET'] = tvos_deployment_target.to_s if tvos_deployment_target
               build_configuration.build_settings['STRIP_INSTALLED_PRODUCT'] = 'NO'
               build_configuration.build_settings['CLANG_ENABLE_OBJC_ARC'] = 'YES'
+              build_configuration.build_settings['CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED'] = 'YES'
             end
           end
         end

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

@@ -38,7 +38,7 @@ module Pod
           #
           attr_reader :test_app_host_targets
 
-          # @return [Array<PBXNativeTarget>] app_native_targets
+          # @return [Hash{Specification => PBXNativeTarget}] app_native_targets
           #         The app native targets that were produced for this target. Can be empty if there were no app
           #         native targets created (e.g. no app specs present).
           #
@@ -58,12 +58,12 @@ module Pod
           # @param [Array<PBXNativeTarget>] test_native_targets @see #test_native_targets
           # @param [Hash{String=>Array<PBXNativeTarget>}] test_resource_bundle_targets @see #test_resource_bundle_targets
           # @param [Array<PBXNativeTarget>] test_app_host_targets @see #test_app_host_targets
-          # @param [Array<PBXNativeTarget>] app_native_targets @see #app_native_targets
+          # @param [Hash{Specification => PBXNativeTarget}] app_native_targets @see #app_native_targets
           # @param [Hash{String=>Array<PBXNativeTarget>}] app_resource_bundle_targets @see #app_resource_bundle_targets
           #
           def initialize(target, native_target, resource_bundle_targets = [], test_native_targets = [],
                          test_resource_bundle_targets = {}, test_app_host_targets = [],
-                         app_native_targets = [], app_resource_bundle_targets = {})
+                         app_native_targets = {}, app_resource_bundle_targets = {})
             @target = target
             @native_target = native_target
             @resource_bundle_targets = resource_bundle_targets
@@ -115,7 +115,7 @@ module Pod
           # @return [PBXNativeTarget] the app host target with the given target label.
           #
           def app_host_target_labelled(label)
-            app_native_targets.find do |app_native_target|
+            app_native_targets.values.find do |app_native_target|
               app_native_target.name == label
             end || test_app_host_targets.find do |app_native_target|
               app_native_target.name == label
@@ -131,9 +131,7 @@ module Pod
           end
 
           def app_native_target_from_spec(spec)
-            app_native_targets.find do |app_native_target|
-              app_native_target.name == target.app_target_label(spec)
-            end
+            app_native_targets[spec]
           end
         end
       end

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

@@ -28,6 +28,25 @@ module Pod
             @projects_by_pod_targets = projects_by_pod_targets
             @target_installation_results = target_installation_results
           end
+
+          # @param [Pod::Specification] spec
+          #        A spec which was included in the generated project
+          #
+          # @return [Xcodeproj::PBXNativeTarget] the native target for the spec
+          #
+          def native_target_for_spec(spec)
+            installation_results_by_spec[spec.root].native_target_for_spec(spec)
+          end
+
+          private
+
+          def installation_results_by_spec
+            @target_installation_results_by_spec ||= begin
+              target_installation_results.pod_target_installation_results.values.each_with_object({}) do |installation_results, hash|
+                hash[installation_results.target.root_spec] = installation_results
+              end
+            end
+          end
         end
       end
     end

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

@@ -115,7 +115,7 @@ module Pod
                 target_errors = swift_target_definitions.map(&error_message_for_target_definition).to_sentence
                 "- `#{swift_pod_target.name}` is integrated by multiple targets that use a different Swift version: #{target_errors}."
               end
-            elsif swift_pod_target.swift_version.empty?
+            elsif !swift_pod_target.swift_version.nil? && swift_pod_target.swift_version.empty?
               "- `#{swift_pod_target.name}` does not specify a Swift version (#{swift_pod_target.spec_swift_versions.map { |v| "`#{v}`" }.to_sentence}) " \
                 "that is satisfied by any of targets (#{swift_pod_target.target_definitions.map { |td| "`#{td.name}`" }.to_sentence}) integrating it."
             end

data/lib/cocoapods/sources_manager.rb

@@ -2,7 +2,6 @@ require 'cocoapods-core/source'
 require 'netrc'
 require 'set'
 require 'rest'
-require 'typhoeus'
 require 'yaml'
 
 module Pod
@@ -72,6 +71,8 @@ module Pod
       #
       def cdn_url?(url)
         if url =~ %r{^https?:\/\/}
+          require 'typhoeus'
+
           response = Typhoeus.get(url + '/CocoaPods-version.yml', :netrc_file => Netrc.default_path, :netrc => :optional)
           response.code == 200 && begin
             response_hash = YAML.load(response.body) # rubocop:disable Security/YAMLLoad

data/lib/cocoapods/target.rb

@@ -43,6 +43,11 @@ module Pod
     #
     attr_reader :application_extension_api_only
 
+    # @return [Boolean] whether the target must be compiled with Swift's library
+    # evolution support, necessary for XCFrameworks.
+    #
+    attr_reader :build_library_for_distribution
+
     # Initialize a new target
     #
     # @param [Sandbox] sandbox @see #sandbox
@@ -59,6 +64,7 @@ module Pod
       @build_type = build_type
 
       @application_extension_api_only = false
+      @build_library_for_distribution = false
       @build_settings = create_build_settings
     end
 
@@ -298,19 +304,55 @@ module Pod
       support_files_dir + "#{label}-dummy.m"
     end
 
-    # mark the target as extension-only,
-    # translates to APPLICATION_EXTENSION_API_ONLY = YES in the build settings
+    # Mark the target as extension-only.
+    # Translates to APPLICATION_EXTENSION_API_ONLY = YES in the build settings.
     #
     def mark_application_extension_api_only
       @application_extension_api_only = true
     end
 
+    # Compiles the target with Swift's library evolution support, necessary to
+    # build XCFrameworks.
+    # Translates to BUILD_LIBRARY_FOR_DISTRIBUTION = YES in the build settings.
+    #
+    def mark_build_library_for_distribution
+      @build_library_for_distribution = true
+    end
+
     # @return [Pathname] The absolute path of the prepare artifacts script.
     #
+    # @deprecated
+    #
+    # @todo Remove in 2.0
+    #
     def prepare_artifacts_script_path
       support_files_dir + "#{label}-artifacts.sh"
     end
 
+    # Returns an extension in the target that corresponds to the
+    # resource's input extension.
+    #
+    # @param [String] input_extension
+    #        The input extension to map to.
+    #
+    # @return [String] The output extension.
+    #
+    def self.output_extension_for_resource(input_extension)
+      case input_extension
+      when '.storyboard'        then '.storyboardc'
+      when '.xib'               then '.nib'
+      when '.xcdatamodel'       then '.mom'
+      when '.xcdatamodeld'      then '.momd'
+      when '.xcmappingmodel'    then '.cdm'
+      when '.xcassets'          then '.car'
+      else                      input_extension
+      end
+    end
+
+    def self.resource_extension_compilable?(input_extension)
+      output_extension_for_resource(input_extension) != input_extension
+    end
+
     #-------------------------------------------------------------------------#
 
     private

data/lib/cocoapods/target/aggregate_target.rb

@@ -98,6 +98,7 @@ module Pod
                           target_definition, client_root, user_project, user_target_uuids, merged).tap do |aggregate_target|
         aggregate_target.search_paths_aggregate_targets.concat(search_paths_aggregate_targets).freeze
         aggregate_target.mark_application_extension_api_only if application_extension_api_only
+        aggregate_target.mark_build_library_for_distribution if build_library_for_distribution
       end
     end
 
@@ -284,6 +285,20 @@ module Pod
           resources_by_config[config] = targets.flat_map do |pod_target|
             library_specs = pod_target.library_specs.map(&:name)
             resource_paths = pod_target.resource_paths.values_at(*library_specs).flatten
+
+            if pod_target.build_as_static_framework?
+              built_product_dir = Pathname.new(pod_target.build_product_path('${BUILT_PRODUCTS_DIR}'))
+              resource_paths = resource_paths.map do |resource_path|
+                extname = File.extname(resource_path)
+                if self.class.resource_extension_compilable?(extname)
+                  output_extname = self.class.output_extension_for_resource(extname)
+                  built_product_dir.join(File.basename(resource_path, extname)).sub_ext(output_extname).to_s
+                else
+                  resource_path
+                end
+              end
+            end
+
             resource_paths << bridge_support_file
             resource_paths.compact.uniq
           end
@@ -359,6 +374,10 @@ module Pod
     #
     # @return [Pathname] The absolute path of the prepare artifacts script input file list.
     #
+    # @deprecated
+    #
+    # @todo Remove in 2.0
+    #
     def prepare_artifacts_script_input_files_path(configuration)
       support_files_dir + "#{label}-artifacts-#{configuration}-input-files.xcfilelist"
     end
@@ -367,6 +386,10 @@ module Pod
     #
     # @return [Pathname] The absolute path of the prepare artifacts script output file list.
     #
+    # @deprecated
+    #
+    # @todo Remove in 2.0
+    #
     def prepare_artifacts_script_output_files_path(configuration)
       support_files_dir + "#{label}-artifacts-#{configuration}-output-files.xcfilelist"
     end
@@ -453,6 +476,10 @@ module Pod
     # @return [String] The path of the prepare artifacts script relative to the
     #         root of the Pods project.
     #
+    # @deprecated
+    #
+    # @todo Remove in 2.0
+    #
     def prepare_artifacts_script_relative_path
       "${PODS_ROOT}/#{relative_to_pods_root(prepare_artifacts_script_path)}"
     end
@@ -460,6 +487,10 @@ module Pod
     # @return [String] The path of the prepare artifacts script input file list
     #         relative to the root of the Pods project.
     #
+    # @deprecated
+    #
+    # @todo Remove in 2.0
+    #
     def prepare_artifacts_script_input_files_relative_path
       "${PODS_ROOT}/#{relative_to_pods_root(prepare_artifacts_script_input_files_path('${CONFIGURATION}'))}"
     end
@@ -467,6 +498,10 @@ module Pod
     # @return [String] The path of the prepare artifacts script output file list
     #         relative to the root of the Pods project.
     #
+    # @deprecated
+    #
+    # @todo Remove in 2.0
+    #
     def prepare_artifacts_script_output_files_relative_path
       "${PODS_ROOT}/#{relative_to_pods_root(prepare_artifacts_script_output_files_path('${CONFIGURATION}'))}"
     end

data/lib/cocoapods/target/build_settings.rb

@@ -43,7 +43,13 @@ module Pod
       # @return [String]
       #   The variable for the configuration build directory used when building pod targets.
       #
-      CONFIGURATION_BUILD_DIR_VARIABLE = '${PODS_CONFIGURATION_BUILD_DIR}'.freeze
+      CONFIGURATION_BUILD_DIR_VARIABLE = '${PODS_CONFIGURATION_BUILD_DIR}'
+
+      # @return [String]
+      #   The variable for the configuration intermediate frameworks directory used for building pod targets
+      #   that contain vendored xcframeworks.
+      #
+      XCFRAMEWORKS_BUILD_DIR_VARIABLE = '${PODS_XCFRAMEWORKS_BUILD_DIR}'
 
       #-------------------------------------------------------------------------#
 
@@ -95,7 +101,7 @@ module Pod
                                             from_search_paths_aggregate_targets: false, from_pod_targets_to_link: false,
                                             &implementation)
 
-        memoized_key = "#{self}##{method_name}".freeze
+        memoized_key = "#{self}##{method_name}"
 
         (@build_settings_names ||= Set.new) << method_name.to_s.upcase if build_setting
 
@@ -134,6 +140,14 @@ module Pod
       end
       private_class_method :define_build_settings_method
 
+      # @param [XCFramework] xcframework the xcframework thats slice will be copied to the intermediates dir
+      #
+      # @return [String] the path to the directory containing the xcframework slice
+      #
+      def self.xcframework_intermediate_dir(xcframework)
+        "#{XCFRAMEWORKS_BUILD_DIR_VARIABLE}/#{xcframework.name}"
+      end
+
       class << self
         #-------------------------------------------------------------------------#
 
@@ -204,6 +218,10 @@ module Pod
         '${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)'
       end
 
+      define_build_settings_method :pods_xcframeworks_build_dir, :build_setting => true do
+        '$(PODS_CONFIGURATION_BUILD_DIR)/XCFrameworkIntermediates'
+      end
+
       # @return [String]
       define_build_settings_method :use_recursive_script_inputs_in_script_phases, :build_setting => true do
         'YES'
@@ -314,6 +332,13 @@ module Pod
         false
       end
 
+      # Xcode 12 turns on this warning by default which is problematic for CocoaPods-generated
+      # imports which use double-quoted paths.
+      # @return [Boolean]
+      define_build_settings_method :clang_warn_quoted_include_in_framework_header, :build_setting => true do
+        'NO'
+      end
+
       # @return [Array<String>]
       #   the `LD_RUNPATH_SEARCH_PATHS` needed for dynamically linking the {#target}
       #
@@ -475,6 +500,14 @@ module Pod
         pod_targets - subset_targets
       end
 
+      # @param  [Pathname,String] path the path to the xcframework bundle
+      #
+      # @return [Xcode::XCFramework] the xcframework at the given path
+      #
+      def load_xcframework(path)
+        Xcode::XCFramework.new(path)
+      end
+
       # A subclass that generates build settings for a {PodTarget}
       class PodTargetSettings < BuildSettings
         #-------------------------------------------------------------------------#
@@ -576,10 +609,13 @@ module Pod
           frameworks.concat consumer_frameworks
           if library_xcconfig?
             # We know that this library target is being built dynamically based
-            # on the guard above, so include any vendored static frameworks.
+            # on the guard above, so include any vendored static frameworks and vendored xcframeworks.
             if target.should_build?
               frameworks.concat vendored_static_frameworks.map { |l| File.basename(l, '.framework') }
-              frameworks.concat vendored_xcframeworks.map(&:name)
+              frameworks.concat vendored_xcframeworks.
+                select { |xcf| xcf.build_type.static_framework? }.
+                map(&:name).
+                uniq
             end
             # Also include any vendored dynamic frameworks of dependencies.
             frameworks.concat dependent_targets.reject(&:should_build?).flat_map { |pt| pt.build_settings[@configuration].dynamic_frameworks_to_import }
@@ -596,7 +632,7 @@ module Pod
           static_frameworks_to_import.concat vendored_static_frameworks.map { |f| File.basename(f, '.framework') } unless target.should_build? && target.build_as_dynamic?
           unless target.should_build? && target.build_as_dynamic?
             static_frameworks_to_import.concat vendored_xcframeworks.
-              select(&:includes_static_slices?).
+              select { |xcf| xcf.build_type.static_framework? }.
               map(&:name).
               uniq
           end
@@ -608,7 +644,7 @@ module Pod
         define_build_settings_method :dynamic_frameworks_to_import, :memoized => true do
           dynamic_frameworks_to_import = vendored_dynamic_frameworks.map { |f| File.basename(f, '.framework') }
           dynamic_frameworks_to_import.concat vendored_xcframeworks.
-            select(&:includes_dynamic_slices?).
+            select { |xcf| xcf.build_type.dynamic_framework? }.
             map(&:name).
             uniq
           dynamic_frameworks_to_import << target.product_basename if target.should_build? && target.build_as_dynamic_framework?
@@ -656,12 +692,11 @@ module Pod
           search_paths.concat file_accessors.
             flat_map(&:vendored_frameworks).
             map { |f| File.join '${PODS_ROOT}', f.dirname.relative_path_from(target.sandbox.root) }
-          # Include each slice in the framework search paths.
-          # Xcode will not search inside an .xcframework for headers within each slice
-          search_paths.concat vendored_xcframeworks.
-            flat_map(&:slices).
-            select { |slice| slice.platform.symbolic_name == target.platform.symbolic_name }.
-            flat_map { |slice| File.join '${PODS_ROOT}', slice.path.dirname.relative_path_from(target.sandbox.root) }
+          xcframework_intermediates = vendored_xcframeworks.
+                                      select { |xcf| xcf.build_type.framework? }.
+                                      map { |xcf| BuildSettings.xcframework_intermediate_dir(xcf) }.
+                                      uniq
+          search_paths.concat xcframework_intermediates
           search_paths
         end
 
@@ -686,7 +721,7 @@ module Pod
 
         # @return [Array<Xcode::XCFramework>]
         define_build_settings_method :vendored_xcframeworks, :memoized => true do
-          file_accessors.flat_map(&:vendored_xcframeworks).map { |path| Xcode::XCFramework.new(path) }
+          file_accessors.flat_map(&:vendored_xcframeworks).map { |path| load_xcframework(path) }
         end
 
         # @return [Array<String>]
@@ -707,7 +742,7 @@ module Pod
         # @return [Array<String>]
         #
         def linker_names_from_libraries(libraries)
-          libraries.map { |l| File.basename(l, l.extname).sub(/\Alib/, '') }
+          libraries.map { |l| File.basename(l, File.extname(l)).sub(/\Alib/, '') }
         end
 
         # @return [Array<String>]
@@ -718,6 +753,11 @@ module Pod
           if non_library_xcconfig? || target.build_as_dynamic?
             libraries.concat linker_names_from_libraries(vendored_static_libraries)
             libraries.concat libraries_to_import
+            xcframework_libraries = vendored_xcframeworks.
+                                    select { |xcf| xcf.build_type.static_library? }.
+                                    map(&:name).
+                                    uniq
+            libraries.concat xcframework_libraries
           end
           if non_library_xcconfig?
             libraries.concat dependent_targets.flat_map { |pt| pt.build_settings[@configuration].dynamic_libraries_to_import }
@@ -729,7 +769,14 @@ module Pod
         # @return [Array<String>]
         define_build_settings_method :static_libraries_to_import, :memoized => true do
           static_libraries_to_import = []
-          static_libraries_to_import.concat linker_names_from_libraries(vendored_static_libraries) unless target.should_build? && target.build_as_dynamic?
+          unless target.should_build? && target.build_as_dynamic?
+            static_libraries_to_import.concat linker_names_from_libraries(vendored_static_libraries)
+            xcframework_libraries = vendored_xcframeworks.
+                                    select { |xcf| xcf.build_type.static_library? }.
+                                    flat_map { |xcf| linker_names_from_libraries([xcf.slices.first.binary_path]) }.
+                                    uniq
+            static_libraries_to_import.concat linker_names_from_libraries(xcframework_libraries)
+          end
           static_libraries_to_import << target.product_basename if target.should_build? && target.build_as_static_library?
           static_libraries_to_import
         end
@@ -775,12 +822,20 @@ module Pod
 
         # @return [Array<String>]
         define_build_settings_method :vendored_static_library_search_paths, :memoized => true do
-          vendored_static_libraries.map { |f| File.join '${PODS_ROOT}', f.dirname.relative_path_from(target.sandbox.root) }
+          paths = vendored_static_libraries.map { |f| File.join '${PODS_ROOT}', f.dirname.relative_path_from(target.sandbox.root) }
+          paths.concat vendored_xcframeworks.
+            select { |xcf| xcf.build_type.static_library? }.
+            map { |xcf| BuildSettings.xcframework_intermediate_dir(xcf) }
+          paths
         end
 
         # @return [Array<String>]
         define_build_settings_method :vendored_dynamic_library_search_paths, :memoized => true do
-          vendored_dynamic_libraries.map { |f| File.join '${PODS_ROOT}', f.dirname.relative_path_from(target.sandbox.root) }
+          paths = vendored_dynamic_libraries.map { |f| File.join '${PODS_ROOT}', f.dirname.relative_path_from(target.sandbox.root) }
+          paths.concat vendored_xcframeworks.
+            select { |xcf| xcf.build_type.dynamic_library? }.
+            map { |xcf| BuildSettings.xcframework_intermediate_dir(xcf) }
+          paths
         end
 
         # @return [Array<String>]
@@ -912,6 +967,11 @@ module Pod
           target.application_extension_api_only ? 'YES' : nil
         end
 
+        # @return [String]
+        define_build_settings_method :build_library_for_distribution, :build_setting => true, :memoized => true do
+          target.build_library_for_distribution ? 'YES' : nil
+        end
+
         #-------------------------------------------------------------------------#
 
         # @!group Target Properties
@@ -1098,6 +1158,13 @@ module Pod
             select { |pt| pt.build_as_framework? && pt.should_build? }.
             map { |pt| pt.build_settings[@configuration].framework_header_search_path }
 
+          xcframework_library_headers = pod_targets.flat_map { |pt| pt.build_settings[@configuration].vendored_xcframeworks }.
+                                        select { |xcf| xcf.build_type.static_library? }.
+                                        map { |xcf| "#{BuildSettings.xcframework_intermediate_dir(xcf)}/Headers" }.
+                                        compact
+
+          paths.concat xcframework_library_headers
+
           paths.concat target.search_paths_aggregate_targets.flat_map { |at| at.build_settings(configuration_name).header_search_paths }
 
           paths