Merge pull request #18 from stackotter/master

Support macOS 10.15, iOS 13, tvOS 13, and watchOS 6
tayloraswift · Sep 2, 2024 · 4d70a94 · 4d70a94
2 parents 7a3fbb7 + d589995
commit 4d70a94
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 8 deletions.
diff --git a/Package.swift b/Package.swift
@@ -3,7 +3,7 @@ import PackageDescription
 
 let package:Package = .init(
     name: "swift-hash",
-    platforms: [.macOS("13.3"), .iOS("16.4"), .tvOS("16.4"), .watchOS("9.4")],
+    platforms: [.macOS(.v10_15), .iOS(.v13), .tvOS(.v13), .watchOS(.v6)],
     products: [
         .library(name: "Base16",                targets: ["Base16"]),
         .library(name: "Base64",                targets: ["Base64"]),

diff --git a/Sources/InlineBuffer/InlineBuffer.swift b/Sources/InlineBuffer/InlineBuffer.swift
@@ -100,6 +100,7 @@ extension InlineBuffer:RandomAccessCollection, MutableCollection
         }
     }
 }
+@available(macOS 13.3, iOS 16.4, macCatalyst 16.4, tvOS 16.4, visionOS 1, watchOS 9.4, *)
 extension InlineBuffer:ExpressibleByIntegerLiteral
 {
     @inlinable public
@@ -153,18 +154,32 @@ extension InlineBuffer:CustomStringConvertible
     @inlinable public
     var description:String
     {
-        .init(unsafeUninitializedCapacity: 2 * self.count)
+        func hex(remainder:UInt8) -> UInt8
         {
-            func hex(remainder:UInt8) -> UInt8
+            (remainder < 10 ? 0x30 : 0x61 - 10) &+ remainder
+        }
+        if #available(macOS 11, iOS 14, macCatalyst 14, tvOS 14, visionOS 1, watchOS 7, *)
+        {
+            return .init(unsafeUninitializedCapacity: 2 * self.count)
             {
-                (remainder < 10 ? 0x30 : 0x61 - 10) &+ remainder
+                for (i, byte):(Int, UInt8) in self.enumerated()
+                {
+                    $0[2 * i    ] = hex(remainder: byte >> 4)
+                    $0[2 * i + 1] = hex(remainder: byte & 0x0f)
+                }
+                return 2 * self.count
             }
-            for (i, byte):(Int, UInt8) in self.enumerated()
+        }
+        else
+        {
+            var description:String = ""
+            description.reserveCapacity(2 * self.count)
+            for byte:UInt8 in self
             {
-                $0[2 * i    ] = hex(remainder: byte >> 4)
-                $0[2 * i + 1] = hex(remainder: byte & 0x0f)
+                description.append(Character.init(.init(hex(remainder: byte >> 4))))
+                description.append(Character.init(.init(hex(remainder: byte & 0x0f))))
             }
-            return 2 * self.count
+            return description
         }
     }
 }

diff --git a/Sources/MD5/MD5.swift b/Sources/MD5/MD5.swift
@@ -100,6 +100,7 @@ extension MD5:LosslessStringConvertible
         }
     }
 }
+@available(macOS 13.3, iOS 16.4, macCatalyst 16.4, tvOS 16.4, visionOS 1, watchOS 9.4, *)
 extension MD5:ExpressibleByIntegerLiteral
 {
     @inlinable public

diff --git a/Sources/MD5Tests/Main.swift b/Sources/MD5Tests/Main.swift
@@ -7,6 +7,20 @@ enum Main:TestMain, TestBattery
     static
     func run(tests:TestGroup)
     {
+        guard #available(
+            macOS 13.3,
+            iOS 16.4,
+            macCatalyst 16.4,
+            tvOS 16.4,
+            visionOS 1.0,
+            watchOS 9.4,
+            *
+        )
+        else
+        {
+            fatalError("MD5Tests requires macOS 13.3+, iOS 16.4+, tvOS 16.4+, visionOS 1.0+, or watchOS 9.4+")
+        }
+
         if  let tests:TestGroup = tests / "Strings"
         {
             let string:String   =   "d41d8cd98f00b204e9800998ecf8427e"

diff --git a/Sources/SHA1/SHA1.swift b/Sources/SHA1/SHA1.swift
@@ -83,6 +83,7 @@ extension SHA1:LosslessStringConvertible
         }
     }
 }
+@available(macOS 13.3, iOS 16.4, macCatalyst 16.4, tvOS 16.4, visionOS 1, watchOS 9.4, *)
 extension SHA1:ExpressibleByIntegerLiteral
 {
     @inlinable public