cocoapods 1.9.1 → 1.10.2

data/lib/cocoapods/generator/script_phase_constants.rb

@@ -0,0 +1,99 @@
+module Pod
+  module Generator
+    module ScriptPhaseConstants
+      DEFAULT_SCRIPT_PHASE_HEADER = <<-SH.strip_heredoc.freeze
+#!/bin/sh
+set -e
+set -u
+set -o pipefail
+
+function on_error {
+  echo "$(realpath -mq "${0}"):$1: error: Unexpected failure"
+}
+trap 'on_error $LINENO' ERR
+      SH
+
+      RSYNC_PROTECT_TMP_FILES = <<-SH.strip_heredoc.freeze
+# This protects against multiple targets copying the same framework dependency at the same time. The solution
+# was originally proposed here: https://lists.samba.org/archive/rsync/2008-February/020158.html
+RSYNC_PROTECT_TMP_FILES=(--filter "P .*.??????")
+      SH
+
+      STRIP_INVALID_ARCHITECTURES_METHOD = <<-SH.strip_heredoc.freeze
+# Used as a return value for each invocation of `strip_invalid_archs` function.
+STRIP_BINARY_RETVAL=0
+
+# Strip invalid architectures
+strip_invalid_archs() {
+  binary="$1"
+  warn_missing_arch=${2:-true}
+  # Get architectures for current target binary
+  binary_archs="$(lipo -info "$binary" | rev | cut -d ':' -f1 | awk '{$1=$1;print}' | rev)"
+  # Intersect them with the architectures we are building for
+  intersected_archs="$(echo ${ARCHS[@]} ${binary_archs[@]} | tr ' ' '\\n' | sort | uniq -d)"
+  # If there are no archs supported by this binary then warn the user
+  if [[ -z "$intersected_archs" ]]; then
+    if [[ "$warn_missing_arch" == "true" ]]; then
+      echo "warning: [CP] Vendored binary '$binary' contains architectures ($binary_archs) none of which match the current build architectures ($ARCHS)."
+    fi
+    STRIP_BINARY_RETVAL=1
+    return
+  fi
+  stripped=""
+  for arch in $binary_archs; do
+    if ! [[ "${ARCHS}" == *"$arch"* ]]; then
+      # Strip non-valid architectures in-place
+      lipo -remove "$arch" -output "$binary" "$binary"
+      stripped="$stripped $arch"
+    fi
+  done
+  if [[ "$stripped" ]]; then
+    echo "Stripped $binary of architectures:$stripped"
+  fi
+  STRIP_BINARY_RETVAL=0
+}
+      SH
+
+      INSTALL_DSYM_METHOD = <<-SH.strip_heredoc.freeze
+# Copies and strips a vendored dSYM
+install_dsym() {
+  local source="$1"
+  warn_missing_arch=${2:-true}
+  if [ -r "$source" ]; then
+    # Copy the dSYM into the targets temp dir.
+    echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \\"- CVS/\\" --filter \\"- .svn/\\" --filter \\"- .git/\\" --filter \\"- .hg/\\" --filter \\"- Headers\\" --filter \\"- PrivateHeaders\\" --filter \\"- Modules\\" \\"${source}\\" \\"${DERIVED_FILES_DIR}\\""
+    rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${DERIVED_FILES_DIR}"
+
+    local basename
+    basename="$(basename -s .dSYM "$source")"
+    binary_name="$(ls "$source/Contents/Resources/DWARF")"
+    binary="${DERIVED_FILES_DIR}/${basename}.dSYM/Contents/Resources/DWARF/${binary_name}"
+
+    # Strip invalid architectures from the dSYM.
+    if [[ "$(file "$binary")" == *"Mach-O "*"dSYM companion"* ]]; then
+      strip_invalid_archs "$binary" "$warn_missing_arch"
+    fi
+    if [[ $STRIP_BINARY_RETVAL == 0 ]]; then
+      # Move the stripped file into its final destination.
+      echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --links --filter \\"- CVS/\\" --filter \\"- .svn/\\" --filter \\"- .git/\\" --filter \\"- .hg/\\" --filter \\"- Headers\\" --filter \\"- PrivateHeaders\\" --filter \\"- Modules\\" \\"${DERIVED_FILES_DIR}/${basename}.framework.dSYM\\" \\"${DWARF_DSYM_FOLDER_PATH}\\""
+      rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --links --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${DERIVED_FILES_DIR}/${basename}.dSYM" "${DWARF_DSYM_FOLDER_PATH}"
+    else
+      # The dSYM was not stripped at all, in this case touch a fake folder so the input/output paths from Xcode do not reexecute this script because the file is missing.
+      touch "${DWARF_DSYM_FOLDER_PATH}/${basename}.dSYM"
+    fi
+  fi
+}
+      SH
+
+      INSTALL_BCSYMBOLMAP_METHOD = <<-SH.strip_heredoc.freeze
+# Copies the bcsymbolmap files of a vendored framework
+install_bcsymbolmap() {
+    local bcsymbolmap_path="$1"
+    local destination="${BUILT_PRODUCTS_DIR}"
+    echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${bcsymbolmap_path}\" \"${destination}\""
+    rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${bcsymbolmap_path}" "${destination}"
+}
+      SH
+    end
+  end
+end

data/lib/cocoapods/installer/analyzer/target_inspection_result.rb

@@ -50,7 +50,7 @@ module Pod
           @build_configurations = build_configurations
           @platform = platform
           @archs = archs
-          @client_root = project.project_dir.realpath
+          @client_root = Pathname.new(project.project_dir + project.root_object.project_dir_path).realpath
         end
       end
     end

data/lib/cocoapods/installer/analyzer.rb

@@ -446,11 +446,18 @@ module Pod
           is_app_extension ||= aggregate_target.user_targets.any? do |user_target|
             user_target.common_resolved_build_setting('APPLICATION_EXTENSION_API_ONLY', :resolve_against_xcconfig => true) == 'YES'
           end
+          if is_app_extension
+            aggregate_target.mark_application_extension_api_only
+            aggregate_target.pod_targets.each(&:mark_application_extension_api_only)
+          end
 
-          next unless is_app_extension
-
-          aggregate_target.mark_application_extension_api_only
-          aggregate_target.pod_targets.each(&:mark_application_extension_api_only)
+          build_library_for_distribution = aggregate_target.user_targets.any? do |user_target|
+            user_target.common_resolved_build_setting('BUILD_LIBRARY_FOR_DISTRIBUTION', :resolve_against_xcconfig => true) == 'YES'
+          end
+          if build_library_for_distribution
+            aggregate_target.mark_build_library_for_distribution
+            aggregate_target.pod_targets.each(&:mark_build_library_for_distribution)
+          end
         end
 
         if installation_options.integrate_targets?
@@ -648,8 +655,10 @@ module Pod
           resolver_specs_by_target.flat_map do |target_definition, specs|
             grouped_specs = specs.group_by(&:root).values.uniq
             pod_targets = grouped_specs.flat_map do |pod_specs|
-              build_type = determine_build_type(pod_specs.first, target_definition.build_type)
-              generate_pod_target([target_definition], build_type, target_inspections, pod_specs.map(&:spec)).scoped(dedupe_cache)
+              build_type = determine_build_type(pod_specs.first.spec, target_definition.build_type)
+              swift_version = determine_swift_version(pod_specs.first.spec, [target_definition])
+              generate_pod_target([target_definition], build_type, target_inspections, pod_specs.map(&:spec),
+                                  :swift_version => swift_version).scoped(dedupe_cache)
             end
 
             compute_pod_target_dependencies(pod_targets, specs.map(&:spec).group_by(&:name))
@@ -690,13 +699,13 @@ module Pod
             hash[app_spec.name] = Hash[app_dependencies_by_config.map { |k, v| [k, filter_dependencies(v, pod_targets_by_name, target)] }]
           end
 
-          target.test_app_hosts_by_spec_name = target.test_specs.each_with_object({}) do |test_spec, hash|
+          target.test_app_hosts_by_spec = target.test_specs.each_with_object({}) do |test_spec, hash|
             next unless app_host_name = test_spec.consumer(target.platform).app_host_name
             app_host_spec = pod_targets_by_name[Specification.root_name(app_host_name)].flat_map(&:app_specs).find do |pt|
               pt.name == app_host_name
             end
             app_host_dependencies = { app_host_spec.root => [app_host_spec] }
-            hash[test_spec.name] = [app_host_spec, filter_dependencies(app_host_dependencies, pod_targets_by_name, target).first]
+            hash[test_spec] = [app_host_spec, filter_dependencies(app_host_dependencies, pod_targets_by_name, target).first]
           end
         end
       end

data/lib/cocoapods/installer/base_install_hooks_context.rb

@@ -0,0 +1,135 @@
+module Pod
+  class Installer
+    # Context object designed to be used with the HooksManager which describes
+    # the context of the installer.
+    #
+    class BaseInstallHooksContext
+      # @return [Sandbox] The Sandbox for the project.
+      #
+      attr_reader :sandbox
+
+      # @return [String] The path to the sandbox root (`Pods` directory).
+      #
+      attr_reader :sandbox_root
+
+      # @return [Xcodeproj::Project] The Pods Xcode project.
+      #
+      attr_reader :pods_project
+
+      # @return [Array<UmbrellaTargetDescription>] The list of
+      #         the CocoaPods umbrella targets generated by the installer.
+      #
+      attr_reader :umbrella_targets
+
+      # Initialize a new instance
+      #
+      # @param [Sandbox] sandbox see #sandbox
+      # @param [String] sandbox_root see #sandbox_root
+      # @param [Xcodeproj::Project] pods_project see #pods_project
+      # @param [Array<UmbrellaTargetDescription>] umbrella_targets see #umbrella_targets
+      #
+      def initialize(sandbox, sandbox_root, pods_project, umbrella_targets)
+        @sandbox = sandbox
+        @sandbox_root = sandbox_root
+        @pods_project = pods_project
+        @umbrella_targets = umbrella_targets
+      end
+
+      # @return [PostInstallHooksContext] Convenience class generator method
+      #
+      # @param  [Sandbox] sandbox
+      #         The sandbox
+      #
+      # @param  [Project] pods_project
+      #         The pods project.
+      #
+      # @param  [Array<AggregateTarget>] aggregate_targets
+      #         The aggregate targets, which will been presented by an adequate
+      #         {UmbrellaTargetDescription} in the generated context.
+      #
+      # @return [HooksContext] Convenience class method to generate the
+      #         static context.
+      #
+      def self.generate(sandbox, pods_project, aggregate_targets)
+        umbrella_targets_descriptions = aggregate_targets.map do |umbrella|
+          user_project = umbrella.user_project
+          user_targets = umbrella.user_targets
+          specs = umbrella.specs
+          platform_name = umbrella.platform.name
+          platform_deployment_target = umbrella.platform.deployment_target.to_s
+          cocoapods_target_label = umbrella.label
+          UmbrellaTargetDescription.new(user_project, user_targets, specs, platform_name, platform_deployment_target, cocoapods_target_label)
+        end
+
+        new(sandbox, sandbox.root.to_s, pods_project, umbrella_targets_descriptions)
+      end
+
+      # Pure data class which describes an umbrella target.
+      #
+      class UmbrellaTargetDescription
+        # @return [Xcodeproj::Project] The user project into which this target
+        #         is integrated.
+        #
+        attr_reader :user_project
+
+        # @return [Array<PBXNativeTarget>]
+        #         The list of user targets integrated by this umbrella target.
+        #
+        attr_reader :user_targets
+
+        # @return [Array<Specification>] The list of the
+        #         specifications of the target.
+        #
+        attr_reader :specs
+
+        # @return [Symbol] The platform (either `:ios`, `:watchos`, `:tvos`, or `:osx`).
+        #
+        attr_reader :platform_name
+
+        # @return [String] The deployment target.
+        #
+        attr_reader :platform_deployment_target
+
+        # @return [String] The label for the target.
+        #
+        attr_reader :cocoapods_target_label
+
+        # Initialize a new instance
+        #
+        # @param [Xcodeproj::Project] user_project see #user_project
+        # @param [Array<PBXNativeTarget>] user_targets see #user_targets
+        # @param [Array<Specification>] specs see #specs
+        # @param [Symbol] platform_name see #platform_name
+        # @param [String] platform_deployment_target see #platform_deployment_target
+        # @param [String] cocoapods_target_label see #cocoapods_target_label
+        #
+        def initialize(user_project, user_targets, specs, platform_name, platform_deployment_target, cocoapods_target_label)
+          @user_project = user_project
+          @user_targets = user_targets
+          @specs = specs
+          @platform_name = platform_name
+          @platform_deployment_target = platform_deployment_target
+          @cocoapods_target_label = cocoapods_target_label
+        end
+
+        # @return [String] The path of the user project
+        #         integrated by this target.
+        #
+        def user_project_path
+          user_project.path if user_project
+        end
+
+        # @return [Array<String>] The list of the UUIDs of the
+        #         user targets integrated by this umbrella
+        #         target.  They can be used to find the
+        #         targets opening the project They can be used
+        #         to find the targets opening the project with
+        #         Xcodeproj.
+        #
+        def user_target_uuids
+          user_targets.map(&:uuid)
+        end
+      end
+    end
+  end
+end

data/lib/cocoapods/installer/installation_options.rb

@@ -153,6 +153,11 @@ module Pod
       #
       option :warn_for_multiple_pod_sources, true
 
+      # Whether to emit a warning if a project is not explicitly specifying the git based master specs repo and can
+      # instead use CDN which is the default.
+      #
+      option :warn_for_unused_master_specs_repo, true
+
       # Whether to share Xcode schemes for development pods.
       #
       # Schemes for development pods are created automatically but are not shared by default.

data/lib/cocoapods/installer/pod_source_installer.rb

@@ -90,7 +90,8 @@ module Pod
       #
       def lock_files!(file_accessors)
         return if local?
-        FileUtils.chmod('u-w', source_files(file_accessors))
+        unlocked_files = source_files(file_accessors).reject { |f| (File.stat(f).mode & 0o200).zero? }
+        FileUtils.chmod('u-w', unlocked_files)
       end
 
       # Unlocks the source files if appropriate.

data/lib/cocoapods/installer/post_install_hooks_context.rb

@@ -3,133 +3,7 @@ module Pod
     # Context object designed to be used with the HooksManager which describes
     # the context of the installer.
     #
-    class PostInstallHooksContext
-      # @return [Sandbox] The Sandbox for the project.
-      #
-      attr_reader :sandbox
-
-      # @return [String] The path to the sandbox root (`Pods` directory).
-      #
-      attr_reader :sandbox_root
-
-      # @return [Xcodeproj::Project] The Pods Xcode project.
-      #
-      attr_reader :pods_project
-
-      # @return [Array<UmbrellaTargetDescription>] The list of
-      #         the CocoaPods umbrella targets generated by the installer.
-      #
-      attr_reader :umbrella_targets
-
-      # Initialize a new instance
-      #
-      # @param [Sandbox] sandbox see #sandbox
-      # @param [String] sandbox_root see #sandbox_root
-      # @param [Xcodeproj::Project] pods_project see #pods_project
-      # @param [Array<UmbrellaTargetDescription>] umbrella_targets see #umbrella_targets
-      #
-      def initialize(sandbox, sandbox_root, pods_project, umbrella_targets)
-        @sandbox = sandbox
-        @sandbox_root = sandbox_root
-        @pods_project = pods_project
-        @umbrella_targets = umbrella_targets
-      end
-
-      # @return [PostInstallHooksContext] Convenience class generator method
-      #
-      # @param  [Sandbox] sandbox
-      #         The sandbox
-      #
-      # @param  [Project] pods_project
-      #         The pods project.
-      #
-      # @param  [Array<AggregateTarget>] aggregate_targets
-      #         The aggregate targets, which will been presented by an adequate
-      #         {UmbrellaTargetDescription} in the generated context.
-      #
-      # @return [HooksContext] Convenience class method to generate the
-      #         static context.
-      #
-      def self.generate(sandbox, pods_project, aggregate_targets)
-        umbrella_targets_descriptions = aggregate_targets.map do |umbrella|
-          user_project = umbrella.user_project
-          user_targets = umbrella.user_targets
-          specs = umbrella.specs
-          platform_name = umbrella.platform.name
-          platform_deployment_target = umbrella.platform.deployment_target.to_s
-          cocoapods_target_label = umbrella.label
-          UmbrellaTargetDescription.new(user_project, user_targets, specs, platform_name, platform_deployment_target, cocoapods_target_label)
-        end
-
-        new(sandbox, sandbox.root.to_s, pods_project, umbrella_targets_descriptions)
-      end
-
-      # Pure data class which describes an umbrella target.
-      #
-      class UmbrellaTargetDescription
-        # @return [Xcodeproj::Project] The user project into which this target
-        #         is integrated.
-        #
-        attr_reader :user_project
-
-        # @return [Array<PBXNativeTarget>]
-        #         The list of user targets integrated by this umbrella target.
-        #
-        attr_reader :user_targets
-
-        # @return [Array<Specification>] The list of the
-        #         specifications of the target.
-        #
-        attr_reader :specs
-
-        # @return [Symbol] The platform (either `:ios`, `:watchos`, `:tvos`, or `:osx`).
-        #
-        attr_reader :platform_name
-
-        # @return [String] The deployment target.
-        #
-        attr_reader :platform_deployment_target
-
-        # @return [String] The label for the target.
-        #
-        attr_reader :cocoapods_target_label
-
-        # Initialize a new instance
-        #
-        # @param [Xcodeproj::Project] user_project see #user_project
-        # @param [Array<PBXNativeTarget>] user_targets see #user_targets
-        # @param [Array<Specification>] specs see #specs
-        # @param [Symbol] platform_name see #platform_name
-        # @param [String] platform_deployment_target see #platform_deployment_target
-        # @param [String] cocoapods_target_label see #cocoapods_target_label
-        #
-        def initialize(user_project, user_targets, specs, platform_name, platform_deployment_target, cocoapods_target_label)
-          @user_project = user_project
-          @user_targets = user_targets
-          @specs = specs
-          @platform_name = platform_name
-          @platform_deployment_target = platform_deployment_target
-          @cocoapods_target_label = cocoapods_target_label
-        end
-
-        # @return [String] The path of the user project
-        #         integrated by this target.
-        #
-        def user_project_path
-          user_project.path if user_project
-        end
-
-        # @return [Array<String>] The list of the UUIDs of the
-        #         user targets integrated by this umbrella
-        #         target.  They can be used to find the
-        #         targets opening the project They can be used
-        #         to find the targets opening the project with
-        #         Xcodeproj.
-        #
-        def user_target_uuids
-          user_targets.map(&:uuid)
-        end
-      end
+    class PostInstallHooksContext < BaseInstallHooksContext
     end
   end
 end

