cocoapods 1.8.4 → 1.9.0.beta.1

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

@@ -32,6 +32,7 @@ module Pod
           def integrate!
             UI.section(integration_message) do
               target_installation_result.non_library_specs_by_native_target.each do |native_target, spec|
+                add_prepare_artifacts_script_phase(native_target, spec)
                 add_embed_frameworks_script_phase(native_target, spec)
                 add_copy_resources_script_phase(native_target, spec)
                 UserProjectIntegrator::TargetIntegrator.create_or_update_user_script_phases(script_phases_for_specs(spec), native_target)
@@ -53,6 +54,12 @@ module Pod
 
           # Find or create a 'Copy Pods Resources' build phase
           #
+          # @param [PBXNativeTarget] native_target
+          #         the native target for which to add the copy resources script
+          #
+          # @param [Pod::Specification] spec
+          #         the specification to integrate
+          #
           # @return [void]
           #
           def add_copy_resources_script_phase(native_target, spec)
@@ -96,7 +103,13 @@ module Pod
             end
           end
 
-          # Find or create a 'Embed Pods Frameworks' Copy Files Build Phase
+          # Find or create a 'Embed Pods Frameworks' Run Script Build Phase
+          #
+          # @param [PBXNativeTarget] native_target
+          #         the native target for which to add the embed frameworks script
+          #
+          # @param [Pod::Specification] spec
+          #         the specification to integrate
           #
           # @return [void]
           #
@@ -144,6 +157,60 @@ module Pod
             end
           end
 
+          # Find or create a 'Prepare Artifacts' Run Script Build Phase
+          #
+          # @param [PBXNativeTarget] native_target
+          #         the native target for which to add the prepare artifacts script
+          #
+          # @param [Pod::Specification] spec
+          #         the specification to integrate
+          #
+          # @return [void]
+          #
+          def add_prepare_artifacts_script_phase(native_target, spec)
+            script_path = "${PODS_ROOT}/#{target.prepare_artifacts_script_path_for_spec(spec).relative_path_from(target.sandbox.root)}"
+
+            input_paths_by_config = {}
+            output_paths_by_config = {}
+
+            dependent_targets = if spec.test_specification?
+                                  target.dependent_targets_for_test_spec(spec)
+                                else
+                                  target.dependent_targets_for_app_spec(spec)
+                                end
+            host_target_spec_names = target.app_host_dependent_targets_for_spec(spec).flat_map do |pt|
+              pt.specs.map(&:name)
+            end.uniq
+            xcframeworks = 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? && !xcframeworks.empty?
+              input_file_list_path = target.prepare_artifacts_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 = input_paths_by_config[input_paths_key] = [script_path]
+
+              framework_paths = xcframeworks.map { |xcf| "${PODS_ROOT}/#{xcf.path.relative_path_from(target.sandbox.root)}" }
+              input_paths.concat framework_paths
+
+              output_file_list_path = target.prepare_artifacts_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::ARTIFACT_LIST_FILE]
+            end
+
+            if xcframeworks.empty?
+              UserProjectIntegrator::TargetIntegrator.remove_prepare_artifacts_script_phase_from_target(native_target)
+            else
+              UserProjectIntegrator::TargetIntegrator.create_or_update_prepare_artifacts_script_phase_to_target(
+                native_target, script_path, input_paths_by_config, output_paths_by_config)
+            end
+          end
+
           # @return [String] the message that should be displayed for the target
           #         integration.
           #

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

@@ -35,27 +35,32 @@ module Pod
           @installation_options = installation_options
         end
 
+        # Writes projects to disk.
+        #
+        # @yield If provided, this block will execute right before writing the projects to disk.
+        #
         def write!
           cleanup_projects(projects)
 
           projects.each do |project|
-            UI.message "- Writing Xcode project file to #{UI.path project.path}" do
-              library_product_types = [:framework, :dynamic_library, :static_library]
-              results_by_native_target = Hash[pod_target_installation_results.map do |_, result|
-                [result.native_target, result]
-              end]
-              project.recreate_user_schemes(false) do |scheme, target|
-                next unless target.respond_to?(:symbol_type)
-                next unless library_product_types.include? target.symbol_type
-                installation_result = results_by_native_target[target]
-                next unless installation_result
-                installation_result.test_native_targets.each do |test_native_target|
-                  scheme.add_test_target(test_native_target)
-                end
+            library_product_types = [:framework, :dynamic_library, :static_library]
+            results_by_native_target = Hash[pod_target_installation_results.map do |_, result|
+              [result.native_target, result]
+            end]
+            project.recreate_user_schemes(false) do |scheme, target|
+              next unless target.respond_to?(:symbol_type)
+              next unless library_product_types.include? target.symbol_type
+              installation_result = results_by_native_target[target]
+              next unless installation_result
+              installation_result.test_native_targets.each do |test_native_target|
+                scheme.add_test_target(test_native_target)
               end
-              project.save
             end
           end
+
+          yield if block_given?
+
+          save_projects(projects)
         end
 
         private
@@ -66,7 +71,17 @@ module Pod
           projects.each do |project|
             [project.pods, project.support_files_group,
              project.development_pods, project.dependencies_group].each { |group| group.remove_from_project if group.empty? }
+          end
+        end
+
+        # Sorts and then saves projects which writes them to disk.
+        #
+        def save_projects(projects)
+          projects.each do |project|
             project.sort(:groups_position => :below)
+            UI.message "- Writing Xcode project file to #{UI.path project.path}" do
+              project.save
+            end
           end
         end
       end

data/lib/cocoapods/sandbox/file_accessor.rb

@@ -1,4 +1,4 @@
-require 'macho'
+require 'cocoapods/xcode/linkage_analyzer'
 
 module Pod
   class Sandbox
@@ -167,8 +167,8 @@ module Pod
       #         that come shipped with the Pod.
       #
       def vendored_dynamic_frameworks
-        vendored_frameworks.select do |framework|
-          dynamic_binary?(framework + framework.basename('.*'))
+        (vendored_frameworks - vendored_xcframeworks).select do |framework|
+          Xcode::LinkageAnalyzer.dynamic_binary?(framework + framework.basename('.*'))
         end
       end
 
@@ -176,7 +176,16 @@ module Pod
       #         bundles that come shipped with the Pod.
       #
       def vendored_static_frameworks
-        vendored_frameworks - vendored_dynamic_frameworks
+        vendored_frameworks - vendored_dynamic_frameworks - vendored_xcframeworks
+      end
+
+      # @return [Array<Pathname>] The paths of vendored .xcframework bundles
+      #         that come shipped with the Pod.
+      #
+      def vendored_xcframeworks
+        vendored_frameworks.select do |framework|
+          File.extname(framework) == '.xcframework'
+        end
       end
 
       # @param [Array<FileAccessor>] file_accessors
@@ -220,13 +229,30 @@ module Pod
         Pathname.glob(headers_dir + '**/' + GLOB_PATTERNS[:public_header_files])
       end
 
+      # @param [Pathname] framework
+      #         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)
+        xcframework.slices.flat_map do |slice|
+          vendored_frameworks_headers(slice.path)
+        end
+      end
+
       # @return [Array<Pathname>] The paths of the framework headers that come
       #         shipped with the Pod.
       #
       def vendored_frameworks_headers
-        vendored_frameworks.flat_map do |framework|
+        paths = (vendored_frameworks - vendored_xcframeworks).flat_map do |framework|
           self.class.vendored_frameworks_headers(framework)
         end.uniq
+        paths.concat Array.new(vendored_xcframeworks.flat_map do |framework|
+          self.class.vendored_xcframework_headers(framework)
+        end)
+        paths
       end
 
       # @return [Array<Pathname>] The paths of the library bundles that come
@@ -241,7 +267,7 @@ module Pod
       #
       def vendored_dynamic_libraries
         vendored_libraries.select do |library|
-          dynamic_binary?(library)
+          Xcode::LinkageAnalyzer.dynamic_binary?(library)
         end
       end
 
@@ -444,21 +470,6 @@ module Pod
         path_list.glob(patterns, options).flatten.compact.uniq
       end
 
-      # @param  [Pathname] binary
-      #         The file to be checked for being a dynamic Mach-O binary.
-      #
-      # @return [Boolean] Whether `binary` can be dynamically linked.
-      #
-      def dynamic_binary?(binary)
-        @cached_dynamic_binary_results ||= {}
-        return @cached_dynamic_binary_results[binary] unless @cached_dynamic_binary_results[binary].nil?
-        return false unless binary.file?
-
-        @cached_dynamic_binary_results[binary] = MachO.open(binary).dylib?
-      rescue MachO::MachOError
-        @cached_dynamic_binary_results[binary] = false
-      end
-
       #-----------------------------------------------------------------------#
     end
   end

data/lib/cocoapods/sources_manager.rb

@@ -1,6 +1,8 @@
 require 'cocoapods-core/source'
+require 'netrc'
 require 'set'
 require 'rest'
+require 'typhoeus'
 
 module Pod
   class Source
@@ -68,8 +70,13 @@ module Pod
       #         The URL of the source.
       #
       def cdn_url?(url)
-        url =~ %r{^https:\/\/} &&
-          REST.head(url + '/all_pods.txt').ok?
+        if 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
       rescue => e
         raise Informative, "Couldn't determine repo type for URL: `#{url}`: #{e}"
       end

data/lib/cocoapods/target.rb

@@ -1,5 +1,4 @@
 require 'cocoapods/target/build_settings'
-require 'cocoapods/target/build_type'
 
 module Pod
   # Model class which describes a Pods target.
@@ -17,12 +16,6 @@ module Pod
     #
     attr_reader :sandbox
 
-    # @return [Boolean] Whether the target needs to be implemented as a framework.
-    #         Computed by analyzer.
-    #
-    attr_reader :host_requires_frameworks
-    alias_method :host_requires_frameworks?, :host_requires_frameworks
-
     # @return [Hash{String=>Symbol}] A hash representing the user build
     #         configurations where each key corresponds to the name of a
     #         configuration and its value to its type (`:debug` or `:release`).
@@ -41,7 +34,7 @@ module Pod
     #
     attr_reader :build_settings
 
-    # @return [Target::BuildType] the build type for this target.
+    # @return [BuildType] the build type for this target.
     #
     attr_reader :build_type
     private :build_type
@@ -53,15 +46,13 @@ module Pod
     # Initialize a new target
     #
     # @param [Sandbox] sandbox @see #sandbox
-    # @param [Boolean] host_requires_frameworks @see #host_requires_frameworks
+    # @param [BuildType] build_type @see #build_type
     # @param [Hash{String=>Symbol}] user_build_configurations @see #user_build_configurations
     # @param [Array<String>] archs @see #archs
     # @param [Platform] platform @see #platform
     #
-    def initialize(sandbox, host_requires_frameworks, user_build_configurations, archs, platform,
-                   build_type: Target::BuildType.infer_from_spec(nil, :host_requires_frameworks => host_requires_frameworks?))
+    def initialize(sandbox, build_type, user_build_configurations, archs, platform)
       @sandbox = sandbox
-      @host_requires_frameworks = host_requires_frameworks
       @user_build_configurations = user_build_configurations
       @archs = archs
       @platform = platform
@@ -211,7 +202,7 @@ module Pod
     # @return [String] A string suitable for debugging.
     #
     def inspect
-      "<#{self.class} name=#{name} >"
+      "#<#{self.class} name=#{name}>"
     end
 
     #-------------------------------------------------------------------------#
@@ -246,7 +237,7 @@ module Pod
     #
     def xcconfig_path(variant = nil)
       if variant
-        support_files_dir + "#{label}.#{variant.gsub(File::SEPARATOR, '-').downcase}.xcconfig"
+        support_files_dir + "#{label}.#{variant.to_s.gsub(File::SEPARATOR, '-').downcase}.xcconfig"
       else
         support_files_dir + "#{label}.xcconfig"
       end
@@ -314,6 +305,12 @@ module Pod
       @application_extension_api_only = true
     end
 
+    # @return [Pathname] The absolute path of the prepare artifacts script.
+    #
+    def prepare_artifacts_script_path
+      support_files_dir + "#{label}-artifacts.sh"
+    end
+
     #-------------------------------------------------------------------------#
 
     private

data/lib/cocoapods/target/aggregate_target.rb

@@ -1,4 +1,5 @@
-require 'cocoapods/target/framework_paths'
+require 'cocoapods/xcode/framework_paths'
+require 'cocoapods/xcode/xcframework'
 
 module Pod
   # Stores the information relative to the target used to cluster the targets
@@ -56,7 +57,7 @@ module Pod
     # Initialize a new instance
     #
     # @param [Sandbox] sandbox @see Target#sandbox
-    # @param [Boolean] host_requires_frameworks @see Target#host_requires_frameworks
+    # @param [BuildType] build_type @see Target#build_type
     # @param [Hash{String=>Symbol}] user_build_configurations @see Target#user_build_configurations
     # @param [Array<String>] archs @see Target#archs
     # @param [Platform] platform @see #Target#platform
@@ -65,12 +66,10 @@ module Pod
     # @param [Xcodeproj::Project] user_project @see #user_project
     # @param [Array<String>] user_target_uuids @see #user_target_uuids
     # @param [Hash{String=>Array<PodTarget>}] pod_targets_for_build_configuration @see #pod_targets_for_build_configuration
-    # @param [Target::BuildType] build_type @see #build_type
     #
-    def initialize(sandbox, host_requires_frameworks, user_build_configurations, archs, platform, target_definition,
-                   client_root, user_project, user_target_uuids, pod_targets_for_build_configuration,
-                   build_type: Target::BuildType.infer_from_spec(nil, :host_requires_frameworks => host_requires_frameworks))
-      super(sandbox, host_requires_frameworks, user_build_configurations, archs, platform, :build_type => build_type)
+    def initialize(sandbox, build_type, user_build_configurations, archs, platform, target_definition, client_root,
+                   user_project, user_target_uuids, pod_targets_for_build_configuration)
+      super(sandbox, build_type, user_build_configurations, archs, platform)
       raise "Can't initialize an AggregateTarget without a TargetDefinition!" if target_definition.nil?
       raise "Can't initialize an AggregateTarget with an abstract TargetDefinition!" if target_definition.abstract?
       @target_definition = target_definition
@@ -95,8 +94,8 @@ module Pod
       merged = @pod_targets_for_build_configuration.merge(embedded_pod_targets_for_build_configuration) do |_, before, after|
         (before + after).uniq
       end
-      AggregateTarget.new(sandbox, host_requires_frameworks, user_build_configurations, archs, platform,
-                          target_definition, client_root, user_project, user_target_uuids, merged, :build_type => build_type).tap do |aggregate_target|
+      AggregateTarget.new(sandbox, build_type, user_build_configurations, archs, platform,
+                          target_definition, client_root, user_project, user_target_uuids, merged).tap do |aggregate_target|
         aggregate_target.search_paths_aggregate_targets.concat(search_paths_aggregate_targets).freeze
         aggregate_target.mark_application_extension_api_only if application_extension_api_only
       end
@@ -225,13 +224,20 @@ module Pod
       !resource_paths_by_config.each_value.all?(&:empty?)
     end
 
-    # @return [Boolean] Whether the target contains framework to be embedded into
+    # @return [Boolean] Whether the target contains frameworks to be embedded into
     #         the user target
     #
     def includes_frameworks?
       !framework_paths_by_config.each_value.all?(&:empty?)
     end
 
+    # @return [Boolean] Whether the target contains xcframeworks to be embedded into
+    #         the user target
+    #
+    def includes_xcframeworks?
+      !xcframeworks_by_config.each_value.all?(&:empty?)
+    end
+
     # @return [Hash{String => Array<FrameworkPaths>}] The vendored dynamic artifacts and framework target
     #         input and output paths grouped by config
     #
@@ -249,6 +255,23 @@ module Pod
       end
     end
 
+    # @return [Hash{String => Array<Xcode::XCFramework>}] The vendored dynamic artifacts and framework target
+    #         input and output paths grouped by config
+    #
+    def xcframeworks_by_config
+      @xcframeworks_by_config ||= begin
+        xcframeworks_by_config = {}
+        user_build_configurations.each_key do |config|
+          relevant_pod_targets = pod_targets_for_build_configuration(config)
+          xcframeworks_by_config[config] = relevant_pod_targets.flat_map do |pod_target|
+            library_specs = pod_target.library_specs.map(&:name)
+            pod_target.xcframeworks.values_at(*library_specs).flatten.compact.uniq
+          end
+        end
+        xcframeworks_by_config
+      end
+    end
+
     # @return [Hash{String => Array<String>}] Uniqued Resources grouped by config
     #
     def resource_paths_by_config
@@ -294,6 +317,12 @@ module Pod
       support_files_dir + "#{label}-resources.sh"
     end
 
+    # @return [Pathname] The absolute path of the embed frameworks script.
+    #
+    def embed_frameworks_script_path
+      support_files_dir + "#{label}-frameworks.sh"
+    end
+
     # @param  [String] configuration the configuration this path is for.
     #
     # @return [Pathname] The absolute path of the copy resources script input file list.
@@ -310,12 +339,6 @@ module Pod
       support_files_dir + "#{label}-resources-#{configuration}-output-files.xcfilelist"
     end
 
-    # @return [Pathname] The absolute path of the embed frameworks script.
-    #
-    def embed_frameworks_script_path
-      support_files_dir + "#{label}-frameworks.sh"
-    end
-
     # @param  [String] configuration the configuration this path is for.
     #
     # @return [Pathname] The absolute path of the embed frameworks script input file list.
@@ -332,6 +355,22 @@ module Pod
       support_files_dir + "#{label}-frameworks-#{configuration}-output-files.xcfilelist"
     end
 
+    # @param  [String] configuration the configuration this path is for.
+    #
+    # @return [Pathname] The absolute path of the prepare artifacts script input file list.
+    #
+    def prepare_artifacts_script_input_files_path(configuration)
+      support_files_dir + "#{label}-artifacts-#{configuration}-input-files.xcfilelist"
+    end
+
+    # @param  [String] configuration the configuration this path is for.
+    #
+    # @return [Pathname] The absolute path of the prepare artifacts script output file list.
+    #
+    def prepare_artifacts_script_output_files_path(configuration)
+      support_files_dir + "#{label}-artifacts-#{configuration}-output-files.xcfilelist"
+    end
+
     # @return [String] The output file path fo the check manifest lock script.
     #
     def check_manifest_lock_script_output_file_path
@@ -411,6 +450,27 @@ module Pod
       "${PODS_ROOT}/#{relative_to_pods_root(embed_frameworks_script_output_files_path('${CONFIGURATION}'))}"
     end
 
+    # @return [String] The path of the prepare artifacts script relative to the
+    #         root of the Pods project.
+    #
+    def prepare_artifacts_script_relative_path
+      "${PODS_ROOT}/#{relative_to_pods_root(prepare_artifacts_script_path)}"
+    end
+
+    # @return [String] The path of the prepare artifacts script input file list
+    #         relative to the root of the Pods project.
+    #
+    def prepare_artifacts_script_input_files_relative_path
+      "${PODS_ROOT}/#{relative_to_pods_root(prepare_artifacts_script_input_files_path('${CONFIGURATION}'))}"
+    end
+
+    # @return [String] The path of the prepare artifacts script output file list
+    #         relative to the root of the Pods project.
+    #
+    def prepare_artifacts_script_output_files_relative_path
+      "${PODS_ROOT}/#{relative_to_pods_root(prepare_artifacts_script_output_files_path('${CONFIGURATION}'))}"
+    end
+
     private
 
     # @!group Private Helpers
@@ -431,8 +491,8 @@ module Pod
     def create_build_settings
       settings = {}
 
-      user_build_configurations.each_key do |configuration_name|
-        settings[configuration_name] = BuildSettings::AggregateTargetSettings.new(self, configuration_name)
+      user_build_configurations.each do |configuration_name, configuration|
+        settings[configuration_name] = BuildSettings::AggregateTargetSettings.new(self, configuration_name, :configuration => configuration)
       end
 
       settings