Catalyst, better guards

ChimeHQ · Jan 22, 2024 · a93eae9 · a93eae9
1 parent f02e6b2
commit a93eae9
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 9 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -28,6 +28,7 @@ jobs:
           - "platform=tvOS Simulator,name=Apple TV"
           - "platform=visionOS Simulator,name=Apple Vision Pro"
           - "platform=watchOS Simulator,name=Apple Watch Series 6 (40mm)"
+          - "platform=macOS,variant=Mac Catalyst"
 
     steps:
       - name: Checkout

diff --git a/Sources/Rearrange/NSTextLocation+Comparable.swift b/Sources/Rearrange/NSTextLocation+Comparable.swift
@@ -1,10 +1,10 @@
-#if canImport(AppKit)
+#if os(macOS) && !targetEnvironment(macCatalyst)
 import AppKit
 #elseif canImport(UIKit)
 import UIKit
 #endif
 
-#if os(iOS) || os(tvOS) || os(macOS) || os(visionOS)
+#if (os(macOS) && !targetEnvironment(macCatalyst)) || canImport(UIKit)
 
 @available(iOS 15.0, macOS 12.0, tvOS 15.0, *)
 extension NSTextLocation {

diff --git a/Sources/Rearrange/NSTextRange+NSRange.swift b/Sources/Rearrange/NSTextRange+NSRange.swift
@@ -1,10 +1,10 @@
-#if canImport(AppKit)
+#if os(macOS) && !targetEnvironment(macCatalyst)
 import AppKit
-#elseif canImport(UIKit)
+#elseif os(iOS) || os(tvOS) || os(visionOS)
 import UIKit
 #endif
 
-#if os(iOS) || os(tvOS) || os(macOS) || os(visionOS)
+#if os(macOS) || os(iOS) || os(tvOS) || os(visionOS)
 
 @available(iOS 15.0, macOS 12.0, tvOS 15.0, *)
 public extension NSRange {

diff --git a/Sources/Rearrange/UITextRange+Convenience.swift b/Sources/Rearrange/UITextRange+Convenience.swift
@@ -1,4 +1,4 @@
-#if canImport(UIKit)
+#if os(iOS) || os(tvOS) || os(visionOS)
 import UIKit
 
 public extension NSRange {

diff --git a/Tests/RearrangeTests/NSTextRangeTests.swift b/Tests/RearrangeTests/NSTextRangeTests.swift
@@ -1,7 +1,7 @@
 import XCTest
-#if canImport(AppKit)
+#if os(macOS) && !targetEnvironment(macCatalyst)
 import AppKit
-#elseif canImport(UIKit)
+#elseif os(iOS) || os(tvOS) || os(visionOS)
 import UIKit
 #endif
 

diff --git a/Tests/RearrangeTests/UITextRangeTests.swift b/Tests/RearrangeTests/UITextRangeTests.swift
@@ -1,6 +1,6 @@
 import XCTest
 import Rearrange
-#if canImport(UIKit)
+#if os(iOS) || os(tvOS) || os(visionOS)
 import UIKit
 
 final class UITextRangeTests: XCTestCase {