data/lib/cocoapods/installer/post_integrate_hooks_context.rb

@@ -0,0 +1,9 @@
+module Pod
+  class Installer
+    # Context object designed to be used with the HooksManager which describes
+    # the context of the installer.
+    #
+    class PostIntegrateHooksContext < BaseInstallHooksContext
+    end
+  end
+end

data/lib/cocoapods/installer/project_cache/project_metadata_cache.rb

@@ -54,6 +54,10 @@ module Pod
           installation_results.each do |installation_result|
             native_target = installation_result.native_target
             target_label_by_metadata[native_target.name] = TargetMetadata.from_native_target(sandbox, native_target)
+            # app targets need to be added to the cache because they can be used as app hosts for test targets, even if those test targets live inside a different pod (and thus project)
+            installation_result.app_native_targets.each_value do |app_target|
+              target_label_by_metadata[app_target.name] = TargetMetadata.from_native_target(sandbox, app_target)
+            end
           end
         end
 

data/lib/cocoapods/installer/sandbox_dir_cleaner.rb

@@ -67,8 +67,9 @@ module Pod
             sandbox.pod_target_project_path(pod_target.project_name)
           end
           project_dir_names = sandbox_project_dir_names - [sandbox.project_path]
+          user_project_dir_names = aggregate_targets.map(&:user_project_path).uniq
 
-          removed_project_dir_names = project_dir_names - project_dir_names_to_install
+          removed_project_dir_names = project_dir_names - user_project_dir_names - project_dir_names_to_install
           removed_project_dir_names.each { |dir| remove_dir(dir) }
         end
       end