better swift 6 compiler conditionals (#61)

sliemeobn · Dec 8, 2024 · e884367 · e884367
1 parent b78de8c
commit e884367
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/Sources/Elementary/ServerSupport/SendOnceBox.swift b/Sources/Elementary/ServerSupport/SendOnceBox.swift
@@ -1,4 +1,4 @@
-#if swift(>=6.0) && !hasFeature(Embedded)
+#if compiler(>=6.0) && !hasFeature(Embedded)
 import Synchronization
 
 @available(macOS 15.0, *)

diff --git a/Sources/Elementary/ServerSupport/SendableAnyHTMLBox.swift b/Sources/Elementary/ServerSupport/SendableAnyHTMLBox.swift
@@ -8,7 +8,7 @@ public struct _SendableAnyHTMLBox: Sendable {
 
     enum Storage {
         case sendable(any HTML & Sendable)
-        #if swift(>=6.0)
+        #if compiler(>=6.0)
         // NOTE: protocol can be removed when macOS 15 is the minimum
         case sendOnceBox(any SendOnceBoxing<any HTML>)
         #endif
@@ -18,14 +18,14 @@ public struct _SendableAnyHTMLBox: Sendable {
         storage = .sendable(html)
     }
 
-    #if swift(>=6.0)
+    #if compiler(>=6.0)
     @available(macOS 15, *)
     public init(_ html: sending any HTML) {
         storage = .sendOnceBox(SendOnceBox(html))
     }
     #endif
 
-    #if swift(>=6.0)
+    #if compiler(>=6.0)
     public consuming func tryTake() -> sending (any HTML)? {
         switch storage {
         case let .sendable(html):

diff --git a/Tests/ElementaryTests/SendableAnyHTMLBox.swift b/Tests/ElementaryTests/SendableAnyHTMLBox.swift
@@ -1,7 +1,6 @@
 import Elementary
 import XCTest
 
-@available(macOS 15.0, *)
 final class SendOnceHTMLValueTests: XCTestCase {
     func testHoldsSendableValue() {
         let html = div { "Hello, World!" }
@@ -10,8 +9,12 @@ final class SendOnceHTMLValueTests: XCTestCase {
         XCTAssertNotNil(box.tryTake())
     }
 
-    #if swift(>=6.0)
-    func testHoldsNonSendable() {
+    #if compiler(>=6.0)
+    func testHoldsNonSendable() throws {
+        guard #available(macOS 15.0, *) else {
+            throw XCTSkip("Requires macOS 15.0")
+        }
+
         let html = MyComponent()
         let box = _SendableAnyHTMLBox(html)
         XCTAssertNotNil(box.tryTake())