cocoapods 1.9.1 → 1.10.2

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

@@ -79,13 +79,14 @@ module Pod
         #
         # @param [PBXProject] project The project to configure schemes for.
         # @param [Array<PodTarget>] pod_targets The pod targets within that project to configure their schemes.
+        # @param [PodsProjectGeneratorResult] generator_result the result of the project generation
         #
         # @return [void]
         #
-        def configure_schemes(project, pod_targets)
+        def configure_schemes(project, pod_targets, generator_result)
           pod_targets.each do |pod_target|
             share_scheme = pod_target.should_build? && share_scheme_for_development_pod?(pod_target.pod_name) && sandbox.local?(pod_target.pod_name)
-            configure_schemes_for_pod_target(project, pod_target, share_scheme)
+            configure_schemes_for_pod_target(project, pod_target, share_scheme, generator_result)
           end
         end
 
@@ -143,8 +144,10 @@ module Pod
           pod_installations_to_integrate = pod_target_installation_results.values.select do |pod_target_installation_result|
             pod_target = pod_target_installation_result.target
             !pod_target_installation_result.test_native_targets.empty? ||
-                !pod_target_installation_result.app_native_targets.empty? ||
-                pod_target.contains_script_phases?
+              !pod_target_installation_result.app_native_targets.empty? ||
+              pod_target.contains_script_phases? ||
+              pod_target.framework_paths.values.flatten.any? { |paths| !paths.dsym_path.nil? } ||
+              pod_target.xcframeworks.values.any? { |xcframeworks| !xcframeworks.empty? }
           end
           return if pod_installations_to_integrate.empty?
 
@@ -218,14 +221,35 @@ module Pod
           end
         end
 
-        def configure_schemes_for_pod_target(project, pod_target, share_scheme)
+        # @param [Project] project
+        #        the project of the pod target
+        #
+        # @param [Pod::PodTarget] pod_target
+        #        the pod target for which to configure schemes
+        #
+        # @param [Boolean] share_scheme
+        #        whether the created schemes should be shared
+        #
+        # @param [PodsProjectGeneratorResult] generator_result
+        #        the project generation result
+        #
+        def configure_schemes_for_pod_target(project, pod_target, share_scheme, generator_result)
           # Ignore subspecs because they do not provide a scheme configuration due to the fact that they are always
           # merged with the root spec scheme.
           specs = [pod_target.root_spec] + pod_target.test_specs + pod_target.app_specs
+          hosted_test_specs_by_host = Hash.new do |hash, key|
+            hash[key] = []
+          end
+          pod_target.test_app_hosts_by_spec.each do |spec, (host_spec, host_target)|
+            if host_target == pod_target
+              hosted_test_specs_by_host[host_spec] << spec
+            end
+          end
+          is_custom_host = !hosted_test_specs_by_host.empty?
           specs.each do |spec|
             scheme_name = spec.spec_type == :library ? pod_target.label : pod_target.non_library_spec_label(spec)
             scheme_configuration = pod_target.scheme_for_spec(spec)
-            unless scheme_configuration.empty?
+            if !scheme_configuration.empty? || is_custom_host
               scheme_path = Xcodeproj::XCScheme.user_data_dir(project.path) + "#{scheme_name}.xcscheme"
               scheme = Xcodeproj::XCScheme.new(scheme_path)
               command_line_arguments = scheme.launch_action.command_line_arguments
@@ -241,6 +265,21 @@ module Pod
               if scheme_configuration.key?(:code_coverage)
                 scheme.test_action.code_coverage_enabled = scheme_configuration[:code_coverage]
               end
+
+              hosted_test_specs_by_host[spec].each do |hosted_spec|
+                # We are an app spec which hosts this test spec.
+                # Include the test specs's test bundle within our scheme's test action
+                native_target = generator_result.native_target_for_spec(hosted_spec)
+                testable = Xcodeproj::XCScheme::TestAction::TestableReference.new(native_target)
+                scheme.test_action.add_testable(testable)
+              end
+
+              if spec.test_specification?
+                # Default to using the test bundle to expand variables
+                native_target_for_expansion = generator_result.native_target_for_spec(spec)
+                macro_expansion = Xcodeproj::XCScheme::MacroExpansion.new(native_target_for_expansion)
+                scheme.launch_action.add_macro_expansion(macro_expansion)
+              end
               scheme.save!
             end
             Xcodeproj::XCScheme.share_scheme(project.path, scheme_name) if share_scheme

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/installer.rb

@@ -34,6 +34,8 @@ module Pod
     autoload :InstallationOptions,          'cocoapods/installer/installation_options'
     autoload :PostInstallHooksContext,      'cocoapods/installer/post_install_hooks_context'
     autoload :PreInstallHooksContext,       'cocoapods/installer/pre_install_hooks_context'
+    autoload :BaseInstallHooksContext,      'cocoapods/installer/base_install_hooks_context'
+    autoload :PostIntegrateHooksContext,    'cocoapods/installer/post_integrate_hooks_context'
     autoload :SourceProviderHooksContext,   'cocoapods/installer/source_provider_hooks_context'
     autoload :PodfileValidator,             'cocoapods/installer/podfile_validator'
     autoload :PodSourceInstaller,           'cocoapods/installer/pod_source_installer'
@@ -47,6 +49,8 @@ module Pod
 
     include Config::Mixin
 
+    MASTER_SPECS_REPO_GIT_URL = 'https://github.com/CocoaPods/Specs.git'.freeze
+
     # @return [Sandbox] The sandbox where the Pods should be installed.
     #
     attr_reader :sandbox
@@ -331,7 +335,7 @@ module Pod
         all_projects_by_pod_targets.merge!(pods_project_by_targets) if pods_project_by_targets
         all_projects_by_pod_targets.merge!(projects_by_pod_targets) if projects_by_pod_targets
         all_projects_by_pod_targets.each do |project, pod_targets|
-          generator.configure_schemes(project, pod_targets)
+          generator.configure_schemes(project, pod_targets, pod_project_generation_result)
         end
       end
     end
@@ -494,7 +498,7 @@ module Pod
             previous_version = sandbox.manifest.version(spec.name)
             has_changed_version = current_version != previous_version
             current_repo = analysis_result.specs_by_source.detect { |key, values| break key if values.map(&:name).include?(spec.name) }
-            current_repo &&= current_repo.url || current_repo.name
+            current_repo &&= (Pod::TrunkSource::TRUNK_REPO_NAME if current_repo.name == Pod::TrunkSource::TRUNK_REPO_NAME) || current_repo.url || current_repo.name
             previous_spec_repo = sandbox.manifest.spec_repo(spec.name)
             has_changed_repo = !previous_spec_repo.nil? && current_repo && !current_repo.casecmp(previous_spec_repo).zero?
             title = "Installing #{spec.name} #{spec.version}"
@@ -563,6 +567,7 @@ module Pod
     #
     def clean_pod_sources
       return unless installation_options.clean?
+      return if installed_specs.empty?
       pod_installers.each(&:clean!)
     end
 
@@ -607,6 +612,7 @@ module Pod
       run_plugins_post_install_hooks
       warn_for_deprecations
       warn_for_installed_script_phases
+      warn_for_removing_git_master_specs_repo
       print_post_install_message
     end
 
@@ -635,12 +641,27 @@ module Pod
       lock_pod_sources
     end
 
+    # Runs the registered callbacks for the plugins post integrate hooks.
+    #
+    def run_plugins_post_integrate_hooks
+      if any_plugin_post_integrate_hooks?
+        context = PostIntegrateHooksContext.generate(sandbox, pods_project, aggregate_targets)
+        HooksManager.run(:post_integrate, context, plugins)
+      end
+    end
+
     # @return [Boolean] whether there are any plugin post-install hooks to run
     #
     def any_plugin_post_install_hooks?
       HooksManager.hooks_to_run(:post_install, plugins).any?
     end
 
+    # @return [Boolean] whether there are any plugin post-integrate hooks to run
+    #
+    def any_plugin_post_integrate_hooks?
+      HooksManager.hooks_to_run(:post_integrate, plugins).any?
+    end
+
     # Runs the registered callbacks for the source provider plugin hooks.
     #
     # @return [Array<Pod::Source>] the plugin sources
@@ -686,7 +707,7 @@ module Pod
       end
     end
 
-    DEFAULT_PLUGINS = { 'cocoapods-stats' => {} }
+    DEFAULT_PLUGINS = {}
 
     # Returns the plugins that should be run, as indicated by the default
     # plugins and the podfile's plugins
@@ -736,6 +757,24 @@ module Pod
       end
     end
 
