Merge pull request #9575 from CocoaPods/amorde/xcframework-watch-exte…

…nsions Fix an issue that prevented the correct XCFramework slice from being selected for watchOS extensions
CocoaPods · Mar 1, 2020 · f9d3354 · f9d3354
2 parents f075f94 + 4a38775
commit f9d3354
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,7 +14,11 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
 
 * Fix an issue that caused a build failure with vendored XCFrameworks on macOS  
   [Eric Amorde](https://github.com/amorde)
-  [#9574](https://github.com/CocoaPods/CocoaPods/pull/9574) 
+  [#9572](https://github.com/CocoaPods/CocoaPods/issues/9572)
+
+* Fix an issue that prevented the correct XCFramework slice from being selected for watchOS extensions  
+  [Eric Amorde](https://github.com/amorde)
+  [#9569](https://github.com/CocoaPods/CocoaPods/issues/9569)
 
 
 ## 1.9.0 (2020-02-25)

diff --git a/lib/cocoapods/generator/prepare_artifacts_script.rb b/lib/cocoapods/generator/prepare_artifacts_script.rb
@@ -144,6 +144,10 @@ def script
             # Locate the correct slice of the .xcframework for the current architectures
             local target_path=""
             local target_arch="$ARCHS"
+
+            # Replace spaces in compound architectures with _ to match slice format
+            target_arch=${target_arch//\ /_}
+
             local target_variant=""
             if [[ "$PLATFORM_NAME" == *"simulator" ]]; then
               target_variant="simulator"

diff --git a/spec/cocoapods-integration-specs b/spec/cocoapods-integration-specs