cocoapods 1.10.0 → 1.16.0

data/lib/cocoapods/installer.rb

@@ -36,8 +36,10 @@ module Pod
     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 :PreIntegrateHooksContext,     'cocoapods/installer/pre_integrate_hooks_context'
     autoload :SourceProviderHooksContext,   'cocoapods/installer/source_provider_hooks_context'
     autoload :PodfileValidator,             'cocoapods/installer/podfile_validator'
+    autoload :PodSourceDownloader,          'cocoapods/installer/pod_source_downloader'
     autoload :PodSourceInstaller,           'cocoapods/installer/pod_source_installer'
     autoload :PodSourcePreparer,            'cocoapods/installer/pod_source_preparer'
     autoload :UserProjectIntegrator,        'cocoapods/installer/user_project_integrator'
@@ -160,8 +162,10 @@ module Pod
       resolve_dependencies
       download_dependencies
       validate_targets
+      clean_sandbox
       if installation_options.skip_pods_project_generation?
         show_skip_pods_project_generation_message
+        run_podfile_post_install_hooks
       else
         integrate
       end
@@ -175,6 +179,7 @@ module Pod
     end
 
     def integrate
+      run_podfile_pre_integrate_hooks
       generate_pods_project
       if installation_options.integrate_targets?
         integrate_user_project
@@ -199,7 +204,7 @@ module Pod
 
           force_clean_install = clean_install || project_cache_version.version != Version.create(VersionMetadata.project_cache_version)
           cache_result = ProjectCache::ProjectCacheAnalyzer.new(sandbox, installation_cache, analysis_result.all_user_build_configurations,
-                                                                object_version, plugins, pod_targets, aggregate_targets, :clean_install => force_clean_install).analyze
+                                                                object_version, plugins, pod_targets, aggregate_targets, installation_options.to_h, :clean_install => force_clean_install).analyze
           aggregate_targets_to_generate = cache_result.aggregate_targets_to_generate || []
           pod_targets_to_generate = cache_result.pod_targets_to_generate
           (aggregate_targets_to_generate + pod_targets_to_generate).each do |target|
@@ -294,7 +299,10 @@ module Pod
       pod_targets_to_generate = cache_analysis_result.pod_targets_to_generate
       aggregate_targets_to_generate = cache_analysis_result.aggregate_targets_to_generate
 
-      clean_sandbox(pod_targets_to_generate)
+      pod_targets_to_generate.each do |pod_target|
+        pod_target.build_headers.implode_path!(pod_target.headers_sandbox)
+        sandbox.public_headers.implode_path!(pod_target.headers_sandbox)
+      end
 
       create_and_save_projects(pod_targets_to_generate, aggregate_targets_to_generate,
                                cache_analysis_result.build_configurations, cache_analysis_result.project_object_version)
@@ -441,23 +449,30 @@ module Pod
       end
     end
 
-    # @return [void] In this step we clean all the header folders for pod targets that will be
-    #         regenerated from scratch and cleanup any pods that have been removed.
+    # @return [void] Performs a general clean up of the sandbox related to the sandbox state that was
+    #                calculated. For example, pods that were marked for deletion are removed.
     #
-    def clean_sandbox(pod_targets)
-      pod_targets.each do |pod_target|
-        pod_target.build_headers.implode_path!(pod_target.headers_sandbox)
-        sandbox.public_headers.implode_path!(pod_target.headers_sandbox)
-      end
-
+    def clean_sandbox
       unless sandbox_state.deleted.empty?
         title_options = { :verbose_prefix => '-> '.red }
         sandbox_state.deleted.each do |pod_name|
           UI.titled_section("Removing #{pod_name}".red, title_options) do
-            sandbox.clean_pod(pod_name)
+            root_name = Specification.root_name(pod_name)
+            pod_dir = sandbox.local?(root_name) ? nil : sandbox.pod_dir(root_name)
+            sandbox.clean_pod(pod_name, pod_dir)
           end
         end
       end
+
+      # Check any changed pods that became local pods and used to be remote pods and
+      # ensure the sandbox is cleaned up.
+      unless sandbox_state.changed.empty?
+        sandbox_state.changed.each do |pod_name|
+          previous_spec_repo = sandbox.manifest.spec_repo(pod_name)
+          should_clean = !previous_spec_repo.nil? && sandbox.local?(pod_name)
+          sandbox.clean_pod(pod_name, sandbox.sources_root + Specification.root_name(pod_name)) if should_clean
+        end
+      end
     end
 
     # @raise [Informative] If there are any Podfile changes
@@ -488,26 +503,38 @@ module Pod
     # @return [void]
     #
     def install_pod_sources
+      @downloaded_specs = []
       @installed_specs = []
       pods_to_install = sandbox_state.added | sandbox_state.changed
       title_options = { :verbose_prefix => '-> '.green }
-      root_specs.sort_by(&:name).each do |spec|
-        if pods_to_install.include?(spec.name)
-          if sandbox_state.changed.include?(spec.name) && sandbox.manifest
-            current_version = spec.version
-            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 &&= (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}"
-            title << " (was #{previous_version} and source changed to `#{current_repo}` from `#{previous_spec_repo}`)" if has_changed_version && has_changed_repo
-            title << " (was #{previous_version})" if has_changed_version && !has_changed_repo
-            title << " (source changed to `#{current_repo}` from `#{previous_spec_repo}`)" if !has_changed_version && has_changed_repo
-          else
-            title = "Installing #{spec}"
+
+      sorted_root_specs = root_specs.sort_by(&:name)
+
+      # Download pods in parallel before installing if the option is set
+      if installation_options.parallel_pod_downloads
+        require 'concurrent/executor/fixed_thread_pool'
+        thread_pool_size = installation_options.parallel_pod_download_thread_pool_size
+        thread_pool = Concurrent::FixedThreadPool.new(thread_pool_size, :idletime => 300)
+
+        sorted_root_specs.each do |spec|
+          if pods_to_install.include?(spec.name)
+            title = section_title(spec, 'Downloading')
+            UI.titled_section(title.green, title_options) do
+              thread_pool.post do
+                download_source_of_pod(spec.name)
+              end
+            end
           end
+        end
+
+        thread_pool.shutdown
+        thread_pool.wait_for_termination
+      end
+
+      # Install pods, which includes downloading only if parallel_pod_downloads is set to false
+      sorted_root_specs.each do |spec|
+        if pods_to_install.include?(spec.name)
+          title = section_title(spec, 'Installing')
           UI.titled_section(title.green, title_options) do
             install_source_of_pod(spec.name)
           end
@@ -519,13 +546,32 @@ module Pod
       end
     end
 
+    def section_title(spec, current_action)
+      if sandbox_state.changed.include?(spec.name) && sandbox.manifest
+        current_version = spec.version
+        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 &&= (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 = "#{current_action} #{spec.name} #{spec.version}"
+        title << " (was #{previous_version} and source changed to `#{current_repo}` from `#{previous_spec_repo}`)" if has_changed_version && has_changed_repo
+        title << " (was #{previous_version})" if has_changed_version && !has_changed_repo
+        title << " (source changed to `#{current_repo}` from `#{previous_spec_repo}`)" if !has_changed_version && has_changed_repo
+      else
+        title = "#{current_action} #{spec}"
+      end
+      title
+    end
+
     def create_pod_installer(pod_name)
       specs_by_platform = specs_for_pod(pod_name)
 
       if specs_by_platform.empty?
         requiring_targets = pod_targets.select { |pt| pt.recursive_dependent_targets.any? { |dt| dt.pod_name == pod_name } }
         message = "Could not install '#{pod_name}' pod"
-        message += ", dependended upon by #{requiring_targets.to_sentence}" unless requiring_targets.empty?
+        message += ", depended upon by #{requiring_targets.to_sentence}" unless requiring_targets.empty?
         message += '. There is either no platform to build for, or no target to build.'
         raise StandardError, message
       end
@@ -535,6 +581,20 @@ module Pod
       pod_installer
     end
 
+    def create_pod_downloader(pod_name)
+      specs_by_platform = specs_for_pod(pod_name)
+
+      if specs_by_platform.empty?
+        requiring_targets = pod_targets.select { |pt| pt.recursive_dependent_targets.any? { |dt| dt.pod_name == pod_name } }
+        message = "Could not download '#{pod_name}' pod"
+        message += ", depended upon by #{requiring_targets.to_sentence}" unless requiring_targets.empty?
+        message += '. There is either no platform to build for, or no target to build.'
+        raise StandardError, message
+      end
+
+      PodSourceDownloader.new(sandbox, podfile, specs_by_platform, :can_cache => installation_options.clean?)
+    end
+
     # The specifications matching the specified pod name
     #
     # @param  [String] pod_name the name of the pod
@@ -562,8 +622,19 @@ module Pod
       @installed_specs.concat(pod_installer.specs_by_platform.values.flatten.uniq)
     end
 
-    # Cleans the sources of the Pods if the config instructs to do so.
+    # Download the pod unless it is local or has been predownloaded from an
+    # external source.
     #
+    # @return [void]
+    #
+    def download_source_of_pod(pod_name)
+      return if sandbox.local?(pod_name) || sandbox.predownloaded?(pod_name)
+
+      pod_downloader = create_pod_downloader(pod_name)
+      pod_downloader.download!
+    end
+
+    # Cleans the sources of the Pods if the config instructs to do so.
     #
     def clean_pod_sources
       return unless installation_options.clean?
@@ -627,6 +698,15 @@ module Pod
                         title_options)
     end
 
+    # Runs the registered callbacks for the plugins pre integrate hooks.
+    #
+    def run_plugins_pre_integrate_hooks
+      if any_plugin_pre_integrate_hooks?
+        context = PreIntegrateHooksContext.generate(sandbox, pods_project, pod_target_subprojects, aggregate_targets)
+        HooksManager.run(:pre_integrate, context, plugins)
+      end
+    end
+
     # Runs the registered callbacks for the plugins post install hooks.
     #
     def run_plugins_post_install_hooks
@@ -634,7 +714,7 @@ module Pod
       if any_plugin_post_install_hooks?
         unlock_pod_sources
 
-        context = PostInstallHooksContext.generate(sandbox, pods_project, aggregate_targets)
+        context = PostInstallHooksContext.generate(sandbox, pods_project, pod_target_subprojects, aggregate_targets)
         HooksManager.run(:post_install, context, plugins)
       end
 
@@ -645,11 +725,17 @@ module Pod
     #
     def run_plugins_post_integrate_hooks
       if any_plugin_post_integrate_hooks?
-        context = PostIntegrateHooksContext.generate(sandbox, pods_project, aggregate_targets)
+        context = PostIntegrateHooksContext.generate(sandbox, pods_project, pod_target_subprojects, aggregate_targets)
         HooksManager.run(:post_integrate, context, plugins)
       end
     end
 
+    # @return [Boolean] whether there are any plugin pre-integrate hooks to run
+    #
+    def any_plugin_pre_integrate_hooks?
+      HooksManager.hooks_to_run(:pre_integrate, plugins).any?
+    end
+
     # @return [Boolean] whether there are any plugin post-install hooks to run
     #
     def any_plugin_post_install_hooks?
@@ -747,7 +833,7 @@ module Pod
     def warn_for_installed_script_phases
       pods_to_install = sandbox_state.added | sandbox_state.changed
       pod_targets.group_by(&:pod_name).each do |name, pod_targets|
-        if pods_to_install.include?(name)
+        if pods_to_install.include?(name) && !sandbox.local?(name)
           script_phase_count = pod_targets.inject(0) { |sum, target| sum + target.script_phases.count }
           unless script_phase_count.zero?
             UI.warn "#{name} has added #{script_phase_count} #{'script phase'.pluralize(script_phase_count)}. " \
@@ -766,9 +852,11 @@ module Pod
     #
     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 }
+      plugin_sources = run_source_provider_hooks
+      all_sources = podfile.sources + plugin_sources.map(&:url)
+      master_source = all_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?
+      if 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.'
@@ -815,6 +903,7 @@ module Pod
       installation_cache.update_project_object_version!(cache_analysis_result.project_object_version)
       installation_cache.update_build_configurations!(cache_analysis_result.build_configurations)
       installation_cache.update_podfile_plugins!(plugins)