+    # Prints a warning if the project is not explicitly using the git based master specs repo.
+    #
+    # Helps users to delete the git based master specs repo from the repos directory which reduces `--repo-update`
+    # speed and hopefully reduces Github workload.
+    #
+    # @return [void]
+    #
+    def warn_for_removing_git_master_specs_repo
+      return unless installation_options.warn_for_unused_master_specs_repo?
+      podfile_master_source = podfile.sources.find { |source| source == MASTER_SPECS_REPO_GIT_URL }
+      master_repo = config.sources_manager.all.find { |s| s.url == MASTER_SPECS_REPO_GIT_URL }
+      if podfile_master_source.nil? && !master_repo.nil?
+        UI.warn 'Your project does not explicitly specify the CocoaPods master specs repo. Since CDN is now used as the' \
+        ' default, you may safely remove it from your repos directory via `pod repo remove master`. To suppress this warning' \
+        ' please add `warn_for_unused_master_specs_repo => false` to your Podfile.'
+      end
+    end
+
     # @return [Lockfile] The lockfile to write to disk.
     #
     def generate_lockfile
@@ -799,6 +838,7 @@ module Pod
         integrator = UserProjectIntegrator.new(podfile, sandbox, installation_root, aggregate_targets, generated_aggregate_targets,
                                                :use_input_output_paths => !installation_options.disable_input_output_paths?)
         integrator.integrate!
+        run_podfile_post_integrate_hooks
       end
     end
 
@@ -861,6 +901,33 @@ module Pod
         "\n\n#{e.message}\n\n#{e.backtrace * "\n"}"
     end
 
+    # Runs the post integrate hooks of the installed specs and of the Podfile.
+    #
+    # @note   Post integrate hooks run _after_ saving of project, so that they
+    #         can alter it after it is written to the disk.
+    #
+    # @return [void]
+    #
+    def run_podfile_post_integrate_hooks
+      UI.message '- Running post integrate hooks' do
+        executed = run_podfile_post_integrate_hook
+        UI.message '- Podfile' if executed
+      end
+    end
+
+    # Runs the post integrate hook of the Podfile.
+    #
+    # @raise  Raises an informative if the hooks raises.
+    #
+    # @return [Boolean] Whether the hook was run.
+    #
+    def run_podfile_post_integrate_hook
+      podfile.post_integrate!(self)
+    rescue => e
+      raise Informative, 'An error occurred while processing the post-integrate ' \
+        'hook of the Podfile.' \
+        "\n\n#{e.message}\n\n#{e.backtrace * "\n"}"
+    end
     #-------------------------------------------------------------------------#
 
     public

data/lib/cocoapods/sandbox/file_accessor.rb

@@ -172,6 +172,15 @@ module Pod
         end
       end
 
+      # @return [Array<Pathname>] The paths of the dynamic xcframework bundles
+      #         that come shipped with the Pod.
+      #
+      def vendored_static_xcframeworks
+        vendored_xcframeworks.select do |path|
+          Xcode::XCFramework.new(path).build_type == BuildType.static_framework
+        end
+      end
+
       # @return [Array<Pathname>] The paths of the static (fake) framework
       #         bundles that come shipped with the Pod.
       #
@@ -289,7 +298,7 @@ module Pod
       #         that come shipped with the Pod.
       #
       def vendored_static_artifacts
-        vendored_static_libraries + vendored_static_frameworks
+        vendored_static_libraries + vendored_static_frameworks + vendored_static_xcframeworks
       end
 
       # @return [Hash{String => Array<Pathname>}] A hash that describes the

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/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)).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? }.
+                                    flat_map { |xcf| linker_names_from_libraries([xcf.slices.first.binary_path]) }.
+                                    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>]
@@ -816,7 +871,16 @@ module Pod
 
         # @return [Array<String>]
         define_build_settings_method :header_search_paths, :build_setting => true, :memoized => true, :sorted => true do
-          target.header_search_paths(:include_dependent_targets_for_test_spec => test_xcconfig? && non_library_spec, :include_dependent_targets_for_app_spec => app_xcconfig? && non_library_spec, :configuration => @configuration)
+          paths = target.header_search_paths(:include_dependent_targets_for_test_spec => test_xcconfig? && non_library_spec, :include_dependent_targets_for_app_spec => app_xcconfig? && non_library_spec, :configuration => @configuration)
+
+          dependent_vendored_xcframeworks = []
+          dependent_vendored_xcframeworks.concat vendored_xcframeworks
+          dependent_vendored_xcframeworks.concat dependent_targets.flat_map { |pt| pt.build_settings[@configuration].vendored_xcframeworks }
+          paths.concat dependent_vendored_xcframeworks.
+            select { |xcf| xcf.build_type.static_library? }.
+            map { |xcf| "#{BuildSettings.xcframework_intermediate_dir(xcf)}/Headers" }.
+            compact
+          paths
         end
 
         # @return [Array<String>]
@@ -912,6 +976,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 +1167,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