cocoapods 1.9.0.beta.3 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '090f2135af901aa68538da5553e60544a3a6426353296708272dfd57717bce8d'
-  data.tar.gz: 9d6a6cfa64727bce678f7c66b8b985f293c78fc0e3bd7d79b8d8c9b0d2a695a8
+  metadata.gz: 24f875616a403c4ddb34d0a8b7af2f7d8d63ba851fe9ff6d6fc84200a51ee373
+  data.tar.gz: 5e279cf00975ca84acc690b8aa7a731d53e676ca0143d570d1e7bbcbaa4c02ba
 SHA512:
-  metadata.gz: 64d5011e5653537b95d7d6e32843289b93f604d36b5fefce4d2b7bb14d7ac3dd0b0cf309ba9e530e2d58f9bc7e7fbb67a31659e0afcdc66782906a00f201f165
-  data.tar.gz: 94242285df5c8147d52e88c3b5e72e4993955ae6546550085c0a1e457dad67ec56372a36e3790f2d302ac191d3a974b7ae11bb7dcc89b4f5a643f325f6cf2437
+  metadata.gz: de961666641f51fbf193e6fd9918b4d1eb0c4faf047fd6ac81379257ce6883feaafbcf235847e3442110c2432da7cf9a8f3539f1999804ab2045cd762878ef02
+  data.tar.gz: 4a498dbb1231ec3a6162e86064956b00f198dc483be6838bf9b8236fa2573fac5b65f566f7ae71eaff50231f214b043a191790ef802a278135d3920e5360b54a

data/CHANGELOG.md

@@ -4,6 +4,23 @@ 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 (2020-02-25)
+
+##### Enhancements
+
+* None.  
+
+##### Bug Fixes
+
+* Also apply Xcode 11 `XCTUnwrap` fix to library and framework targets that weakly link `XCTest`.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#9518](https://github.com/CocoaPods/CocoaPods/pull/9518)  
+  
+* Fix dSYM handling for XCFrameworks.  
+  [Eric Amorde](https://github.com/amorde)
+  [#9530](https://github.com/CocoaPods/CocoaPods/issues/9530)
+
+
 ## 1.9.0.beta.3 (2020-02-04)
 
 ##### Enhancements

data/lib/cocoapods/gem_version.rb

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

data/lib/cocoapods/generator/embed_frameworks_script.rb

@@ -129,27 +129,29 @@ module Pod
           # Copies and strips a vendored dSYM
           install_dsym() {
             local source="$1"
+            warn_missing_arch=${2:-true}
             if [ -r "$source" ]; then
-              # Copy the dSYM into a the targets temp dir.
+              # 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 .framework.dSYM "$source")"
-              binary="${DERIVED_FILES_DIR}/${basename}.framework.dSYM/Contents/Resources/DWARF/${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 so "fat" simulator / device frameworks work on device
               if [[ "$(file "$binary")" == *"Mach-O "*"dSYM companion"* ]]; then
-                strip_invalid_archs "$binary"
+                strip_invalid_archs "$binary" "$warn_missing_arch"
               fi
 
               if [[ $STRIP_BINARY_RETVAL == 1 ]]; 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}.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}.framework.dSYM"
+                touch "${DWARF_DSYM_FOLDER_PATH}/${basename}.dSYM"
               fi
             fi
           }
@@ -180,13 +182,16 @@ module Pod
           # 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
-              echo "warning: [CP] Vendored binary '$binary' contains architectures ($binary_archs) none of which match the current build architectures ($ARCHS)."
+              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=0
               return
             fi
@@ -212,7 +217,8 @@ module Pod
               install_framework "$artifact"
               ;;
             *.dSYM)
-              install_dsym "$artifact"
+              # Suppress arch warnings since XCFrameworks will include many dSYM files
+              install_dsym "$artifact" "false"
               ;;
             *.bcsymbolmap)
               install_bcsymbolmap "$artifact"
@@ -259,6 +265,18 @@ module Pod
         SH
         script
       end
+
+      # @param  [Xcode::FrameworkPaths] framework_path
+      #         the framework path containing the dSYM
+      #
+      # @return [String, Nil] the name of the dSYM binary, if found
+      #
+      def dsym_binary_name(framework_path)
+        return nil if framework_path.dsym_path.nil?
+        if (path = Pathname.glob(framework_path.dsym_path.join('Contents/Resources/DWARF', '**/*')).first)
+          File.basename(path)
+        end
+      end
     end
   end
 end

data/lib/cocoapods/generator/prepare_artifacts_script.rb

@@ -136,7 +136,8 @@ module Pod
 
           install_xcframework() {
             local basepath="$1"
-            local embed="$2"
+            local dsym_folder="$2"
+            local embed="$3"
             shift
             local paths=("$@")
 
@@ -165,6 +166,17 @@ module Pod
             fi
 
             install_framework "$basepath/$target_path" "$embed"
+
+            if [[ -z "$dsym_folder" || ! -d "$dsym_folder" ]]; then
+              return
+            fi
+
+            dsyms=($(ls "$dsym_folder"))
+
+            local target_dsym=""
+            for i in ${!dsyms[@]}; do
+              install_artifact "$dsym_folder/${dsyms[$i]}" "$CONFIGURATION_BUILD_DIR" "true"
+            done
           }
 
         SH
@@ -186,12 +198,6 @@ module Pod
               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
 
@@ -215,6 +221,12 @@ module Pod
 
       def install_xcframework_args(root, slices, static)
         args = [shell_escape("${PODS_ROOT}/#{root.relative_path_from(sandbox_root)}")]
+        dsym_folder_arg = if (dsym_folder = PrepareArtifactsScript.dsym_folder(root))
+                            shell_escape("${PODS_ROOT}/#{dsym_folder.relative_path_from(sandbox_root)}")
+                          else
+                            '""'
+                          end
+        args << dsym_folder_arg
         embed = static ? 'false' : 'true'
         args << shell_escape(embed)
         slices.each do |slice|
@@ -229,14 +241,11 @@ module Pod
         #
         # @return [Array<Pathname>] all found .dSYM paths
         #
-        def dsym_paths(xcframework_path)
+        def dsym_folder(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) }
+          Pathname.new(path) if File.directory?(path)
         end
       end
     end

data/lib/cocoapods/target/build_settings.rb

@@ -992,7 +992,7 @@ module Pod
           library_xcconfig? &&
             target.platform.name == :ios &&
             Version.new(target.platform.deployment_target) < Version.new('12.2') &&
-            frameworks_to_import.include?('XCTest')
+            (frameworks_to_import + weak_frameworks_to_import).uniq.include?('XCTest')
         end
 
         #-------------------------------------------------------------------------#

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 1.9.0.beta.3
+  version: 1.9.0
 platform: ruby
 authors:
 - Eloy Duran
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-04 00:00:00.000000000 Z
+date: 2020-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods-core
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.9.0.beta.3
+        version: 1.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.9.0.beta.3
+        version: 1.9.0
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement