cocoapods 1.10.0 → 1.11.0

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

@@ -247,7 +247,7 @@ module Pod
           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_name = pod_target.spec_label(spec)
             scheme_configuration = pod_target.scheme_for_spec(spec)
             if !scheme_configuration.empty? || is_custom_host
               scheme_path = Xcodeproj::XCScheme.user_data_dir(project.path) + "#{scheme_name}.xcscheme"

data/lib/cocoapods/installer.rb

@@ -36,6 +36,7 @@ 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 :PodSourceInstaller,           'cocoapods/installer/pod_source_installer'
@@ -175,6 +176,7 @@ module Pod
     end
 
     def integrate
+      run_podfile_pre_integrate_hooks
       generate_pods_project
       if installation_options.integrate_targets?
         integrate_user_project
@@ -199,7 +201,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|
@@ -627,6 +629,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, 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
@@ -650,6 +661,12 @@ module Pod
       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 +764,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 +783,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 +834,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 +893,34 @@ 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_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/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.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 +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,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 +362,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 +444,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