Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix an issue when including XCFrameworks in macOS apps #9574

Merged
merged 1 commit into from Mar 1, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion CHANGELOG.md
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion lib/cocoapods/generator/prepare_artifacts_script.rb
Expand Up @@ -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
Expand Down