From 56f6d234f6d1d498b977affa4c5ad3ccb22d1edd Mon Sep 17 00:00:00 2001 From: Eric Amorde Date: Sat, 29 Feb 2020 15:39:09 -0800 Subject: [PATCH] Fix an issue when including XCFrameworks in macOS apps ${EFFECTIVE_PLATFORM_NAME} will only be set if applicable for the current platform. Closes #9572 --- CHANGELOG.md | 4 +++- lib/cocoapods/generator/prepare_artifacts_script.rb | 2 +- spec/cocoapods-integration-specs | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a82ff3013d..c0d80f9180 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 caused a build failure with vendored XCFrameworks on macOS + [Eric Amorde](https://github.com/amorde) + [#9574](https://github.com/CocoaPods/CocoaPods/pull/9574) ## 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..78d6aa182d 100644 --- a/lib/cocoapods/generator/prepare_artifacts_script.rb +++ b/lib/cocoapods/generator/prepare_artifacts_script.rb @@ -148,7 +148,7 @@ def script if [[ "$PLATFORM_NAME" == *"simulator" ]]; then target_variant="simulator" fi - if [[ "$EFFECTIVE_PLATFORM_NAME" == *"maccatalyst" ]]; then + if [[ ! -z ${EFFECTIVE_PLATFORM_NAME+x} && "$EFFECTIVE_PLATFORM_NAME" == *"maccatalyst" ]]; then target_variant="maccatalyst" fi for i in ${!paths[@]}; do diff --git a/spec/cocoapods-integration-specs b/spec/cocoapods-integration-specs index b17ac6159a..366c3fdfc1 160000 --- a/spec/cocoapods-integration-specs +++ b/spec/cocoapods-integration-specs @@ -1 +1 @@ -Subproject commit b17ac6159aab5fd28029ce7d4a9bc423c81658ef +Subproject commit 366c3fdfc168b5cc10ee39151781c5dc4b45f589