fix(ios): support module builds with mac=true on Catalyst #14391
+110
−17
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
This PR fixes iOS module builds when
manifestincludesmac: truefor Mac Catalyst support.It addresses 3 required areas:
TitaniumKit.xcframeworkMac Catalyst slice keeps expected framework symlinks.mac: trueis set.Changes
1) TitaniumKit packaging
support/iphone/build_titaniumkit.shxcodebuild -create-xcframework, restore symlinks in:ios-arm64_x86_64-maccatalyst/<Framework>.framework2) Module templates
iphone/templates/module/objc/template/ios/{{ModuleName}}.xcodeproj/project.pbxproj.ejsiphone/templates/module/swift/template/ios/{{ModuleName}}.xcodeproj/project.pbxproj.ejsAdded in iOS build configurations:
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"SUPPORTS_MACCATALYST = YES3) Build-time auto-fix for existing modules
iphone/cli/commands/_buildModule.jsensureMacCatalystBuildSettings():manifest.mac === 'true'project.pbxprojwith:SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"SUPPORTS_MACCATALYST = YESAlso improved module build diagnostics and SDK consistency:
ticommand exit code and full command.--sdk <version>to staged temp app create/build when provided.Validation
Validated locally by building SDK and module with this branch:
npm run cleanbuild -- iosti build -p ios --build-only --sdk 13.2.0on a module withmac: trueResult: