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.

Sign up for GitHub

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

Jump to bottom

Correctly process multiple xcframeworks dSYMs a pod provides. #12215

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Correctly process multiple xcframeworks dSYMs a pod provides. #12215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d9fb2fa
Correctly process multiple `xcframeworks` dSYMs a pod provides.
soumyamahunt Jan 24, 2024
21f6db0
Updated CHANGELOG
soumyamahunt Jan 24, 2024
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: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Expand Up @@ -26,6 +26,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
[MagnificentMiles](https://github.com/MagnificentMiles)
[#12159](https://github.com/CocoaPods/CocoaPods/pull/12159)

* Correctly process multiple `xcframeworks` dSYMs a pod provides.
[Soumya Ranjan Mahunt](https://github.com/soumyamahunt)
[#12215](https://github.com/CocoaPods/CocoaPods/pull/12215)

## 1.14.3 (2023-11-19)

##### Enhancements
Expand Down
13 changes: 11 additions & 2 deletions lib/cocoapods/generator/copy_xcframework_script.rb
View file
Open in desktop
Expand Up @@ -72,10 +72,19 @@ def script
{
local source="$1"
local destination="$2"
dsyms="${source}/dSYMs"
framework_pattern="${source}/*.framework"
frameworks=($framework_pattern)
framework=${frameworks[0]}

# Use filter instead of exclude so missing patterns don't throw errors.
echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --links --filter \\"- CVS/\\" --filter \\"- .svn/\\" --filter \\"- .git/\\" --filter \\"- .hg/\\" \\"${source}*\\" \\"${destination}\\""
rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --links --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" "${source}"/* "${destination}"
echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --links --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" \"${framework}\" \"${destination}\""
rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --links --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" "${framework}" "${destination}"
# Copy dSYMs preserving already copied dSYMs
if [ -d "$dsyms" ]; then
echo "rsync -av \"${dsyms}\" \"${destination}\""
rsync -av "${dsyms}" "${destination}"
fi
}

SELECT_SLICE_RETVAL=""
Expand Down