diff --git a/CHANGELOG.md b/CHANGELOG.md index a82ff3013d..8e1b5ebf2c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,7 +12,9 @@ To install release candidates run `[sudo] gem install cocoapods --pre` ##### Bug Fixes -* None. +* 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 index 0969ba3ac4..c5d67391aa 100644 --- 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 index b17ac6159a..86d29b26c5 160000 --- a/spec/cocoapods-integration-specs +++ b/spec/cocoapods-integration-specs @@ -1 +1 @@ -Subproject commit b17ac6159aab5fd28029ce7d4a9bc423c81658ef +Subproject commit 86d29b26c535200aca007f4bf23efa43794d5593