cocoapods 1.10.2 → 1.11.0.beta.1

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

@@ -79,12 +79,12 @@ module Pod
           # @param  [Specification] spec
           #         The specification to base from in order to find the native target.
           #
-          # @return [PBXNativeTarget] the native target to use or `nil` if none is found.
+          # @return [PBXNativeTarget, Nil] the native target to use or `nil` if none is found.
           #
           def native_target_for_spec(spec)
             return native_target if spec.library_specification?
             return test_native_target_from_spec(spec) if spec.test_specification?
-            return app_native_target_from_spec(spec) if spec.app_specification?
+            app_native_target_from_spec(spec) if spec.app_specification?
           end
 
           # @return [Hash{PBXNativeTarget => Specification}] a hash where the keys are the test native targets and the value

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

@@ -56,11 +56,8 @@ module Pod
             name = target.label
             platform = target.platform.name
             language = target.uses_swift? ? :swift : :objc
-            native_target = project.new_target(product_type, name, platform, deployment_target, nil, language)
-
-            product_name = target.product_name
-            product = native_target.product_reference
-            product.name = product_name
+            native_target = project.new_target(product_type, name, platform, deployment_target, nil, language, target.product_basename)
+            native_target.product_reference.name = name
 
             target.user_build_configurations.each do |bc_name, type|
               native_target.add_build_configuration(bc_name, type)

data/lib/cocoapods/resolver.rb

@@ -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,

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.
@@ -177,7 +184,7 @@ module Pod
       #
       def vendored_static_xcframeworks
         vendored_xcframeworks.select do |path|
-          Xcode::XCFramework.new(path).build_type == BuildType.static_framework
+          Xcode::XCFramework.new(spec.name, path).build_type == BuildType.static_framework
         end
       end
 
@@ -200,7 +207,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 = [
@@ -212,10 +219,11 @@ module Pod
           file_accessors.map(&:preserve_paths),
           file_accessors.map(&:readme),
           file_accessors.map(&:resources),
+          file_accessors.flat_map { |f| f.on_demand_resources.values.flatten },
           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
@@ -238,14 +246,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
@@ -259,7 +270,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
@@ -323,6 +334,20 @@ module Pod
         resource_bundles.values.flatten
       end
 
+      # @return [Hash{String => Array<Pathname>}] The paths of the on demand resources specified
+      #         keyed by their tag.
+      #
+      def on_demand_resources
+        result = {}
+        spec_consumer.on_demand_resources.each do |tag_name, file_patterns|
+          paths = expanded_paths(file_patterns,
+                                 :exclude_patterns => spec_consumer.exclude_files,
+                                 :include_dirs => true)
+          result[tag_name] = paths
+        end
+        result
+      end
+
       # @return [Pathname] The of the prefix header file of the specification.
       #
       def prefix_header
@@ -331,7 +356,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
@@ -413,7 +438,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

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)

data/lib/cocoapods/sandbox/path_list.rb

@@ -23,7 +23,7 @@ module Pod
       # @param  [Pathname] root @see #root
       #
       def initialize(root)
-        root_dir = ActiveSupport::Multibyte::Unicode.normalize(root.to_s)
+        root_dir = root.to_s.unicode_normalize(:nfkc)
         @root = Pathname.new(root_dir)
         @glob_cache = {}
       end

data/lib/cocoapods/sandbox/pod_dir_cleaner.rb

@@ -64,7 +64,7 @@ module Pod
       #         specifications (according to their platform) of this Pod.
       #
       def used_files
-        FileAccessor.all_files(file_accessors)
+        FileAccessor.all_files(file_accessors).map(&:to_s)
       end
     end
   end

data/lib/cocoapods/sources_manager.rb

@@ -1,4 +1,5 @@
 require 'cocoapods-core/source'
+require 'cocoapods/open-uri'
 require 'netrc'
 require 'set'
 require 'rest'
@@ -70,15 +71,20 @@ module Pod
       #         The URL of the source.
       #
       def cdn_url?(url)
-        if url =~ %r{^https?:\/\/}
-          require 'typhoeus'
+        return unless url =~ %r{^https?:\/\/}
 
-          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
-            response_hash.is_a?(Hash) && !Source::Metadata.new(response_hash).latest_cocoapods_version.nil?
-          end
-        end
+        uri_options = {}
+
+        netrc_info = Netrc.read
+        netrc_host = URI.parse(url).host
+        credentials = netrc_info[netrc_host]
+        uri_options[:http_basic_authentication] = credentials if credentials
+
+        response = OpenURI.open_uri(url.chomp('/') + '/CocoaPods-version.yml', uri_options)
+        response_hash = YAML.load(response.read) # rubocop:disable Security/YAMLLoad
+        response_hash.is_a?(Hash) && !Source::Metadata.new(response_hash).latest_cocoapods_version.nil?
+      rescue ::OpenURI::HTTPError, SocketError
+        return false
       rescue => e
         raise Informative, "Couldn't determine repo type for URL: `#{url}`: #{e}"
       end

data/lib/cocoapods/target/aggregate_target.rb

@@ -225,6 +225,12 @@ module Pod
       !resource_paths_by_config.each_value.all?(&:empty?)
     end
 
+    # @return [Boolean] Whether the target contains any on demand resources
+    #
+    def includes_on_demand_resources?
+      !on_demand_resources.empty?
+    end
+
     # @return [Boolean] Whether the target contains frameworks to be embedded into
     #         the user target
     #
@@ -273,6 +279,20 @@ module Pod
       end
     end
 
+    # @return [Array<Pathname>] Uniqued On Demand Resources for this target.
+    #
+    # @note On Demand Resources are not separated by config as they are integrated directly into the users target via
+    # the resources build phase.
+    #
+    def on_demand_resources
+      @on_demand_resources ||= begin
+        pod_targets.flat_map do |pod_target|
+          library_file_accessors = pod_target.file_accessors.select { |fa| fa.spec.library_specification? }
+          library_file_accessors.flat_map { |fa| fa.on_demand_resources.values.flatten }
+        end.uniq
+      end
+    end
+
     # @return [Hash{String => Array<String>}] Uniqued Resources grouped by config
     #
     def resource_paths_by_config
@@ -292,7 +312,9 @@ module Pod
                 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
+                  output_path_components = Pathname(resource_path).each_filename.select { |component| File.extname(component) == '.lproj' }
+                  output_path_components << File.basename(resource_path)
+                  built_product_dir.join(*output_path_components).sub_ext(output_extname).to_s
                 else
                   resource_path
                 end

data/lib/cocoapods/target/build_settings.rb

@@ -140,12 +140,12 @@ module Pod
       end
       private_class_method :define_build_settings_method
 
-      # @param [XCFramework] xcframework the xcframework thats slice will be copied to the intermediates dir
+      # @param [XCFramework] xcframework the xcframework slice that 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}"
+        "#{XCFRAMEWORKS_BUILD_DIR_VARIABLE}/#{xcframework.target_name}"
       end
 
       class << self
@@ -346,18 +346,26 @@ module Pod
       #
       # @param [Boolean] test_bundle
       #
-      def _ld_runpath_search_paths(requires_host_target: false, test_bundle: false)
+      def _ld_runpath_search_paths(requires_host_target: false, test_bundle: false, uses_swift: false)
+        paths = []
+        if uses_swift
+          paths << '/usr/lib/swift'
+          paths << '$(PLATFORM_DIR)/Developer/Library/Frameworks' if test_bundle
+        end
         if target.platform.symbolic_name == :osx
-          ["'@executable_path/../Frameworks'",
-           test_bundle ? "'@loader_path/../Frameworks'" : "'@loader_path/Frameworks'"]
+          paths << "'@executable_path/../Frameworks'"
+          paths << if test_bundle
+                     "'@loader_path/../Frameworks'"
+                   else
+                     "'@loader_path/Frameworks'"
+                   end
+          paths << '${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}' if uses_swift
         else
-          paths = [
-            "'@executable_path/Frameworks'",
-            "'@loader_path/Frameworks'",
-          ]
+          paths << "'@executable_path/Frameworks'"
+          paths << "'@loader_path/Frameworks'"
           paths << "'@executable_path/../../Frameworks'" if requires_host_target
-          paths
         end
+        paths
       end
       private :_ld_runpath_search_paths
 
@@ -500,12 +508,14 @@ module Pod
         pod_targets - subset_targets
       end
 
+      # @param  [String] target_name the name of the target this xcframework belongs to
+      #
       # @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)
+      def load_xcframework(target_name, path)
+        Xcode::XCFramework.new(target_name, path)
       end
 
       # A subclass that generates build settings for a {PodTarget}
