Skip to content

Include transitive deps in module maps #4895

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

Merged
merged 2 commits into from
Feb 13, 2020
Merged

Include transitive deps in module maps #4895

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
0190b0e
Include transitive deps in module maps
paulb777 Feb 12, 2020
0af6406
CHANGELOG
paulb777 Feb 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions FirebaseCore/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Unreleased
- [fixed] Fix Zip Builder module map generation that could cause linker missing
symbol errors in the 6.14.0 through 6.16.0 binary release distributions. (#4819)

# v6.6.1 -- M63
- [changed] Minimum required Xcode version changed to 10.3 (was 10.1).

Expand Down
2 changes: 0 additions & 2 deletions ZipBuilder/Sources/ZipBuilder/ModuleMapBuilder.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,11 +172,9 @@ struct ModuleMapBuilder {
podLibraryDeps = dependencyPod.transitiveLibraries
}
if let fdeps = podFrameworkDeps {
myFrameworkDeps.subtract(fdeps)
transitiveFrameworkDeps.formUnion(fdeps)
}
if let ldeps = podLibraryDeps {
myLibraryDeps.subtract(ldeps)
transitiveLibraryDeps.formUnion(ldeps)
}
}
Expand Down