Skip to content

Fix Mac Catalyst build #2184

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.

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 1 commit into from
Jun 18, 2025
Merged

Fix Mac Catalyst build #2184

merged 1 commit into from
Jun 18, 2025

Conversation

thomasjross
Copy link
Contributor

@thomasjross thomasjross commented Jun 18, 2025

Platforms Impacted

  • iOS
  • visionOS
  • macOS

Description of changes

After some of the changes in the 0.34.0 release to move FluentTheme into the common layer, it's no longer possible to build FluentUI for Mac Catalyst. The changes are relatively simple to get things building again.

Add a target environment check to NSColor+Extensions

  • Simply checking if we can import AppKit is not sufficient since the framework can be imported, but NSColor is unavailable on Catalyst.

Use FluentFontInfo type alias

  • Since Catalyst has access to ApplicationServices.FontInfo, the reference to FontInfo in the iOS target is ambiguous. Using the type alias resolves this ambiguity.

Binary change

N/A, should have no impact on iOS binary size.

Verification

Swift package for FluentUI was built for iOS, visionOS, macOS, and macOS (Catalyst). I confirmed that the package builds properly for all supported platforms listed in the package definition.

Pull request checklist

This PR has considered:

  • Light and Dark appearances
  • iOS supported versions (all major versions greater than or equal current target deployment version)
  • VoiceOver and Keyboard Accessibility
  • Internationalization and Right to Left layouts
  • Different resolutions (1x, 2x, 3x)
  • Size classes and window sizes (iPhone vs iPad, notched devices, multitasking, different window sizes, etc)
  • iPad Pointer interaction
  • SwiftUI consumption (validation or new demo scenarios needed)
  • Objective-C exposure (provide it only if needed)
Microsoft Reviewers: Open in CodeFlow

@thomasjross thomasjross requested a review from a team as a code owner June 18, 2025 17:58
@mischreiber mischreiber merged commit 6126989 into microsoft:main Jun 18, 2025
7 checks passed
mischreiber pushed a commit to mischreiber/fluentui-apple that referenced this pull request Jun 18, 2025
mischreiber added a commit that referenced this pull request Jun 18, 2025
Co-authored-by: T.J. Ross <thross@microsoft.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants