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

Fix crash building a module map for a product with an iOS-only Interop dependency #11620

Merged
merged 4 commits into from
Jul 27, 2023
Merged

Fix crash building a module map for a product with an iOS-only Interop dependency #11620

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1b9cfc5
Don't build Interops in binary distributions
paulb777 Jul 27, 2023
a5f85d7
Interops needed for Swift
paulb777 Jul 27, 2023
64553c9
update comment
paulb777 Jul 27, 2023
40890f3
style
paulb777 Jul 27, 2023
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
9 changes: 8 additions & 1 deletion ReleaseTooling/Sources/ZipBuilder/ModuleMapBuilder.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,14 @@ struct ModuleMapBuilder {
/// to make sure we install the right version and from the right location.
private func generate(framework: FrameworkInfo) {
let podName = framework.versionedPod.name
let deps = CocoaPodUtils.transitiveVersionedPodDependencies(for: podName, in: allPods)
let deps = CocoaPodUtils.transitiveVersionedPodDependencies(for: podName, in: allPods).filter {
// Don't include Interop pods in the module map calculation since they shouldn't add anything
// and it uses the platform-independent version of the dependency list, which causes a crash
// for the iOS-only RecaptchaInterop pod when the subsequent code tries to `pod install` it
// for macOS. All this module code should go away when we switch to building dynamic
// frameworks.
!$0.name.hasSuffix("Interop")
}

CocoaPodUtils.installPods(allSubspecList(framework: framework) + deps,
inDir: projectDir,
Expand Down
Loading