From bdde77a1fa77cd77d46709f4bb783f05519183bc Mon Sep 17 00:00:00 2001 From: kPherox Date: Thu, 9 Apr 2026 05:11:19 +0900 Subject: [PATCH] style: use `-define-availability` for AppleOS availability --- Package.swift | 5 +++++ Package@swift-6.0.swift | 5 +++++ Sources/JSONCodable/Double+toJSONEncodable.swift | 3 +-- Sources/JSONCodable/JSONValue.swift | 4 +--- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/Package.swift b/Package.swift index 53fb922..67958e9 100644 --- a/Package.swift +++ b/Package.swift @@ -7,6 +7,11 @@ import class Foundation.ProcessInfo var swiftSettings: [SwiftSetting] { [ + .unsafeFlags([ + "-Xfrontend", "-define-availability", + "-Xfrontend", "SwiftStdlib 5.9:macOS 14.0, iOS 17.0, watchOS 10.0, tvOS 17.0", + ]), + .enableUpcomingFeature("ExistentialAny"), .enableUpcomingFeature("InternalImportsByDefault"), .enableUpcomingFeature("MemberImportVisibility"), diff --git a/Package@swift-6.0.swift b/Package@swift-6.0.swift index 2e7a8af..cba3cf5 100644 --- a/Package@swift-6.0.swift +++ b/Package@swift-6.0.swift @@ -7,6 +7,11 @@ import class Foundation.ProcessInfo var swiftSettings: [SwiftSetting] { [ + .unsafeFlags([ + "-Xfrontend", "-define-availability", + "-Xfrontend", "SwiftStdlib 5.9:macOS 14.0, iOS 17.0, watchOS 10.0, tvOS 17.0", + ]), + .enableUpcomingFeature("ExistentialAny"), .enableUpcomingFeature("InternalImportsByDefault"), .enableUpcomingFeature("MemberImportVisibility"), diff --git a/Sources/JSONCodable/Double+toJSONEncodable.swift b/Sources/JSONCodable/Double+toJSONEncodable.swift index ba0b630..3391d16 100644 --- a/Sources/JSONCodable/Double+toJSONEncodable.swift +++ b/Sources/JSONCodable/Double+toJSONEncodable.swift @@ -16,8 +16,7 @@ extension Double { } #endif - // @available(SwiftStdlib 5.9, *) - @available(macOS 14.0, iOS 17.0, watchOS 10.0, tvOS 17.0, *) + @available(SwiftStdlib 5.9, *) func toJSONEncodable() -> Double { self } diff --git a/Sources/JSONCodable/JSONValue.swift b/Sources/JSONCodable/JSONValue.swift index 1d4c1fc..d2c6f6d 100644 --- a/Sources/JSONCodable/JSONValue.swift +++ b/Sources/JSONCodable/JSONValue.swift @@ -163,9 +163,7 @@ extension JSONValue: CustomDebugStringConvertible { public var debugDescription: String { let encoder = JSONEncoder() encoder.outputFormatting = [.prettyPrinted, .sortedKeys] - if #available(iOS 13.0, macOS 10.15, tvOS 13.0, watchOS 6.0, *) { - encoder.outputFormatting.insert(.withoutEscapingSlashes) - } + encoder.outputFormatting.insert(.withoutEscapingSlashes) do { guard let json = String(data: try encoder.encode(self), encoding: .utf8) else {