Update Package.swift

m-barthelemy · Apr 21, 2023 · 9b91872 · 9b91872
1 parent 73c38cb
commit 9b91872
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/Package.swift b/Package.swift
@@ -1,11 +1,11 @@
-// swift-tools-version:5.5
+// swift-tools-version:5.7
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
 
 let package = Package(
     name: "AcmeSwift",
-    platforms: [.macOS(.v12)],
+    platforms: [.macOS(.v13)],
     products: [
         // Products define the executables and libraries a package produces, and make them visible to other packages.
         .library(
@@ -15,7 +15,7 @@ let package = Package(
     dependencies: [
         .package(url: "https://github.com/swift-server/async-http-client.git", from: "1.10.0"),
         .package(url: "https://github.com/apple/swift-crypto.git", from: "2.1.0"),
-        .package(url: "https://github.com/vapor/jwt-kit.git", .branch("main")),
+        .package(url: "https://github.com/vapor/jwt-kit.git", branch: "main"),
         // x509
         .package(url: "https://github.com/outfoxx/PotentCodables.git", from: "2.2.0"),
     ],

diff --git a/Tests/AcmeSwiftTests/OrderTests.swift b/Tests/AcmeSwiftTests/OrderTests.swift
@@ -52,7 +52,7 @@ final class OrderTests: XCTestCase {
             XCTAssert(challengeDescriptions.count == 2, "Ensure we have 1 pending challenge")
             XCTAssert(challengeDescriptions.filter({$0.type == .dns}).count == 2, "Ensure challenges are of the desired type")
 
-            try await acme.orders.refresh(order: &order)
+            try await acme.orders.refresh(&order)
 
         }
         catch(let error) {
@@ -61,7 +61,7 @@ final class OrderTests: XCTestCase {
         }
     }
 
-    /*func testWrapItUpLikeABurrito() async throws {
+    func testWrapItUpLikeABurrito() async throws {
         let privateKeyPem = """
             -----BEGIN PRIVATE KEY-----
             MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQglxrdsu3lP83xzUej
@@ -91,16 +91,17 @@ final class OrderTests: XCTestCase {
             }
             print("\n =====> CREATE DNS CHALLENGES!!\n")
 
-            try await Task.sleep(nanoseconds: 6_000_000_000)
+            try await Task.sleep(for: .seconds(20))
 
             let failed = try await acme.orders.validateChallenges(from: order, preferring: .dns)
             guard failed.count == 0 else {
                 fatalError("Some validations failed! \(failed)")
             }
-            try await acme.orders.refresh(order: &order)
+            try await acme.orders.refresh(&order)
             print("\n => order: \(toJson(order))")
 
-            let csr = try AcmeX509Csr.ecdsa(domains: domains)
+            //let csr = try AcmeX509Csr.ecdsa(domains: domains)
+            let csr = try AcmeX509Csr.ecdsa(order: order)
 
             let finalized = try await acme.orders.finalize(order: order, withCsr: csr)
             let certs = try await acme.certificates.download(for: finalized)
@@ -112,7 +113,7 @@ final class OrderTests: XCTestCase {
             print("\n•••• BOOM! \(error)")
             throw error
         }
-    }*/
+    }
 
     private func toJson<T: Encodable>(_ value: T) -> String {
         let encoder = JSONEncoder()