Add support for new version of APNSwift (#51)

* Update Package.swift * Update Swift tools minimum version * Rename to “VaporAPNS” * Fix directory structure * Rename tests target * Update minimum platform versions * Fix imports and exports * Delete interactions with removed APNSwift features * Export APNSCore * Remove exports * Fix imports in tests file * Fix tests --------- Co-authored-by: Kyle Browning <[email protected]>
vapor · May 15, 2023 · 1637a30 · 1637a30
1 parent 263c835
commit 1637a30
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 32 deletions.
diff --git a/Package.swift b/Package.swift
@@ -1,26 +1,26 @@
-// swift-tools-version:5.6
+// swift-tools-version:5.7
 import PackageDescription
 
 let package = Package(
-    name: "apns",
+    name: "vapor-apns",
     platforms: [
-       .macOS(.v12),
-       .iOS(.v15)
+       .macOS(.v13),
+       .iOS(.v16)
     ],
     products: [
-        .library(name: "APNS", targets: ["APNS"]),
+        .library(name: "VaporAPNS", targets: ["VaporAPNS"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/swift-server-community/APNSwift.git", from: "5.0.0-beta.2"),
+        .package(url: "https://github.com/swift-server-community/APNSwift.git", from: "5.0.0-beta.3"),
         .package(url: "https://github.com/vapor/vapor.git", from: "4.0.0"),
     ],
     targets: [
-        .target(name: "APNS", dependencies: [
-            .product(name: "APNSwift", package: "apnswift"),
+        .target(name: "VaporAPNS", dependencies: [
+            .product(name: "APNS", package: "apnswift"),
             .product(name: "Vapor", package: "vapor"),
         ]),
-        .testTarget(name: "APNSTests", dependencies: [
-            .target(name: "APNS"),
+        .testTarget(name: "VaporAPNSTests", dependencies: [
+            .target(name: "VaporAPNS"),
             .product(name: "XCTVapor", package: "vapor"),
         ]),
     ]

diff --git a/Sources/APNS/Exports.swift b/Sources/APNS/Exports.swift
diff --git a/Sources/APNS/APNSContainerID.swift → Sources/VaporAPNS/APNSContainerID.swift b/Sources/APNS/APNSContainerID.swift → Sources/VaporAPNS/APNSContainerID.swift
diff --git a/Sources/APNS/APNSContainers.swift → Sources/VaporAPNS/APNSContainers.swift b/Sources/APNS/APNSContainers.swift → Sources/VaporAPNS/APNSContainers.swift
@@ -1,6 +1,8 @@
 import Vapor
-import APNSwift
+import APNS
+import Foundation
 import NIO
+import NIOConcurrencyHelpers
 
 public typealias APNSGenericClient = APNSClient<JSONDecoder, JSONEncoder>
 
@@ -24,7 +26,7 @@ public class APNSContainers {
 
     private var containers: [ID: Container]
     private var defaultID: ID?
-    private var lock: Lock
+    private var lock: NIOLock
 
     init() {
         self.containers = [:]
@@ -52,7 +54,6 @@ extension APNSContainers {
         responseDecoder: JSONDecoder,
         requestEncoder: JSONEncoder,
         byteBufferAllocator: ByteBufferAllocator = .init(),
-        backgroundActivityLogger: Logger,
         as id: ID,
         isDefault: Bool? = nil
     ) {
@@ -66,8 +67,7 @@ extension APNSContainers {
                 eventLoopGroupProvider: eventLoopGroupProvider,
                 responseDecoder: responseDecoder,
                 requestEncoder: requestEncoder,
-                byteBufferAllocator: byteBufferAllocator,
-                backgroundActivityLogger: backgroundActivityLogger
+                byteBufferAllocator: byteBufferAllocator
             )
         )
 

diff --git a/Sources/APNS/Application+APNS.swift → Sources/VaporAPNS/Application+APNS.swift b/Sources/APNS/Application+APNS.swift → Sources/VaporAPNS/Application+APNS.swift
@@ -1,4 +1,5 @@
-import APNSwift
+import APNS
+import NIOConcurrencyHelpers
 import Vapor
 
 extension Application {
@@ -9,7 +10,7 @@ extension Application {
     public struct APNS {
 
         // Synchronize access across threads.
-        private var lock: Lock
+        private var lock: NIOLock
 
         struct ContainersKey: StorageKey, LockKey {
             typealias Value = APNSContainers

diff --git a/Sources/APNS/Docs.docc/index.md → Sources/VaporAPNS/Docs.docc/index.md b/Sources/APNS/Docs.docc/index.md → Sources/VaporAPNS/Docs.docc/index.md
diff --git a/Sources/APNS/Request+APNS.swift → Sources/VaporAPNS/Request+APNS.swift b/Sources/APNS/Request+APNS.swift → Sources/VaporAPNS/Request+APNS.swift
@@ -1,4 +1,4 @@
-import APNSwift
+import APNS
 import Vapor
 
 extension Request {

diff --git a/Tests/APNSTests/APNSTests.swift → Tests/VaporAPNSTests/APNSTests.swift b/Tests/APNSTests/APNSTests.swift → Tests/VaporAPNSTests/APNSTests.swift
@@ -1,4 +1,5 @@
 import APNS
+import VaporAPNS
 import XCTVapor
 
 class APNSTests: XCTestCase {
@@ -29,7 +30,6 @@ class APNSTests: XCTestCase {
             eventLoopGroupProvider: .createNew,
             responseDecoder: JSONDecoder(),
             requestEncoder: JSONEncoder(),
-            backgroundActivityLogger: app.logger,
             as: .default
         )
 
@@ -45,8 +45,7 @@ class APNSTests: XCTestCase {
                     topic: "MY_TOPC",
                     payload: Payload()
                 ),
-                deviceToken: "98AAD4A2398DDC58595F02FA307DF9A15C18B6111D1B806949549085A8E6A55D",
-                deadline: .distantFuture
+                deviceToken: "98AAD4A2398DDC58595F02FA307DF9A15C18B6111D1B806949549085A8E6A55D"
             )
             return .ok
         }
@@ -75,7 +74,6 @@ class APNSTests: XCTestCase {
             eventLoopGroupProvider: .createNew,
             responseDecoder: JSONDecoder(),
             requestEncoder: JSONEncoder(),
-            backgroundActivityLogger: app.logger,
             as: .default
         )
 
@@ -105,7 +103,6 @@ class APNSTests: XCTestCase {
             eventLoopGroupProvider: .createNew,
             responseDecoder: JSONDecoder(),
             requestEncoder: JSONEncoder(),
-            backgroundActivityLogger: app.logger,
             as: .custom
         )
 
@@ -140,7 +137,6 @@ class APNSTests: XCTestCase {
             eventLoopGroupProvider: .createNew,
             responseDecoder: JSONDecoder(),
             requestEncoder: JSONEncoder(),
-            backgroundActivityLogger: app.logger,
             as: .default,
             isDefault: true
         )
@@ -155,7 +151,6 @@ class APNSTests: XCTestCase {
             eventLoopGroupProvider: .createNew,
             responseDecoder: JSONDecoder(),
             requestEncoder: JSONEncoder(),
-            backgroundActivityLogger: app.logger,
             as: .custom,
             isDefault: true
         )
@@ -192,7 +187,6 @@ class APNSTests: XCTestCase {
             eventLoopGroupProvider: .createNew,
             responseDecoder: JSONDecoder(),
             requestEncoder: JSONEncoder(),
-            backgroundActivityLogger: app.logger,
             as: .default,
             isDefault: true
         )
@@ -207,7 +201,6 @@ class APNSTests: XCTestCase {
             eventLoopGroupProvider: .createNew,
             responseDecoder: JSONDecoder(),
             requestEncoder: JSONEncoder(),
-            backgroundActivityLogger: app.logger,
             as: .custom
         )