cocoapods 1.11.0.beta.2 → 1.11.0.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb329667c5428edaa84a9f21d4545285f7946264581b884c1d1f6387fd0cb570
-  data.tar.gz: 2d0887f1665eda88c26ba2e2350b58623f381123e0487da7f120854cfbd053dd
+  metadata.gz: ecc8327b607b70bebbce4cf7eea523deb7a9fca594c7bf541e7adbfaff3f2c9e
+  data.tar.gz: c41f0d93d862c1ba559aebe5f43546a3543c41f3374097dd5e86e2312af37bf6
 SHA512:
-  metadata.gz: 821686e3f37164465545f59f337f90e28bee70c4002dab29ee85a072bff82ee1c3e57cf580638ac6b8f20d628f209940818a8adc2c397fd221bdaeac67a3f4d1
-  data.tar.gz: e39c20a0f708ec54aa4bc0f92610e7dda998628ae660e6a09d5c1bed072ecde3b5a8a5a696191083d62136b00fc11c42cb85c99b7aadb2811a314a70fcca4753
+  metadata.gz: 6484e6130882b45c979a575eb0b92a8fcdaf4846f2dd53fb60b0b19498b4953d7079eb0b57026001a4e540a37e834d98d8a3744c540f7b30d737132f5310b311
+  data.tar.gz: 2168a449127973ec7596adacbc7440a23b4c816f9c15f0aa63ad7c582b44be9f217222122b9895bbb17741f4e0f23e2b91ecd12ab3d7b0968c9dcddccbc32eba

data/CHANGELOG.md

@@ -4,6 +4,19 @@ To install or update CocoaPods see this [guide](https://guides.cocoapods.org/usi
 
 To install release candidates run `[sudo] gem install cocoapods --pre`
 
+## 1.11.0.rc.1 (2021-08-25)
+
+##### Enhancements
+
+* None.  
+
+##### Bug Fixes
+
+* Correctly process multiple `xcframeworks` a pod provides.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#10378](https://github.com/CocoaPods/CocoaPods/issues/10378)
+
+
 ## 1.11.0.beta.2 (2021-08-11)
 
 ##### Enhancements

data/lib/cocoapods/gem_version.rb

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

data/lib/cocoapods/generator/copy_xcframework_script.rb

@@ -70,8 +70,8 @@ copy_dir()
   local destination="$2"
 
   # 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}"
+  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}"
 }
 
 SELECT_SLICE_RETVAL=""
@@ -130,38 +130,11 @@ select_slice() {
   done
 }
 
-install_library() {
-  local source="$1"
-  local name="$2"
-  local destination="#{Target::BuildSettings::XCFRAMEWORKS_BUILD_DIR_VARIABLE}/${name}"
-
-  # Libraries can contain headers, module maps, and a binary, so we'll copy everything in the folder over
-
-  local source="$binary"
-  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}"
-}
-
-# Copies a framework to derived data for use in later build phases
-install_framework()
-{
-  local source="$1"
-  local name="$2"
-  local destination="#{Pod::Target::BuildSettings::XCFRAMEWORKS_BUILD_DIR_VARIABLE}/${name}"
-
-  if [ ! -d "$destination" ]; then
-    mkdir -p "$destination"
-  fi
-
-  copy_dir "$source" "$destination"
-  echo "Copied $source to $destination"
-}
-
 install_xcframework() {
   local basepath="$1"
   local name="$2"
   local package_type="$3"
-  local paths=("${@:3}")
+  local paths=("${@:4}")
 
   # Locate the correct slice of the .xcframework for the current architectures
   select_slice "${paths[@]}"
@@ -179,7 +152,6 @@ install_xcframework() {
   fi
 
   copy_dir "$source/" "$destination"
-
   echo "Copied $source to $destination"
 }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 1.11.0.beta.2
+  version: 1.11.0.rc.1
 platform: ruby
 authors:
 - Eloy Duran
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-12 00:00:00.000000000 Z
+date: 2021-08-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.11.0.beta.2
+        version: 1.11.0.rc.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.11.0.beta.2
+        version: 1.11.0.rc.1
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement