cocoapods 1.10.0.rc.1 → 1.11.0.beta.1

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

@@ -34,6 +34,7 @@ module Pod
               target_installation_result.non_library_specs_by_native_target.each do |native_target, spec|
                 add_embed_frameworks_script_phase(native_target, spec)
                 add_copy_resources_script_phase(native_target, spec)
+                add_on_demand_resources(native_target, spec) if spec.app_specification?
                 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)
@@ -134,20 +135,26 @@ module Pod
               spec_paths_to_include << spec.name if dependent_target == target
               dependent_target.framework_paths.values_at(*spec_paths_to_include).flatten.compact
             end.uniq
+            xcframework_paths = 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
 
-            if use_input_output_paths? && !framework_paths.empty?
+            if use_input_output_paths? && !framework_paths.empty? || !xcframework_paths.empty?
               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_by_config[input_paths_key] = [script_path] + UserProjectIntegrator::TargetIntegrator.embed_frameworks_input_paths(framework_paths, [])
+              input_paths_by_config[input_paths_key] = [script_path] + UserProjectIntegrator::TargetIntegrator.embed_frameworks_input_paths(framework_paths, xcframework_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.embed_frameworks_output_paths(framework_paths, [])
+              output_paths_by_config[output_paths_key] = UserProjectIntegrator::TargetIntegrator.embed_frameworks_output_paths(framework_paths, xcframework_paths)
             end
 
-            if framework_paths.empty?
+            if framework_paths.empty? && xcframework_paths.empty?
               UserProjectIntegrator::TargetIntegrator.remove_embed_frameworks_script_phase_from_target(native_target)
             else
               UserProjectIntegrator::TargetIntegrator.create_or_update_embed_frameworks_script_phase_to_target(
@@ -183,7 +190,7 @@ module Pod
               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] = xcframeworks.map do |xcf|
-                "#{Target::BuildSettings::XCFRAMEWORKS_BUILD_DIR_VARIABLE}/#{xcf.name}"
+                "#{Target::BuildSettings::XCFRAMEWORKS_BUILD_DIR_VARIABLE}/#{xcf.target_name}/#{xcf.name}.framework"
               end
             end
 
@@ -199,7 +206,7 @@ module Pod
           # vendored dSYMs.
           #
           # @param [PBXNativeTarget] native_target
-          #         the native target for which to add the the copy dSYM files build phase.
+          #         the native target for which to add the copy dSYM files build phase.
           #
           # @return [void]
           #
@@ -242,6 +249,41 @@ module Pod
             UserProjectIntegrator::TargetIntegrator.set_input_output_paths(phase, input_paths_by_config, output_paths_by_config)
           end
 
+          # Adds the ODRs that are related to this app spec. This includes the app spec dependencies as well as the ODRs
+          # coming from the app spec itself.
+          #
+          # @param [Xcodeproj::PBXNativeTarget] native_target
+          #         the native target for which to add the ODR file references into.
+          #
+          # @param [Specification] app_spec
+          #         the app spec to integrate ODRs for.
+          #
+          # @return [void]
+          #
+          def add_on_demand_resources(native_target, app_spec)
+            dependent_targets = target.dependent_targets_for_app_spec(app_spec)
+            parent_odr_group = native_target.project.group_for_spec(app_spec.name)
+
+            # Add ODRs of the app spec dependencies first.
+            dependent_targets.each do |pod_target|
+              file_accessors = pod_target.file_accessors.select do |fa|
+                fa.spec.library_specification? ||
+                  fa.spec.test_specification? && pod_target.test_app_hosts_by_spec[fa.spec]&.first == app_spec
+              end
+              target_odr_group_name = "#{pod_target.label}-OnDemandResources"
+              UserProjectIntegrator::TargetIntegrator.add_on_demand_resources(target.sandbox, native_target.project,
+                                                                              native_target, file_accessors,
+                                                                              parent_odr_group, target_odr_group_name)
+            end
+
+            # Now add the ODRs of our own app spec declaration.
+            file_accessor = target.file_accessors.find { |fa| fa.spec == app_spec }
+            target_odr_group_name = "#{target.subspec_label(app_spec)}-OnDemandResources"
+            UserProjectIntegrator::TargetIntegrator.add_on_demand_resources(target.sandbox, native_target.project,
+                                                                            native_target, file_accessor,
+                                                                            parent_odr_group, target_odr_group_name)
+          end
+
           # @return [String] the message that should be displayed for the target
           #         integration.
           #

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.
@@ -172,6 +179,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(spec.name, 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.
       #
@@ -191,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 = [
@@ -203,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
@@ -229,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
@@ -250,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
@@ -289,7 +309,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 +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
@@ -322,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
@@ -404,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.rb

@@ -350,7 +350,7 @@ module Pod
     end
 
     def self.resource_extension_compilable?(input_extension)
-      output_extension_for_resource(input_extension) != input_extension
+      output_extension_for_resource(input_extension) != input_extension && input_extension != '.xcassets'
     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, extname)).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>]
@@ -755,7 +773,7 @@ module Pod
             libraries.concat libraries_to_import
             xcframework_libraries = vendored_xcframeworks.
                                     select { |xcf| xcf.build_type.static_library? }.
-                                    map(&:name).
+                                    flat_map { |xcf| linker_names_from_libraries([xcf.slices.first.binary_path]) }.
                                     uniq
             libraries.concat xcframework_libraries
           end
@@ -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
 
         #-------------------------------------------------------------------------#
@@ -871,7 +894,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>]
@@ -939,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
 
         #-------------------------------------------------------------------------#
@@ -1242,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]