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

Add support for Mac Catalyst #66

Merged
merged 3 commits into from
Dec 14, 2023
Merged

Add support for Mac Catalyst #66

merged 3 commits into from
Dec 14, 2023

Conversation

andrewheard
Copy link
Collaborator

  • Mac Catalyst apps can import both UIKit and AppKit but NSImage (from AppKit) is unavailable in Catalyst
    • Re-ordered #if canImport(UIKit) before #elseif canImport(AppKit) so that the UIKit branch is picked in Catalyst builds (UIImage is available in Catalyst)
  • This builds and tests pass when targeting "My Mac (Mac Catalyst)".

@andrewheard andrewheard requested a review from paulb777 December 14, 2023 17:24
@github-actions github-actions bot added component:swift sdk Issue/PR related to Swift SDK status:awaiting review PR awaiting review from a maintainer labels Dec 14, 2023
paulb777
paulb777 reviewed Dec 14, 2023
View reviewed changes
Copy link
Collaborator

@paulb777 paulb777 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. Will you add CI and consider #67

@andrewheard andrewheard mentioned this pull request Dec 14, 2023
Merged
@andrewheard andrewheard requested a review from paulb777 December 14, 2023 18:10
@andrewheard andrewheard enabled auto-merge (squash) December 14, 2023 18:16
@andrewheard andrewheard merged commit d94b124 into main Dec 14, 2023
8 checks passed
@andrewheard andrewheard deleted the ah/mac-catalyst branch December 14, 2023 18:37
@github-actions github-actions bot removed the status:awaiting review PR awaiting review from a maintainer label Dec 14, 2023
@hzlzh
Copy link

hzlzh commented Dec 16, 2023

This is so timely. Thank you.
❤️

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@paulb777 paulb777 paulb777 approved these changes

Assignees
No one assigned
Labels
component:swift sdk Issue/PR related to Swift SDK
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@andrewheard @hzlzh @paulb777