Merge branch 'main' into ff-fix-warnings

kylebrowning · web-flow · commit 5f1e9ca6ea1c · 2026-03-26T08:41:11.000-07:00
diff --git a/Package.swift b/Package.swift
@@ -40,6 +40,8 @@ let package = Package(
                 .target(name: "APNSCore"),
                 .target(name: "APNS"),
                 .target(name: "APNSTestServer"),
+                .product(name: "Crypto", package: "swift-crypto"),
+                .product(name: "NIOPosix", package: "swift-nio"),
             ]
         ),
         .target(
@@ -51,9 +53,14 @@ let package = Package(
         .target(
             name: "APNS",
             dependencies: [
-                .product(name: "Crypto", package: "swift-crypto"),
-                .product(name: "AsyncHTTPClient", package: "async-http-client"),
                 .target(name: "APNSCore"),
+                .product(name: "AsyncHTTPClient", package: "async-http-client"),
+                .product(name: "Crypto", package: "swift-crypto"),
+                .product(name: "NIOFoundationCompat", package: "swift-nio"),
+                .product(name: "NIOHTTP1", package: "swift-nio"),
+                .product(name: "NIOPosix", package: "swift-nio"),
+                .product(name: "NIOTLS", package: "swift-nio"),
+                .product(name: "NIOSSL", package: "swift-nio-ssl"),
             ]
         ),
         .target(
diff --git a/Package@swift-5.10.swift b/Package@swift-5.10.swift
@@ -40,6 +40,8 @@ let package = Package(
                 .target(name: "APNSCore"),
                 .target(name: "APNS"),
                 .target(name: "APNSTestServer"),
+                .product(name: "Crypto", package: "swift-crypto"),
+                .product(name: "NIOPosix", package: "swift-nio"),
             ]
         ),
         .target(
@@ -51,9 +53,14 @@ let package = Package(
         .target(
             name: "APNS",
             dependencies: [
-                .product(name: "Crypto", package: "swift-crypto"),
-                .product(name: "AsyncHTTPClient", package: "async-http-client"),
                 .target(name: "APNSCore"),
+                .product(name: "AsyncHTTPClient", package: "async-http-client"),
+                .product(name: "Crypto", package: "swift-crypto"),
+                .product(name: "NIOFoundationCompat", package: "swift-nio"),
+                .product(name: "NIOHTTP1", package: "swift-nio"),
+                .product(name: "NIOPosix", package: "swift-nio"),
+                .product(name: "NIOTLS", package: "swift-nio"),
+                .product(name: "NIOSSL", package: "swift-nio-ssl"),
             ]
         ),
         .target(
diff --git a/Sources/APNS/APNSBroadcastClient.swift b/Sources/APNS/APNSBroadcastClient.swift
@@ -14,8 +14,13 @@
 
 import APNSCore
 import AsyncHTTPClient
+#if canImport(FoundationEssentials)
+import struct FoundationEssentials.Date
+import struct FoundationEssentials.UUID
+#else
 import struct Foundation.Date
 import struct Foundation.UUID
+#endif
 import NIOConcurrencyHelpers
 import NIOCore
 import NIOHTTP1
diff --git a/Sources/APNS/APNSClient.swift b/Sources/APNS/APNSClient.swift
@@ -14,8 +14,13 @@
 
 import APNSCore
 import AsyncHTTPClient
+#if canImport(FoundationEssentials)
+import struct FoundationEssentials.Date
+import struct FoundationEssentials.UUID
+#else
 import struct Foundation.Date
 import struct Foundation.UUID
+#endif
 import NIOConcurrencyHelpers
 import NIOCore
 import NIOHTTP1
diff --git a/Sources/APNS/Coding/APNSJSONDecoder.swift b/Sources/APNS/Coding/APNSJSONDecoder.swift
@@ -12,7 +12,11 @@
 //
 //===----------------------------------------------------------------------===//
 
+#if canImport(FoundationEssentials)
+import FoundationEssentials
+#else
 import Foundation
+#endif
 import NIOCore
 import NIOFoundationCompat
 
diff --git a/Sources/APNS/Coding/APNSJSONEncoder.swift b/Sources/APNS/Coding/APNSJSONEncoder.swift
@@ -12,7 +12,11 @@
 //
 //===----------------------------------------------------------------------===//
 
+#if canImport(FoundationEssentials)
+import FoundationEssentials
+#else
 import Foundation
+#endif
 import NIOCore
 import NIOFoundationCompat
 
diff --git a/Sources/APNSCore/APNSError.swift b/Sources/APNSCore/APNSError.swift
@@ -12,8 +12,13 @@
 //
 //===----------------------------------------------------------------------===//
 
+#if canImport(FoundationEssentials)
+import struct FoundationEssentials.Date
+import struct FoundationEssentials.UUID
+#else
 import struct Foundation.Date
 import struct Foundation.UUID
+#endif
 
 /// An error returned by APNs.
 public struct APNSError: Error {
diff --git a/Sources/APNSCore/APNSRequest.swift b/Sources/APNSCore/APNSRequest.swift
@@ -12,7 +12,11 @@
 //
 //===----------------------------------------------------------------------===//
 
+#if canImport(FoundationEssentials)
+import struct FoundationEssentials.UUID
+#else
 import struct Foundation.UUID
+#endif
 
 public struct APNSRequest<Message: APNSMessage> {
     fileprivate final class _Storage {
diff --git a/Sources/APNSCore/APNSResponse.swift b/Sources/APNSCore/APNSResponse.swift
@@ -12,7 +12,11 @@
 //
 //===----------------------------------------------------------------------===//
 
+#if canImport(FoundationEssentials)
+import struct FoundationEssentials.UUID
+#else
 import struct Foundation.UUID
+#endif
 
 /// The response of a successful APNs request.
 public struct APNSResponse: Hashable, Sendable {
diff --git a/Sources/APNSCore/Alert/APNSAlertNotification.swift b/Sources/APNSCore/Alert/APNSAlertNotification.swift
@@ -12,7 +12,11 @@
 //
 //===----------------------------------------------------------------------===//
 
+#if canImport(FoundationEssentials)
+import struct FoundationEssentials.UUID
+#else
 import struct Foundation.UUID
+#endif
 
 /// An alert notification.
 ///
diff --git a/Sources/APNSCore/Background/APNSBackgroundNotification.swift b/Sources/APNSCore/Background/APNSBackgroundNotification.swift
@@ -12,7 +12,11 @@
 //
 //===----------------------------------------------------------------------===//
 
+#if canImport(FoundationEssentials)
+import struct FoundationEssentials.UUID
+#else
 import struct Foundation.UUID
+#endif
 
 /// A background notification.
 ///
diff --git a/Sources/APNSCore/Broadcast/APNSBroadcastClientProtocol.swift b/Sources/APNSCore/Broadcast/APNSBroadcastClientProtocol.swift
@@ -12,7 +12,11 @@
 //
 //===----------------------------------------------------------------------===//
 
+#if canImport(FoundationEssentials)
+import struct FoundationEssentials.UUID
+#else
 import struct Foundation.UUID
+#endif
 
 /// Protocol defining the broadcast channel management operations.
 public protocol APNSBroadcastClientProtocol: Sendable {
diff --git a/Sources/APNSCore/Broadcast/APNSBroadcastRequest.swift b/Sources/APNSCore/Broadcast/APNSBroadcastRequest.swift
@@ -12,7 +12,11 @@
 //
 //===----------------------------------------------------------------------===//
 
+#if canImport(FoundationEssentials)
+import struct FoundationEssentials.UUID
+#else
 import struct Foundation.UUID
+#endif
 
 /// Represents a request to the APNs broadcast channel management API.
 public struct APNSBroadcastRequest<Message: Encodable>: Sendable where Message: Sendable {
diff --git a/Sources/APNSCore/Broadcast/APNSBroadcastResponse.swift b/Sources/APNSCore/Broadcast/APNSBroadcastResponse.swift
@@ -12,7 +12,11 @@
 //
 //===----------------------------------------------------------------------===//
 
+#if canImport(FoundationEssentials)
+import struct FoundationEssentials.UUID
+#else
 import struct Foundation.UUID
+#endif
 
 /// Represents a response from a broadcast channel operation.
 public struct APNSBroadcastResponse<Body: Decodable>: Sendable where Body: Sendable {
diff --git a/Sources/APNSCore/Complication/APNSComplicationNotification.swift b/Sources/APNSCore/Complication/APNSComplicationNotification.swift
@@ -12,7 +12,11 @@
 //
 //===----------------------------------------------------------------------===//
 
+#if canImport(FoundationEssentials)
+import struct FoundationEssentials.UUID
+#else
 import struct Foundation.UUID
+#endif
 
 /// A complication notification.
 public struct APNSComplicationNotification<Payload: Encodable & Sendable>: APNSMessage {
diff --git a/Sources/APNSCore/FileProvider/APNSFileProviderNotification.swift b/Sources/APNSCore/FileProvider/APNSFileProviderNotification.swift
@@ -12,7 +12,11 @@
 //
 //===----------------------------------------------------------------------===//
 
+#if canImport(FoundationEssentials)
+import struct FoundationEssentials.UUID
+#else
 import struct Foundation.UUID
+#endif
 
 /// A file provider notification.
 public struct APNSFileProviderNotification<Payload: Encodable & Sendable>: APNSMessage {
diff --git a/Sources/APNSCore/LiveActivity/APNSLiveActivityNotification.swift b/Sources/APNSCore/LiveActivity/APNSLiveActivityNotification.swift
@@ -12,7 +12,11 @@
 //
 //===----------------------------------------------------------------------===//
 
+#if canImport(FoundationEssentials)
+import struct FoundationEssentials.UUID
+#else
 import struct Foundation.UUID
+#endif
 
 /// A live activity notification.
 ///
diff --git a/Sources/APNSCore/LiveActivity/APNSStartLiveActivityNotification.swift b/Sources/APNSCore/LiveActivity/APNSStartLiveActivityNotification.swift
@@ -12,7 +12,11 @@
 //
 //===----------------------------------------------------------------------===//
 
+#if canImport(FoundationEssentials)
+import struct FoundationEssentials.UUID
+#else
 import struct Foundation.UUID
+#endif
 
 /// A notification that starts a live activity
 ///
diff --git a/Sources/APNSCore/Location/APNSLocationNotification.swift b/Sources/APNSCore/Location/APNSLocationNotification.swift
@@ -12,7 +12,11 @@
 //
 //===----------------------------------------------------------------------===//
 
+#if canImport(FoundationEssentials)
+import struct FoundationEssentials.UUID
+#else
 import struct Foundation.UUID
+#endif
 
 /// A location notification.
 public struct APNSLocationNotification: APNSMessage {
diff --git a/Sources/APNSCore/PushToTalk/APNSPushToTalkNotification.swift b/Sources/APNSCore/PushToTalk/APNSPushToTalkNotification.swift
@@ -12,7 +12,11 @@
 //
 //===----------------------------------------------------------------------===//
 
+#if canImport(FoundationEssentials)
+import struct FoundationEssentials.UUID
+#else
 import struct Foundation.UUID
+#endif
 
 /// A Push to Talk (PTT) notification.
 public struct APNSPushToTalkNotification<Payload: Encodable & Sendable>: APNSMessage {
diff --git a/Sources/APNSCore/VoIP/APNSVoIPNotification.swift b/Sources/APNSCore/VoIP/APNSVoIPNotification.swift
@@ -12,7 +12,11 @@
 //
 //===----------------------------------------------------------------------===//
 
+#if canImport(FoundationEssentials)
+import struct FoundationEssentials.UUID
+#else
 import struct Foundation.UUID
+#endif
 
 /// A voice-over-IP notification.
 public struct APNSVoIPNotification<Payload: Encodable & Sendable>: APNSMessage {
diff --git a/Sources/APNSCore/Widgets/APNSWidgetsNotification.swift b/Sources/APNSCore/Widgets/APNSWidgetsNotification.swift
@@ -12,7 +12,11 @@
 //
 //===----------------------------------------------------------------------===//
 
+#if canImport(FoundationEssentials)
+import struct FoundationEssentials.UUID
+#else
 import struct Foundation.UUID
+#endif
 
 /// A widget update notification.
 public struct APNSWidgetsNotification: APNSMessage {
diff --git a/Sources/APNSExample/Program.swift b/Sources/APNSExample/Program.swift
@@ -15,7 +15,12 @@
 import APNSCore
 import APNS
 import Logging
+import NIOPosix
+#if canImport(FoundationEssentials)
+import FoundationEssentials
+#else
 import Foundation
+#endif
 
 let logger = Logger(label: "APNSwiftExample")
 
