Changes to fix Catalyst compatibility #4254
Merged
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.
Issue Link 🔗
#4233
Goals ⚽
Fixes compatibility with Catalyst
Implementation Details 🚧
Essentially, in the "Platform+" files, attempts to alias types to their AppKit equivalents for regular macOS apps works file, but fails in Catalyst apps because while those are Mac apps, Catalyst needs UIKit for certain things.
Basically I changed this line in four files
#if canImport(AppKit)
to
#if canImport(AppKit) && !targetEnvironment(macCatalyst)
Which causes the macro to skip over this on Catalyst apps.
Testing Details 🔍
No changes to unit testing performed, though I have successfully tried my fork in a Catalyst app, and the changes above have no effect on the macOS demo app in the project.