@@ -616,9 +626,15 @@ module Pod
                 select { |xcf| xcf.build_type.static_framework? }.
                 map(&:name).
                 uniq
+
+              # Include direct dynamic dependencies to the linker flags. We used to add those in the 'Link Binary With Libraries'
+              # phase but we no longer do since we cannot differentiate between debug or release configurations within
+              # that phase.
+              frameworks.concat target.dependent_targets_by_config[@configuration].flat_map { |pt| pt.build_settings[@configuration].dynamic_frameworks_to_import }
+            else
+              # 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 }
             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 }
           else
             frameworks.concat dependent_targets_to_link.flat_map { |pt| pt.build_settings[@configuration].frameworks_to_import }
           end
@@ -721,7 +737,9 @@ module Pod
 
         # @return [Array<Xcode::XCFramework>]
         define_build_settings_method :vendored_xcframeworks, :memoized => true do
-          file_accessors.flat_map(&:vendored_xcframeworks).map { |path| load_xcframework(path) }
+          file_accessors.flat_map do |file_accessor|
+            file_accessor.vendored_xcframeworks.map { |path| load_xcframework(file_accessor.spec.name, path) }
+          end
         end
 
         # @return [Array<String>]
@@ -840,10 +858,15 @@ module Pod
 
         # @return [Array<String>]
         define_build_settings_method :library_search_paths_to_import, :memoized => true do
-          vendored_library_search_paths = vendored_static_library_search_paths + vendored_dynamic_library_search_paths
-          return vendored_library_search_paths if target.build_as_framework? || !target.should_build?
+          search_paths = vendored_static_library_search_paths + vendored_dynamic_library_search_paths
+          if target.uses_swift? || other_swift_flags_without_swift?
+            search_paths << '/usr/lib/swift'
+            search_paths << '${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}'
+            search_paths << '$(PLATFORM_DIR)/Developer/Library/Frameworks' if test_xcconfig?
+          end
+          return search_paths if target.build_as_framework? || !target.should_build?
 
-          vendored_library_search_paths << target.configuration_build_dir(CONFIGURATION_BUILD_DIR_VARIABLE)
+          search_paths << target.configuration_build_dir(CONFIGURATION_BUILD_DIR_VARIABLE)
         end
 
         #-------------------------------------------------------------------------#
@@ -948,7 +971,8 @@ module Pod
         # @return [Array<String>]
         define_build_settings_method :ld_runpath_search_paths, :build_setting => true, :memoized => true do
           return if library_xcconfig?
-          _ld_runpath_search_paths(:test_bundle => test_xcconfig?)
+          _ld_runpath_search_paths(:test_bundle => test_xcconfig?,
+                                   :uses_swift => other_swift_flags_without_swift? || dependent_targets.any?(&:uses_swift?))
         end
 
         #-------------------------------------------------------------------------#
@@ -1251,7 +1275,8 @@ module Pod
           return unless pod_targets.any?(&:build_as_dynamic?) || any_vendored_dynamic_artifacts?
           symbol_type = target.user_targets.map(&:symbol_type).uniq.first
           test_bundle = symbol_type == :octest_bundle || symbol_type == :unit_test_bundle || symbol_type == :ui_test_bundle
-          _ld_runpath_search_paths(:requires_host_target => target.requires_host_target?, :test_bundle => test_bundle)
+          _ld_runpath_search_paths(:requires_host_target => target.requires_host_target?, :test_bundle => test_bundle,
+                                   :uses_swift => pod_targets.any?(&:uses_swift?))
         end
 
         # @return [Boolean]

data/lib/cocoapods/target/pod_target.rb

@@ -203,7 +203,7 @@ module Pod
       end
     end
 
-    # @return [Array<FileAccessor>] The list of all files tracked.
+    # @return [Array<String>] The list of all files tracked.
     #
     def all_files
       Sandbox::FileAccessor.all_files(file_accessors)
@@ -268,6 +268,23 @@ module Pod
       root_spec.module_name
     end
 
+    # @param [Specification] spec the specification
+    #
+    # @return [String] the product basename of the specification's target
+    def product_basename_for_spec(spec)
+      user_specified = build_settings_by_config_for_spec(spec).
+                       each_value.
+                       map { |settings| settings.merged_pod_target_xcconfigs['PRODUCT_NAME'] }.
+                       compact.
+                       uniq
+
+      if user_specified.size == 1
+        user_specified.first
+      else
+        spec_label(spec)
+      end
+    end
+
     # @return [Bool] Whether or not this target should be built.
     #
     # A target should not be built if it has no source files.
@@ -294,22 +311,26 @@ module Pod
       test_specs.map { |test_spec| test_spec.consumer(platform) }
     end
 
-    # @return [Array<Specification::Consumer>] the test specification consumers for
+    # @return [Array<Specification::Consumer>] the app specification consumers for
     #         the target.
     #
     def app_spec_consumers
       app_specs.map { |app_spec| app_spec.consumer(platform) }
     end
 
-    # @return [Boolean] Whether the target uses Swift code. This excludes source files from non library specs.
+    # Checks whether the target itself plus its specs uses Swift code.
+    # This check excludes source files from non library specs.
+    # Note that if a target does not need to be built (no source code),
+    # we fallback to check whether it indicates a swift version.
+    #
+    # @return [Boolean] Whether the target uses Swift code.
     #
     def uses_swift?
       return @uses_swift if defined? @uses_swift
-      @uses_swift = begin
+      @uses_swift = (!should_build? && !spec_swift_versions.empty?) ||
         file_accessors.select { |a| a.spec.library_specification? }.any? do |file_accessor|
           uses_swift_for_spec?(file_accessor.spec)
         end
-      end
     end
 
     # Checks whether a specification uses Swift or not.
@@ -373,7 +394,7 @@ module Pod
       !test_specs.empty?
     end
 
-    # @return [Boolean] Whether the target has any tests specifications.
+    # @return [Boolean] Whether the target has any app specifications.
     #
     def contains_app_specifications?
       !app_specs.empty?
@@ -422,7 +443,7 @@ module Pod
       @xcframeworks ||= begin
         file_accessors.each_with_object({}) do |file_accessor, hash|
           frameworks = file_accessor.vendored_xcframeworks.map do |framework_path|
-            Xcode::XCFramework.new(framework_path)
+            Xcode::XCFramework.new(file_accessor.spec.name, framework_path)
           end
           hash[file_accessor.spec.name] = frameworks
         end
@@ -455,7 +476,7 @@ module Pod
           prefix = Pod::Target::BuildSettings::CONFIGURATION_BUILD_DIR_VARIABLE
           prefix = configuration_build_dir unless file_accessor.spec.test_specification?
           resource_bundle_paths = file_accessor.resource_bundles.keys.map { |name| "#{prefix}/#{name.shellescape}.bundle" }
-          hash[file_accessor.spec.name] = resource_paths + resource_bundle_paths
+          hash[file_accessor.spec.name] = (resource_paths + resource_bundle_paths).map(&:to_s)
         end
       end
     end
@@ -512,7 +533,7 @@ module Pod
     # @return [Specification] The root specification for the target.
     #
     def root_spec
-      specs.first.root
+      @root_spec ||= specs.first.root
     end
 
     # @return [String] The name of the Pod that this target refers to.
@@ -619,13 +640,16 @@ module Pod
       end
     end
 
-    def non_library_spec_label(spec)
+    def spec_label(spec)
       case spec.spec_type
+      when :library then label
       when :test then test_target_label(spec)
       when :app then app_target_label(spec)
       else raise ArgumentError, "Unhandled spec type #{spec.spec_type.inspect} for #{spec.inspect}"
       end
     end
+    # for backwards compatibility
+    alias non_library_spec_label spec_label
 
     # @param  [Specification] spec
     #         The spec to return scheme configuration for.
@@ -645,7 +669,7 @@ module Pod
     # @return [Pathname] The absolute path of the copy resources script for the given spec.
     #
     def copy_resources_script_path_for_spec(spec)
-      support_files_dir + "#{non_library_spec_label(spec)}-resources.sh"
+      support_files_dir + "#{spec_label(spec)}-resources.sh"
     end
 
     # @param  [Specification] spec
@@ -654,7 +678,7 @@ module Pod
     # @return [Pathname] The absolute path of the copy resources script input file list for the given spec.
     #
     def copy_resources_script_input_files_path_for_spec(spec)
-      support_files_dir + "#{non_library_spec_label(spec)}-resources-input-files.xcfilelist"
+      support_files_dir + "#{spec_label(spec)}-resources-input-files.xcfilelist"
     end
 
     # @param  [Specification] spec
@@ -663,7 +687,7 @@ module Pod
     # @return [Pathname] The absolute path of the copy resources script output file list for the given spec.
     #
     def copy_resources_script_output_files_path_for_spec(spec)
-      support_files_dir + "#{non_library_spec_label(spec)}-resources-output-files.xcfilelist"
+      support_files_dir + "#{spec_label(spec)}-resources-output-files.xcfilelist"
     end
 
     # @param  [Specification] spec
@@ -672,7 +696,7 @@ module Pod
     # @return [Pathname] The absolute path of the embed frameworks script for the given spec.
     #
     def embed_frameworks_script_path_for_spec(spec)
-      support_files_dir + "#{non_library_spec_label(spec)}-frameworks.sh"
+      support_files_dir + "#{spec_label(spec)}-frameworks.sh"
     end
 
     # @param  [Specification] spec
@@ -681,7 +705,7 @@ module Pod
     # @return [Pathname] The absolute path of the embed frameworks script input file list for the given spec.
     #
     def embed_frameworks_script_input_files_path_for_spec(spec)
-      support_files_dir + "#{non_library_spec_label(spec)}-frameworks-input-files.xcfilelist"
+      support_files_dir + "#{spec_label(spec)}-frameworks-input-files.xcfilelist"
     end
 
     # @param  [Specification] spec
@@ -690,7 +714,7 @@ module Pod
     # @return [Pathname] The absolute path of the embed frameworks script output file list for the given spec.
     #
     def embed_frameworks_script_output_files_path_for_spec(spec)
-      support_files_dir + "#{non_library_spec_label(spec)}-frameworks-output-files.xcfilelist"
+      support_files_dir + "#{spec_label(spec)}-frameworks-output-files.xcfilelist"
     end
 
     # @return [Pathname] The absolute path of the copy xcframeworks script.
@@ -721,7 +745,7 @@ module Pod
     # @todo Remove in 2.0
     #
     def prepare_artifacts_script_path_for_spec(spec)
-      support_files_dir + "#{non_library_spec_label(spec)}-artifacts.sh"
+      support_files_dir + "#{spec_label(spec)}-artifacts.sh"
     end
 
     # @param  [Specification] spec
@@ -734,7 +758,7 @@ module Pod
     # @todo Remove in 2.0
     #
     def prepare_artifacts_script_input_files_path_for_spec(spec)
-      support_files_dir + "#{non_library_spec_label(spec)}-artifacts-input-files.xcfilelist"
+      support_files_dir + "#{spec_label(spec)}-artifacts-input-files.xcfilelist"
     end
 
     # @param  [Specification] spec
@@ -747,7 +771,7 @@ module Pod
     # @todo Remove in 2.0
     #
     def prepare_artifacts_script_output_files_path_for_spec(spec)
-      support_files_dir + "#{non_library_spec_label(spec)}-artifacts-output-files.xcfilelist"
+      support_files_dir + "#{spec_label(spec)}-artifacts-output-files.xcfilelist"
     end
 
     # @return [Pathname] The absolute path of the copy dSYMs script.
@@ -774,7 +798,7 @@ module Pod
     # @return [Pathname] The absolute path of the Info.plist for the given spec.
     #
     def info_plist_path_for_spec(spec)
-      support_files_dir + "#{non_library_spec_label(spec)}-Info.plist"
+      support_files_dir + "#{spec_label(spec)}-Info.plist"
     end
 
     # @param  [Specification] spec
@@ -783,7 +807,7 @@ module Pod
     # @return [Pathname] the absolute path of the prefix header file for the given spec.
     #
     def prefix_header_path_for_spec(spec)
-      support_files_dir + "#{non_library_spec_label(spec)}-prefix.pch"
+      support_files_dir + "#{spec_label(spec)}-prefix.pch"
     end
 
     # @return [Array<String>] The names of the Pods on which this target
@@ -1054,7 +1078,8 @@ module Pod
     #
     def uses_modular_headers?(only_if_defines_modules = true)
       return false if only_if_defines_modules && !defines_module?
-      spec_consumers.none?(&:header_mappings_dir) && spec_consumers.none?(&:header_dir)
+      return @uses_modular_headers if defined? @uses_modular_headers
+      @uses_modular_headers = spec_consumers.none?(&:header_mappings_dir) && spec_consumers.none?(&:header_dir)
     end
 
     private