use canImport(AppKit)

honghaoz · Sep 8, 2024 · 33efb42 · 33efb42
1 parent aa5dd13
commit 33efb42
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/Sources/ChouTiUI/Universal/Layout/Edge.swift b/Sources/ChouTiUI/Universal/Layout/Edge.swift
@@ -30,7 +30,7 @@
 
 import Foundation
 
-#if os(macOS)
+#if canImport(AppKit)
 import AppKit
 #endif
 
@@ -58,7 +58,7 @@ public enum Edge: Sendable {
     }
   }
 
-  #if os(macOS)
+  #if canImport(AppKit)
   /// Converts the edge to `NSRectEdge`.
   ///
   /// Used in `NSPopover`.

diff --git a/Sources/ChouTiUI/Universal/Screen/Screen+Extensions.swift b/Sources/ChouTiUI/Universal/Screen/Screen+Extensions.swift
@@ -55,7 +55,7 @@ public extension Screen {
   #if !os(visionOS)
   /// The main screen.
   static func mainScreen() -> Screen? {
-    #if os(macOS)
+    #if canImport(AppKit)
     return NSScreen.main
     #else
     return UIScreen.main

diff --git a/Sources/ChouTiUI/Universal/View/View+Layer.swift b/Sources/ChouTiUI/Universal/View/View+Layer.swift
@@ -44,10 +44,10 @@ public extension View {
   ///
   /// - Warning: On macOS, the view should be layer-backed (set `wantsLayer = true`). Accessing `layer` without setting `wantsLayer = true` will trigger an assertion.
   func layer() -> CALayer? {
-    #if !os(macOS)
+    #if canImport(AppKit)
+    ChouTi.assert(layer != nil, "NSView should set `wantsLayer == true`.")
     return layer
     #else
-    ChouTi.assert(layer != nil, "NSView should set `wantsLayer == true`.")
     return layer
     #endif
   }
@@ -56,11 +56,11 @@ public extension View {
   ///
   /// - Warning: On macOS, the view should be layer-backed (set `wantsLayer = true`). Accessing `unsafeLayer` without setting `wantsLayer = true` will crash.
   var unsafeLayer: CALayer {
-    #if !os(macOS)
-    return layer
-    #else
+    #if canImport(AppKit)
     ChouTi.assert(layer != nil, "NSView should set `wantsLayer == true`.")
     return layer.unsafelyUnwrapped
+    #else
+    return layer
     #endif
   }
 }
diff --git a/Tests/ChouTiUITests/Universal/Layout/EdgeTests.swift b/Tests/ChouTiUITests/Universal/Layout/EdgeTests.swift
@@ -31,7 +31,7 @@
 import ChouTiUI
 import ChouTiTest
 
-#if os(macOS)
+#if canImport(AppKit)
 import AppKit
 #endif