From c090f4630d41f8536f7391099b42b581acc0fb54 Mon Sep 17 00:00:00 2001 From: Igor Makarov Date: Tue, 15 Mar 2022 18:43:05 +0200 Subject: [PATCH 1/3] add fallback to PLATFORM_NAME when EFFECTIVE_PLATFORM_NAME is empty --- lib/cocoapods/generator/copy_xcframework_script.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/cocoapods/generator/copy_xcframework_script.rb b/lib/cocoapods/generator/copy_xcframework_script.rb index 5164bd04f4..c30f0d69c5 100644 --- a/lib/cocoapods/generator/copy_xcframework_script.rb +++ b/lib/cocoapods/generator/copy_xcframework_script.rb @@ -132,7 +132,7 @@ def script select_slice "${basepath}" "${paths[@]}" local target_path="$SELECT_SLICE_RETVAL" if [[ -z "$target_path" ]]; then - echo "warning: [CP] $(basename ${basepath}): Unable to find matching slice in '${paths[@]}' for the current build architectures ($ARCHS) and platform ($EFFECTIVE_PLATFORM_NAME)." + echo "warning: [CP] $(basename ${basepath}): Unable to find matching slice in '${paths[@]}' for the current build architectures ($ARCHS) and platform (${EFFECTIVE_PLATFORM_NAME-${PLATFORM_NAME}})." return fi local source="$basepath/$target_path" From d91d666af55f415d43d89e491c9bd8c106d3d093 Mon Sep 17 00:00:00 2001 From: Igor Makarov Date: Tue, 15 Mar 2022 18:43:14 +0200 Subject: [PATCH 2/3] update integration specs --- spec/cocoapods-integration-specs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/cocoapods-integration-specs b/spec/cocoapods-integration-specs index 9558a7b18c..3021383d40 160000 --- a/spec/cocoapods-integration-specs +++ b/spec/cocoapods-integration-specs @@ -1 +1 @@ -Subproject commit 9558a7b18c5a3582c6dfcacdc1b58a9d9ba35c76 +Subproject commit 3021383d40ba64d0bc0fe79f5be0c473d67f335e From 7331efc4bf0bfda4b6495bd4177f92a3ea8af62f Mon Sep 17 00:00:00 2001 From: Igor Makarov Date: Tue, 15 Mar 2022 18:44:46 +0200 Subject: [PATCH 3/3] add changelog entry --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 557f5fb79a..7a415cf37c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre` ##### Bug Fixes +* Fix script breaking when attempting to print a warning. + [Igor Makarov](https://github.com/igor-makarov) + [#11251](https://github.com/CocoaPods/CocoaPods/issues/11251) + * Do not consider podspec_repo when analying sandbox for changes. [Dimitris Koutsogiorgas](https://github.com/dnkoutso) [#10985](https://github.com/CocoaPods/CocoaPods/pull/10985)