cocoapods 1.8.4 → 1.9.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57b1de10bba3e948a5169dfaeb1efd904e75dee4cde6bd7218440977930865ff
-  data.tar.gz: 281189ca4c47e468265a5d541c62046404a3b437b8a097be68dd3c831c4c6018
+  metadata.gz: 521b794e3dc3aa05b76deb9caa3559045361ba232e2461e45c2900349ee1afd2
+  data.tar.gz: ed3444398cc7fd18a2457a52537d7549f56f14b90326d08f365f47f6279d1b69
 SHA512:
-  metadata.gz: 1dcb8e86b473bbfd6e4f7675fde3aad7c6c47f0f7812ced0d20ff337951c90588a44034ff0773236a4a6593e75a090a24ad44fd7a326a95174dbe2839ed01e7f
-  data.tar.gz: c952e35ebae9304ecef0cbe70ab64f4fd53981220cbab84fd1bd32c9bb976bbabe28ab6c3bca47f1ca52bec5f4d23eeb6fc341cdeca0d2207436c5fbc2bac6b3
+  metadata.gz: 7e87b619e2dec763de038479a343f52814db87d83900530da5f7981b25670f1270a75f730e8e190b1fba534bb314401405cfd9f190f6f005b55bfbdb1d882635
+  data.tar.gz: b34bd41b5b41318a4c82883995cf7e75ab3eccc344171b87c9b07b31a47a058952ac94057e5a60b27f798cb3e8a4036129a7cd78a2f9b2e8d6676e657ed58082

data/CHANGELOG.md

@@ -4,6 +4,74 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
 
 To install release candidates run `[sudo] gem install cocoapods --pre`
 
+## 1.9.0.beta.1 (2019-12-16)
+
+##### Enhancements
+
+* Support for scheme code coverage.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#8921](https://github.com/CocoaPods/CocoaPods/issues/8921)
+
+* Support Swift version variants.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#9230](https://github.com/CocoaPods/CocoaPods/pull/9230)
+
+* Configure dependencies per configuration.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#9149](https://github.com/CocoaPods/CocoaPods/pull/9149)
+
+* Include Podfile Plugin changes for incremental installation.  
+  [Sebastian Shanus](https://github.com/sebastianv1)
+  [#9147](https://github.com/CocoaPods/CocoaPods/pull/9147)
+
+* Integrate `use_frameworks!` linkage DSL.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#9099](https://github.com/CocoaPods/CocoaPods/issues/9099)
+
+* Add support for integrating dependency file in user script phases.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#9082](https://github.com/CocoaPods/CocoaPods/issues/9082)
+ 
+* Add support for XCFrameworks using the `vendored_frameworks` Podspec DSL.  
+  [Eric Amorde](https://github.com/amorde)
+  [#9148](https://github.com/CocoaPods/CocoaPods/issues/9148)
+
+##### Bug Fixes
+
+* Move `run_podfile_post_install_hooks` call to execute right before projects are saved.  
+  [Yusuf Sobh](https://github.com/yusufoos)
+  [#9379](https://github.com/CocoaPods/CocoaPods/issues/9379)
+
+* Do not apply header mapping copy if the spec does not provide a header mappings dir.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#9308](https://github.com/CocoaPods/CocoaPods/issues/9308)
+
+* Fix issue where workspace was missing user project references during incremental installation.  
+  [Sebastian Shanus](https://github.com/sebastianv1)
+  [#9237](https://github.com/CocoaPods/CocoaPods/issues/9237)
+
+* Search in users xcconfig's for figuring out when to set `APPLICATION_EXTENSION_API_ONLY`.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#9233](https://github.com/CocoaPods/CocoaPods/issues/9233)
+
+* Always generate a lockfile even if project integration is disabled.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#9288](https://github.com/CocoaPods/CocoaPods/issues/9288)
+
+* Fix incremental installation with plugins that include arguments with different ordering.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#9170](https://github.com/CocoaPods/CocoaPods/pull/9170)
+
+* Move custom `Copy Headers` script phase for header mappings before `Compile Sources`.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#9131](https://github.com/CocoaPods/CocoaPods/pull/9131)
+
+* Don't create a conflicting `LaunchScreen.storyboard` when an app spec contains a file
+  with that name in its `resources`.  
+  [Samuel Giddins](https://github.com/segiddins)
+
+
 ## 1.8.4 (2019-10-16)
 
 ##### Enhancements
@@ -50,7 +118,7 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
 
 * Include dependent vendored frameworks in linker flags  
   [Alex Coomans](https://github.com/drcapulet)
-  [#9045]((https://github.com/CocoaPods/CocoaPods/pull/9045)
+  [#9045](https://github.com/CocoaPods/CocoaPods/pull/9045)
 
 * Correctly set deployment target for non library specs even if the root spec does not specify one.  
   [Dimitris Koutsogiorgas](https://github.com/dnkoutso)

data/lib/cocoapods.rb

@@ -62,6 +62,7 @@ module Pod
     autoload :CopyResourcesScript,     'cocoapods/generator/copy_resources_script'
     autoload :DummySource,             'cocoapods/generator/dummy_source'
     autoload :EmbedFrameworksScript,   'cocoapods/generator/embed_frameworks_script'
+    autoload :PrepareArtifactsScript,  'cocoapods/generator/prepare_artifacts_script'
     autoload :FileList,                'cocoapods/generator/file_list'
     autoload :Header,                  'cocoapods/generator/header'
     autoload :InfoPlistFile,           'cocoapods/generator/info_plist_file'

data/lib/cocoapods/command/setup.rb

@@ -11,6 +11,7 @@ module Pod
 
       def run
         # Right now, no setup is needed
+        UI.puts 'Setup completed'.green
       end
     end
   end

data/lib/cocoapods/executable.rb

@@ -163,7 +163,7 @@ module Pod
         status = result.last
         unless status.success?
           output = result[0..-2].join
-          raise Informative, "#{bin} #{command.join(' ')}\n\n#{output}".strip
+          raise Informative, "#{executable} #{command.join(' ')}\n\n#{output}".strip
         end
       end
     end

data/lib/cocoapods/gem_version.rb

@@ -1,5 +1,5 @@
 module Pod
   # The version of the CocoaPods command line tool.
   #
-  VERSION = '1.8.4'.freeze unless defined? Pod::VERSION
+  VERSION = '1.9.0.beta.1'.freeze unless defined? Pod::VERSION
 end

data/lib/cocoapods/generator/embed_frameworks_script.rb

@@ -1,4 +1,4 @@
-require 'cocoapods/target/framework_paths'
+require 'cocoapods/xcode'
 
 module Pod
   module Generator
@@ -91,8 +91,8 @@ module Pod
             fi
 
             # Use filter instead of exclude so missing patterns don't throw errors.
-            echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \\"- CVS/\\" --filter \\"- .svn/\\" --filter \\"- .git/\\" --filter \\"- .hg/\\" --filter \\"- Headers\\" --filter \\"- PrivateHeaders\\" --filter \\"- Modules\\" \\"${source}\\" \\"${destination}\\""
-            rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${destination}"
+            echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --links --filter \\"- CVS/\\" --filter \\"- .svn/\\" --filter \\"- .git/\\" --filter \\"- .hg/\\" --filter \\"- Headers\\" --filter \\"- PrivateHeaders\\" --filter \\"- Modules\\" \\"${source}\\" \\"${destination}\\""
+            rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --links --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${destination}"
 
             local basename
             basename="$(basename -s .framework "$1")"
@@ -145,8 +145,8 @@ module Pod
 
               if [[ $STRIP_BINARY_RETVAL == 1 ]]; then
                 # Move the stripped file into its final destination.
-                echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --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[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${DERIVED_FILES_DIR}/${basename}.framework.dSYM" "${DWARF_DSYM_FOLDER_PATH}"
+                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}.framework.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}.framework.dSYM"
@@ -204,8 +204,38 @@ module Pod
             STRIP_BINARY_RETVAL=1
           }
 
+          install_artifact() {
+            artifact="$1"
+            base="$(basename "$artifact")"
+            case $base in
+            *.framework)
+              install_framework "$artifact"
+              ;;
+            *.dSYM)
+              install_dsym "$artifact"
+              ;;
+            *.bcsymbolmap)
+              install_bcsymbolmap "$artifact"
+              ;;
+            *)
+              echo "error: Unrecognized artifact "$artifact""
+              ;;
+            esac
+          }
+
+          copy_artifacts() {
+            file_list="$1"
+            while read artifact; do
+              install_artifact "$artifact"
+            done <$file_list
+          }
+
+          ARTIFACT_LIST_FILE="${BUILT_PRODUCTS_DIR}/cocoapods-artifacts-${CONFIGURATION}.txt"
+          if [ -r "${ARTIFACT_LIST_FILE}" ]; then
+            copy_artifacts "${ARTIFACT_LIST_FILE}"
+          fi
+
         SH
-        script << "\n" unless frameworks_by_config.each_value.all?(&:empty?)
         frameworks_by_config.each do |config, frameworks_with_dsyms|
           next if frameworks_with_dsyms.empty?
           script << %(if [[ "$CONFIGURATION" == "#{config}" ]]; then\n)

data/lib/cocoapods/generator/prepare_artifacts_script.rb

@@ -0,0 +1,244 @@
+require 'cocoapods/xcode'
+
+module Pod
+  module Generator
+    class PrepareArtifactsScript
+      # @return [Hash{String => Array<Pod::Xcode::XCFramework>}] Multiple lists of xcframeworks per
+      #         configuration.
+      #
+      attr_reader :xcframeworks_by_config
+
+      # @return [Pathname] the root directory of the sandbox
+      #
+      attr_reader :sandbox_root
+
+      # @return [Platform] the platform of the target for which this script will run
+      #
+      attr_reader :platform
+
+      # @param  [Hash{String => Array<Pod::Xcode::XCFramework>] xcframeworks_by_config
+      #         @see #xcframeworks_by_config
+      #
+      # @param  [Pathname] sandbox_root
+      #         the sandbox root of the installation
+      #
+      # @param  [Platform] platform
+      #         the platform of the target for which this script will run
+      #
+      def initialize(xcframeworks_by_config, sandbox_root, platform)
+        @xcframeworks_by_config = xcframeworks_by_config
+        @sandbox_root = sandbox_root
+        @platform = platform
+      end
+
+      # Saves the resource script to the given pathname.
+      #
+      # @param  [Pathname] pathname
+      #         The path where the embed frameworks script should be saved.
+      #
+      # @return [void]
+      #
+      def save_as(pathname)
+        pathname.open('w') do |file|
+          file.puts(script)
+        end
+        File.chmod(0o755, pathname.to_s)
+      end
+
+      # @return [String] The contents of the embed frameworks script.
+      #
+      def generate
+        script
+      end
+
+      private
+
+      # @!group Private Helpers
+
+      # @return [String] The contents of the prepare artifacts script.
+      #
+      def script
+        script = <<-SH.strip_heredoc
+          #!/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
+
+          if [ -z ${FRAMEWORKS_FOLDER_PATH+x} ]; then
+            # If FRAMEWORKS_FOLDER_PATH is not set, then there's nowhere for us to copy
+            # frameworks to, so exit 0 (signalling the script phase was successful).
+            exit 0
+          fi
+
+          # 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 .*.??????")
+
+          ARTIFACT_LIST_FILE="${BUILT_PRODUCTS_DIR}/cocoapods-artifacts-${CONFIGURATION}.txt"
+          cat > $ARTIFACT_LIST_FILE
+
+          BCSYMBOLMAP_DIR="BCSymbolMaps"
+
+          record_artifact()
+          {
+            echo "$1" >> $ARTIFACT_LIST_FILE
+          }
+
+          install_artifact()
+          {
+            local source="$1"
+            local destination="$2"
+            local record=${3:-false}
+
+            # Use filter instead of exclude so missing patterns don't throw errors.
+            echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --links --filter \\"- CVS/\\" --filter \\"- .svn/\\" --filter \\"- .git/\\" --filter \\"- .hg/\\" \\"${source}\\" \\"${destination}\\""
+            rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --links --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" "${source}" "${destination}"
+
+            if [[ "$record" == "true" ]]; then
+              artifact="${destination}/$(basename "$source")"
+              record_artifact "$artifact"
+            fi
+          }
+
+          # Copies a framework to derived data for use in later build phases
+          install_framework()
+          {
+            if [ -r "${BUILT_PRODUCTS_DIR}/$1" ]; then
+              local source="${BUILT_PRODUCTS_DIR}/$1"
+            elif [ -r "${BUILT_PRODUCTS_DIR}/$(basename "$1")" ]; then
+              local source="${BUILT_PRODUCTS_DIR}/$(basename "$1")"
+            elif [ -r "$1" ]; then
+              local source="$1"
+            fi
+
+            local record_artifact=${2:-true}
+            local destination="${TARGET_BUILD_DIR}"
+
+            if [ -L "${source}" ]; then
+              echo "Symlinked..."
+              source="$(readlink "${source}")"
+            fi
+
+            install_artifact "$source" "$destination" "$record_artifact"
+
+            if [ -d "${source}/${BCSYMBOLMAP_DIR}" ]; then
+              # Locate and install any .bcsymbolmaps if present
+              find "${source}/${BCSYMBOLMAP_DIR}/" -name "*.bcsymbolmap"|while read f; do
+                install_artifact "$f" "$destination" "true"
+              done
+            fi
+          }
+
+          install_xcframework() {
+            local basepath="$1"
+            local embed="$2"
+            shift
+            local paths=("$@")
+
+            # Locate the correct slice of the .xcframework for the current architectures
+            local target_path=""
+            local target_arch="$ARCHS"
+            local target_variant=""
+            if [[ "$PLATFORM_NAME" == *"simulator" ]]; then
+              target_variant="simulator"
+            fi
+            if [[ "$EFFECTIVE_PLATFORM_NAME" == *"maccatalyst" ]]; then
+              target_variant="maccatalyst"
+            fi
+            for i in ${!paths[@]}; do
+              if [[ "${paths[$i]}" == *"$target_arch"* ]] && [[ "${paths[$i]}" == *"$target_variant"* ]]; then
+                # Found a matching slice
+                echo "Selected xcframework slice ${paths[$i]}"
+                target_path=${paths[$i]}
+                break;
+              fi
+            done
+
+            if [[ -z "$target_path" ]]; then
+              echo "warning: [CP] Unable to find matching .xcframework slice in '${paths[@]}' for the current build architectures ($ARCHS)."
+              return
+            fi
+
+            install_framework "$basepath/$target_path" "$embed"
+          }
+
+        SH
+        contents_by_config = Hash.new do |hash, key|
+          hash[key] = ''
+        end
+        xcframeworks_by_config.each do |config, xcframeworks|
+          next if xcframeworks.empty?
+          xcframeworks.each do |xcframework|
+            slices = xcframework.slices.select { |f| f.platform.symbolic_name == platform.symbolic_name }
+            dynamic_slices, static_slices = slices.partition { |slice| Xcode::LinkageAnalyzer.dynamic_binary?(slice.binary_path) }
+            next if dynamic_slices.empty? && static_slices.empty?
+            unless dynamic_slices.empty?
+              args = install_xcframework_args(xcframework.path, dynamic_slices, false)
+              contents_by_config[config] << %(  install_xcframework #{args}\n)
+            end
+
+            unless static_slices.empty?
+              args = install_xcframework_args(xcframework.path, static_slices, true)
+              contents_by_config[config] << %(  install_xcframework #{args}\n)
+            end
+
+            dsyms = PrepareArtifactsScript.dsym_paths(xcframework.path)
+            dsyms.each do |path|
+              source = shell_escape("${PODS_ROOT}/#{path.relative_path_from(sandbox_root)}")
+              contents_by_config[config] << %(  install_artifact #{source} "${TARGET_BUILD_DIR}" "true"\n)
+            end
+          end
+        end
+
+        script << "\n" unless contents_by_config.empty?
+        contents_by_config.keys.sort.each do |config|
+          contents = contents_by_config[config]
+          next if contents.empty?
+          script << %(if [[ "$CONFIGURATION" == "#{config}" ]]; then\n)
+          script << contents
+          script << "fi\n"
+        end
+
+        script << "\necho \"Artifact list stored at $ARTIFACT_LIST_FILE\"\n"
+        script << "\ncat \"$ARTIFACT_LIST_FILE\"\n"
+        script
+      end
+
+      def shell_escape(value)
+        "\"#{value}\""
+      end
+
+      def install_xcframework_args(root, slices, static)
+        args = [shell_escape("${PODS_ROOT}/#{root.relative_path_from(sandbox_root)}")]
+        embed = static ? 'false' : 'true'
+        args << shell_escape(embed)
+        slices.each do |slice|
+          args << shell_escape(slice.path.relative_path_from(root))
+        end
+        args.join(' ')
+      end
+
+      class << self
+        # @param  [Pathname] xcframework_path
+        #         the base path of the .xcframework bundle
+        #
+        # @return [Array<Pathname>] all found .dSYM paths
+        #
+        def dsym_paths(xcframework_path)
+          basename = File.basename(xcframework_path, '.xcframework')
+          dsym_basename = basename + '.dSYMs'
+          path = xcframework_path.dirname + dsym_basename
+          return [] unless File.directory?(path)
+
+          pattern = path + '*.dSYM'
+          Dir.glob(pattern).map { |s| Pathname.new(s) }
+        end
+      end
+    end
+  end
+end

data/lib/cocoapods/installer.rb

@@ -161,6 +161,7 @@ module Pod
       else
         integrate
       end
+      write_lockfiles
       perform_post_install_actions
     end
 
@@ -194,7 +195,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, pod_targets, aggregate_targets, :clean_install => force_clean_install).analyze
+                                                                object_version, plugins, pod_targets, aggregate_targets, :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|
@@ -296,7 +297,6 @@ module Pod
       SandboxDirCleaner.new(sandbox, pod_targets, aggregate_targets).clean!
 
       update_project_cache(cache_analysis_result, target_installation_results)
-      write_lockfiles
     end
 
     def create_and_save_projects(pod_targets_to_generate, aggregate_targets_to_generate, build_configurations, project_object_version)
@@ -319,11 +319,11 @@ module Pod
         predictabilize_uuids(generated_projects) if installation_options.deterministic_uuids?
         stabilize_target_uuids(generated_projects)
 
-        run_podfile_post_install_hooks
-
         projects_writer = Xcode::PodsProjectWriter.new(sandbox, generated_projects,
                                                        target_installation_results.pod_target_installation_results, installation_options)
-        projects_writer.write!
+        projects_writer.write! do
+          run_podfile_post_install_hooks
+        end
 
         pods_project_pod_targets = pod_targets_to_generate - projects_by_pod_targets.values.flatten
         all_projects_by_pod_targets = {}
@@ -775,6 +775,7 @@ module Pod
       installation_cache.update_cache_key_by_target_label!(cache_analysis_result.cache_key_by_target_label)
       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.save_as(sandbox.project_installation_cache_path)
 
       metadata_cache.update_metadata!(target_installation_results.pod_target_installation_results || {},