+      installation_cache.update_installation_options!(installation_options.to_h)
       installation_cache.save_as(sandbox.project_installation_cache_path)
 
       metadata_cache.update_metadata!(target_installation_results.pod_target_installation_results || {},
@@ -873,6 +962,33 @@ module Pod
         "\n\n#{e.message}\n\n#{e.backtrace * "\n"}"
     end
 
+    # Runs the pre integrate hooks of the installed specs and of the Podfile.
+    #
+    # @note   Pre integrate hooks run _before_ generation of the Pods project.
+    #
+    # @return [void]
+    #
+    def run_podfile_pre_integrate_hooks
+      UI.message '- Running pre integrate hooks' do
+        executed = run_podfile_pre_integrate_hook
+        UI.message '- Podfile' if executed
+      end
+    end
+
+    # Runs the pre integrate hook of the Podfile.
+    #
+    # @raise  Raises an informative if the hooks raises.
+    #
+    # @return [Boolean] Whether the hook was run.
+    #
+    def run_podfile_pre_integrate_hook
+      podfile.pre_integrate!(self)
+    rescue => e
+      raise Informative, 'An error occurred while processing the pre-integrate ' \
+        'hook of the Podfile.' \
+        "\n\n#{e.message}\n\n#{e.backtrace * "\n"}"
+    end
+
     # Runs the post install hooks of the installed specs and of the Podfile.
     #
     # @note   Post install hooks run _before_ saving of project, so that they

data/lib/cocoapods/native_target_extension.rb

@@ -43,7 +43,7 @@ module Pod
     # @param  [TargetMetadata] cached_target
     #         the target to search for.
     #
-    # @return [Bool]
+    # @return [Boolean]
     #
     def self.dependency_for_cached_target?(sandbox, target, cached_target)
       target.dependencies.find do |dep|

data/lib/cocoapods/open-uri.rb

@@ -24,7 +24,7 @@ module OpenURI
   # @param [URI::Generic] uri2
   #        the target uri where to where the redirect points to
   #
-  # @return [Bool]
+  # @return [Boolean]
   #
   def self.redirectable?(uri1, uri2)
     uri1.scheme.downcase == uri2.scheme.downcase ||

data/lib/cocoapods/project.rb

@@ -26,7 +26,7 @@ module Pod
     #
     attr_reader :dependencies_group
 
-    # @return [Bool] Bool indicating if this project is a pod target subproject.
+    # @return [Boolean] Bool indicating if this project is a pod target subproject.
     # Used by `generate_multiple_pod_projects` installation option.
     #
     attr_reader :pod_target_subproject
@@ -39,7 +39,7 @@ module Pod
     # Initialize a new instance
     #
     # @param  [Pathname, String] path @see Xcodeproj::Project#path
-    # @param  [Bool] skip_initialization Whether the project should be initialized from scratch.
+    # @param  [Boolean] skip_initialization Whether the project should be initialized from scratch.
     # @param  [Int] object_version Object version to use for serialization, defaults to Xcode 3.2 compatible.
     #
     def initialize(path, skip_initialization = false,
@@ -107,10 +107,10 @@ module Pod
     # @param  [#to_s] path
     #         The path to the root of the Pod.
     #
-    # @param  [Bool] development
+    # @param  [Boolean] development
     #         Whether the group should be added to the Development Pods group.
     #
-    # @param  [Bool] absolute
+    # @param  [Boolean] absolute
     #         Whether the path of the group should be set as absolute.
     #
     # @return [PBXGroup] The new group.
@@ -136,7 +136,7 @@ module Pod
     # @param [Project] project
     #        The subproject to be added.
     #
-    # @param [Bool] development
+    # @param [Boolean] development
     #        Whether the project should be added to the Development Pods group.
     #        For projects where `pod_target_subproject` is enabled, all subprojects are added into the Dependencies group.
     #
@@ -156,7 +156,7 @@ module Pod
     # @param [TargetMetadata] metadata
     #        The project metadata to be added.
     #
-    # @param [Bool] development
+    # @param [Boolean] development
     #        Whether the project should be added to the Development Pods group.
     #        For projects where `pod_target_subproject` is enabled, all subprojects are added into the Dependencies group.
     #
@@ -253,7 +253,7 @@ module Pod
     # @param  [PBXGroup] group
     #         The group for the new file reference.
     #
-    # @param  [Bool] reflect_file_system_structure
+    # @param  [Boolean] reflect_file_system_structure
     #         Whether group structure should reflect the file system structure.
     #         If yes, where needed, intermediate groups are created, similar to
     #         how mkdir -p operates.
@@ -430,7 +430,7 @@ module Pod
     # @param  [PBXGroup] group
     #         The parent group used as the base of the relative path.
     #
-    # @param  [Bool] reflect_file_system_structure
+    # @param  [Boolean] reflect_file_system_structure
     #         Whether group structure should reflect the file system structure.
     #         If yes, where needed, intermediate groups are created, similar to
     #         how mkdir -p operates.

data/lib/cocoapods/resolver/resolver_specification.rb

@@ -12,7 +12,7 @@ module Pod
       #
       attr_reader :source
 
-      # @return [Bool] whether this resolved specification is used by non-library targets.
+      # @return [Boolean] whether this resolved specification is used by non-library targets.
       #
       attr_reader :used_by_non_library_targets_only
       alias used_by_non_library_targets_only? used_by_non_library_targets_only

data/lib/cocoapods/resolver.rb

@@ -34,7 +34,7 @@ module Pod
     #
     attr_reader :sources
 
-    # @return [Bool] Whether the resolver has sources repositories up-to-date.
+    # @return [Boolean] Whether the resolver has sources repositories up-to-date.
     #
     attr_reader :specs_updated
     alias specs_updated? specs_updated
@@ -162,9 +162,8 @@ module Pod
                                     Array(@podfile_requirements_by_root_name[dependency.root_name])
                                   end
 
-        specifications_for_dependency(dependency, additional_requirements)
+        specifications_for_dependency(dependency, additional_requirements).freeze
       end
-      @search[dependency].dup
     end
 
     # Returns the dependencies of `specification`.
@@ -175,8 +174,9 @@ module Pod
     #         dependencies are being asked for.
     #
     def dependencies_for(specification)
+      root_name = Specification.root_name(specification.name)
       specification.all_dependencies.map do |dependency|
-        if dependency.root_name == Specification.root_name(specification.name)
+        if dependency.root_name == root_name
           dependency.dup.tap { |d| d.specific_version = specification.version }
         else
           dependency
@@ -264,7 +264,7 @@ module Pod
     # @param  [{String => Array<Conflict>}] conflicts the current conflicts.
     #
     def sort_dependencies(dependencies, activated, conflicts)
-      dependencies.sort_by do |dependency|
+      dependencies.sort_by! do |dependency|
         name = name_for(dependency)
         [
           activated.vertex_named(name).payload ? 0 : 1,
@@ -531,7 +531,7 @@ You have either:#{specs_update_message}
     #
     # @param  [Specification] spec
     #
-    # @return [Bool]
+    # @return [Boolean]
     #
     def spec_is_platform_compatible?(dependency_graph, dependency, spec)
       # This is safe since a pod will only be in locked dependencies if we're
@@ -575,7 +575,7 @@ You have either:#{specs_update_message}
     # Whether the given `edge` should be followed to find dependencies for the
     # given `target_platform`.
     #
-    # @return [Bool]
+    # @return [Boolean]
     #
     def edge_is_valid_for_target_platform?(edge, target_platform)
       @edge_validity ||= Hash.new do |hash, edge_and_platform|

data/lib/cocoapods/sandbox/file_accessor.rb

@@ -128,6 +128,7 @@ module Pod
       #
       def public_headers(include_frameworks = false)
         public_headers = public_header_files
+        project_headers = project_header_files
         private_headers = private_header_files
         if public_headers.nil? || public_headers.empty?
           header_files = headers
@@ -135,7 +136,13 @@ module Pod
           header_files = public_headers
         end
         header_files += vendored_frameworks_headers if include_frameworks
-        header_files - private_headers
+        header_files - project_headers - private_headers
+      end
+
+      # @return [Array<Pathname>] The project headers of the specification.
+      #
+      def project_headers
+        project_header_files
       end
 
       # @return [Array<Pathname>] The private headers of the specification.
@@ -172,6 +179,24 @@ module Pod
         end
       end
 
+      # @return [Array<Pathname>] The paths of the static xcframework bundles
+      #         that come shipped with the Pod.
+      #
+      def vendored_static_xcframeworks
+        vendored_xcframeworks.select do |path|
+          Xcode::XCFramework.new(spec.name, path).build_type == BuildType.static_framework
+        end
+      end
+
+      # @return [Array<Pathname>] The paths of the dynamic xcframework bundles
+      #         that come shipped with the Pod.
+      #
+      def vendored_dynamic_xcframeworks
+        vendored_xcframeworks.select do |path|
+          Xcode::XCFramework.new(spec.name, path).build_type == BuildType.dynamic_framework
+        end
+      end
+
       # @return [Array<Pathname>] The paths of the static (fake) framework
       #         bundles that come shipped with the Pod.
       #
@@ -191,7 +216,7 @@ module Pod
       # @param [Array<FileAccessor>] file_accessors
       #        The list of all file accessors to compute.
       #
-      # @return [Array<String>] The list of all file accessors that a target will integrate into the project.
+      # @return [Array<Pathname>] The list of all file accessors that a target will integrate into the project.
       #
       def self.all_files(file_accessors)
         files = [
@@ -203,10 +228,11 @@ module Pod
           file_accessors.map(&:preserve_paths),
           file_accessors.map(&:readme),
           file_accessors.map(&:resources),
+          file_accessors.map(&:on_demand_resources_files),
           file_accessors.map(&:source_files),
           file_accessors.map(&:module_map),
         ]
-        files.flatten.compact.map(&:to_s).uniq
+        files.flatten.compact.uniq
       end
 
       # @param  [Pathname] framework
@@ -229,14 +255,17 @@ module Pod
         Pathname.glob(headers_dir + '**/' + GLOB_PATTERNS[:public_header_files])
       end
 
-      # @param [Pathname] framework
+      # @param [String] target_name
+      #         The target name this .xcframework belongs to
+      #
+      # @param [Pathname] framework_path
       #         The path to the .xcframework
       #
       # @return [Array<Pathname>] The paths to all the headers included in the
       #         vendored xcframework
       #
-      def self.vendored_xcframework_headers(framework)
-        xcframework = Xcode::XCFramework.new(framework)
+      def self.vendored_xcframework_headers(target_name, framework_path)
+        xcframework = Xcode::XCFramework.new(target_name, framework_path)
         xcframework.slices.flat_map do |slice|
           vendored_frameworks_headers(slice.path)
         end
@@ -250,7 +279,7 @@ module Pod
           self.class.vendored_frameworks_headers(framework)
         end.uniq
         paths.concat Array.new(vendored_xcframeworks.flat_map do |framework|
-          self.class.vendored_xcframework_headers(framework)
+          self.class.vendored_xcframework_headers(spec.name, framework)
         end)
         paths
       end
@@ -289,7 +318,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
@@ -314,6 +343,26 @@ module Pod
         resource_bundles.values.flatten
       end
 
+      # @return [Hash{String => Hash] The expanded paths of the on demand resources specified
+      #         keyed by their tag including their category.
+      #
+      def on_demand_resources
+        result = {}
+        spec_consumer.on_demand_resources.each do |tag_name, file_patterns|
+          paths = expanded_paths(file_patterns[:paths],
+                                 :exclude_patterns => spec_consumer.exclude_files,
+                                 :include_dirs => true)
+          result[tag_name] = { :paths => paths, :category => file_patterns[:category] }
+        end
+        result
+      end
+
+      # @return [Array<Pathname>] The expanded paths of the on demand resources.
+      #
+      def on_demand_resources_files
+        on_demand_resources.values.flat_map { |v| v[:paths] }
+      end
+
       # @return [Pathname] The of the prefix header file of the specification.
       #
       def prefix_header
@@ -322,7 +371,7 @@ module Pod
         end
       end
 
-      # @return [Pathname] The path of the auto-detected README file.
+      # @return [Pathname, nil] The path of the auto-detected README file.
       #
       def readme
         path_list.glob([GLOB_PATTERNS[:readme]]).first
@@ -404,7 +453,14 @@ module Pod
         paths_for_attribute(:public_header_files)
       end
 
-      # @return [Array<Pathname>] The paths of the user-specified public header
+      # @return [Array<Pathname>] The paths of the user-specified project header
+      #         files.
+      #
+      def project_header_files
+        paths_for_attribute(:project_header_files)
+      end
+
+      # @return [Array<Pathname>] The paths of the user-specified private header
       #         files.
       #
       def private_header_files
@@ -457,7 +513,7 @@ module Pod
       # @option options [Array<String>] :exclude_patterns
       #         The exclude patterns to pass to the PathList.
       #
-      # @option options [Bool] :include_dirs
+      # @option options [Boolean] :include_dirs
       #         Whether directories should be also included or just plain
       #         files.
       #

data/lib/cocoapods/sandbox/headers_store.rb

@@ -51,7 +51,9 @@ module Pod
       #
       def search_paths(platform, target_name = nil, use_modular_headers = false)
         key = SEARCH_PATHS_KEY.new(platform.name, target_name, use_modular_headers)
-        return @search_paths_cache[key] if @search_paths_cache.key?(key)
+        if (cached = @search_paths_cache[key])
+          return cached
+        end
         search_paths = @search_paths.select do |entry|
           matches_platform = entry[:platform] == platform.name
           matches_target = target_name.nil? || (File.basename(entry[:path]) == target_name)