Skip to content

fix macCatalyst build failure: re-order #if canImport(UIKit) #283

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

Merged
gonzalezreal merged 1 commit into from
Dec 31, 2023
Merged

fix macCatalyst build failure: re-order #if canImport(UIKit) #283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions Sources/MarkdownUI/Extensibility/AssetImageProvider.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@ public struct AssetImageProvider: ImageProvider {
}

private func image(url: URL) -> PlatformImage? {
#if canImport(AppKit)
#if canImport(UIKit)
return UIImage(named: self.name(url), in: self.bundle, with: nil)
#elseif canImport(AppKit)
if let bundle, bundle != .main {
return bundle.image(forResource: self.name(url))
} else {
return NSImage(named: self.name(url))
}
#elseif canImport(UIKit)
return UIImage(named: self.name(url), in: self.bundle, with: nil)
#endif
}
}
Expand Down
22 changes: 11 additions & 11 deletions Sources/MarkdownUI/Utility/Color+RGBA.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,7 @@ extension Color {
/// - light: The light appearance color value.
/// - dark: The dark appearance color value.
public init(light: @escaping @autoclosure () -> Color, dark: @escaping @autoclosure () -> Color) {
#if canImport(AppKit)
self.init(
nsColor: .init(name: nil) { appearance in
if appearance.bestMatch(from: [.aqua, .darkAqua]) == .aqua {
return NSColor(light())
} else {
return NSColor(dark())
}
}
)
#elseif os(watchOS)
#if os(watchOS)
self = dark()
#elseif canImport(UIKit)
self.init(
Expand All @@ -42,6 +32,16 @@ extension Color {
}
}
)
#elseif canImport(AppKit)
self.init(
nsColor: .init(name: nil) { appearance in
if appearance.bestMatch(from: [.aqua, .darkAqua]) == .aqua {
return NSColor(light())
} else {
return NSColor(dark())
}
}
)
#endif
}
}