Update dependencies (#9)

* Update to Apodini 0.6.2 Co-authored-by: ApodiniBot <[email protected]> Co-authored-by: Paul Schmiedmayer <[email protected]>
Apodini · Dec 3, 2021 · b654f20 · b654f20
1 parent ba2b1f2
commit b654f20
Show file tree

Hide file tree

Showing 7 changed files with 137 additions and 227 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -31,7 +31,7 @@ jobs:
     - name: Check Swift version
       run: swift --version
     - name: Build and test
-      run: xcodebuild test -scheme Xpense -destination 'platform=iOS Simulator,name=iPhone 13 Pro'
+      run: xcodebuild test -scheme Xpense -destination 'platform=iOS Simulator,name=iPhone 13'
   macoswebservice:
     name: macOS Web Service ${{ matrix.configuration }}
     runs-on: macos-11

diff --git a/Shared/Package.resolved b/Shared/Package.resolved
@@ -15,8 +15,8 @@
         "repositoryURL": "https://github.com/apple/swift-crypto.git",
         "state": {
           "branch": null,
-          "revision": "9b5ef28601a9c745c9cdb54d3f243e28ac830982",
-          "version": "2.0.1"
+          "revision": "bd5abc2a123349b08a345d7d375db2a5d845ed35",
+          "version": "2.0.2"
         }
       }
     ]

diff --git a/Shared/Sources/XpenseModel/LocalStorageModel/LocalStorageModel.swift b/Shared/Sources/XpenseModel/LocalStorageModel/LocalStorageModel.swift
@@ -56,38 +56,38 @@ open class LocalStorageModel: Model {
     @discardableResult
     override open func save(_ account: Account) async throws -> Account {
         let newAccount = try await super.save(account)
-        await Task.sleep(250_000_000) // Delay for 0.25s
+        try await Task.sleep(nanoseconds: 250_000_000) // Delay for 0.25s
         return newAccount
     }
 
     @discardableResult
     override open func save(_ transaction: Transaction) async throws -> Transaction {
         let newTransaction = try await super.save(transaction)
-        await Task.sleep(250_000_000) // Delay for 0.25s
+        try await Task.sleep(nanoseconds: 250_000_000) // Delay for 0.25s
         return newTransaction
     }
 
     override open func delete(account id: Account.ID) async throws {
         try await super.delete(account: id)
-        await Task.sleep(250_000_000) // Delay for 0.25s
+        try await Task.sleep(nanoseconds: 250_000_000) // Delay for 0.25s
     }
 
     override open func delete(transaction id: Transaction.ID) async throws {
         try await super.delete(transaction: id)
-        await Task.sleep(250_000_000) // Delay for 0.25s
+        try await Task.sleep(nanoseconds: 250_000_000) // Delay for 0.25s
     }
 
     @discardableResult
     override open func signUp(_ name: String, password: String) async throws -> User {
         let user = try await super.signUp(name, password: password)
-        await Task.sleep(500_000_000) // Delay for 0.5s
+        try await Task.sleep(nanoseconds: 500_000_000) // Delay for 0.5s
         return user
     }
 
     @discardableResult
     override open func login(_ name: String, password: String) async throws -> String {
         let token = try await super.login(name, password: password)
-        await Task.sleep(500_000_000) // Delay for 0.5s
+        try await Task.sleep(nanoseconds: 500_000_000) // Delay for 0.5s
         return token
     }
 

diff --git a/WebService/Package.resolved b/WebService/Package.resolved
@@ -15,8 +15,8 @@
         "repositoryURL": "https://github.com/Apodini/Apodini.git",
         "state": {
           "branch": null,
-          "revision": "3738aa97daa1ceac2c8b6979c996e3b86e6eaedc",
-          "version": "0.5.2"
+          "revision": "b0d2936496168e2635122534451a8537b2679668",
+          "version": "0.6.2"
         }
       },
       {
@@ -51,35 +51,17 @@
         "repositoryURL": "https://github.com/swift-server/async-http-client.git",
         "state": {
           "branch": null,
-          "revision": "170fd536f931c0bffb58f37a53fc238e77f42258",
-          "version": "1.6.4"
+          "revision": "1081b0b0541f535ca088acdb56f5ca5598bc6247",
+          "version": "1.6.3"
         }
       },
       {
         "package": "async-kit",
         "repositoryURL": "https://github.com/vapor/async-kit.git",
         "state": {
           "branch": null,
-          "revision": "748c026f4dc93c0b9d05fe43a07d3922ca126744",
-          "version": "1.10.0"
-        }
-      },
-      {
-        "package": "console-kit",
-        "repositoryURL": "https://github.com/vapor/console-kit.git",
-        "state": {
-          "branch": null,
-          "revision": "75ea3b627d88221440b878e5dfccc73fd06842ed",
-          "version": "4.2.7"
-        }
-      },
-      {
-        "package": "FCM",
-        "repositoryURL": "https://github.com/MihaelIsaev/FCM.git",
-        "state": {
-          "branch": null,
-          "revision": "5d35a93bde97fd34879bf1f7ca198f4efacd8eca",
-          "version": "2.11.1"
+          "revision": "3b1e7e9069a62295151c6c1609050cd38a0a7af5",
+          "version": "1.11.0"
         }
       },
       {
@@ -96,26 +78,26 @@
         "repositoryURL": "https://github.com/vapor/fluent-kit.git",
         "state": {
           "branch": null,
-          "revision": "9fbef6bad614e0b1bf3083f629b40574c97ab0b9",
-          "version": "1.16.0"
+          "revision": "a3630ca9939bcb21b9f23c258764d82349f4d12d",
+          "version": "1.17.0"
         }
       },
       {
-        "package": "jmespath.swift",
-        "repositoryURL": "https://github.com/adam-fowler/jmespath.swift.git",
+        "package": "fluent-sqlite-driver",
+        "repositoryURL": "https://github.com/vapor/fluent-sqlite-driver.git",
         "state": {
           "branch": null,
-          "revision": "4a166ea71f0d9e9cc3523fc3dee516080a4c36a0",
-          "version": "1.0.0"
+          "revision": "9ca34be792979fb0f1dbd8e45b8af9f1e1440474",
+          "version": "4.1.0"
         }
       },
       {
-        "package": "jwt",
-        "repositoryURL": "https://github.com/vapor/jwt.git",
+        "package": "jmespath.swift",
+        "repositoryURL": "https://github.com/adam-fowler/jmespath.swift.git",
         "state": {
           "branch": null,
-          "revision": "f18aa4f69d9ec781d79b7b89352de326f82e17a9",
-          "version": "4.1.0"
+          "revision": "4a166ea71f0d9e9cc3523fc3dee516080a4c36a0",
+          "version": "1.0.0"
         }
       },
       {
@@ -136,15 +118,6 @@
           "version": "0.1.1"
         }
       },
-      {
-        "package": "multipart-kit",
-        "repositoryURL": "https://github.com/vapor/multipart-kit.git",
-        "state": {
-          "branch": null,
-          "revision": "2dd9368a3c9580792b77c7ef364f3735909d9996",
-          "version": "4.5.1"
-        }
-      },
       {
         "package": "OpenAPIKit",
         "repositoryURL": "https://github.com/mattpolzin/OpenAPIKit.git",
@@ -172,15 +145,6 @@
           "version": "3.0.0"
         }
       },
-      {
-        "package": "routing-kit",
-        "repositoryURL": "https://github.com/vapor/routing-kit.git",
-        "state": {
-          "branch": null,
-          "revision": "a0801a36a6ad501d5ad6285cbcd4774de6b0a734",
-          "version": "4.3.0"
-        }
-      },
       {
         "package": "Runtime",
         "repositoryURL": "https://github.com/wickwirew/Runtime.git",
@@ -195,8 +159,8 @@
         "repositoryURL": "https://github.com/soto-project/soto.git",
         "state": {
           "branch": null,
-          "revision": "c735c22ce67c78b39664fb6f63e3b340c97d024c",
-          "version": "5.10.0"
+          "revision": "cd90cff19b892078c17baae08270707e3fc1590c",
+          "version": "5.11.0"
         }
       },
       {
@@ -231,71 +195,62 @@
         "repositoryURL": "https://github.com/vapor/sql-kit.git",
         "state": {
           "branch": null,
-          "revision": "8587674e7e2499fd2017840973f416182025b02d",
-          "version": "3.12.1"
+          "revision": "bfcaa637917faf2e2fbb4cec6aa45e9659c945b4",
+          "version": "3.14.0"
         }
       },
       {
-        "package": "SwifCron",
-        "repositoryURL": "https://github.com/MihaelIsaev/SwifCron.git",
+        "package": "sqlite-kit",
+        "repositoryURL": "https://github.com/vapor/sqlite-kit.git",
         "state": {
           "branch": null,
-          "revision": "effe20321342705e66894d86720c5882e2f4095e",
-          "version": "1.3.1"
+          "revision": "2ec279b9c845cec254646834b66338551a024561",
+          "version": "4.0.2"
         }
       },
       {
-        "package": "swift-argument-parser",
-        "repositoryURL": "https://github.com/apple/swift-argument-parser",
+        "package": "sqlite-nio",
+        "repositoryURL": "https://github.com/vapor/sqlite-nio.git",
         "state": {
           "branch": null,
-          "revision": "83b23d940471b313427da226196661856f6ba3e0",
-          "version": "0.4.4"
+          "revision": "6481dd0b01112d082dd7eb362782126e81964138",
+          "version": "1.1.0"
         }
       },
       {
-        "package": "swift-aws-lambda-runtime",
-        "repositoryURL": "https://github.com/swift-server/swift-aws-lambda-runtime.git",
+        "package": "SwifCron",
+        "repositoryURL": "https://github.com/MihaelIsaev/SwifCron.git",
         "state": {
           "branch": null,
-          "revision": "699ada1724459582303c15aae64fa12ca4d33809",
-          "version": "0.5.2"
+          "revision": "effe20321342705e66894d86720c5882e2f4095e",
+          "version": "1.3.1"
         }
       },
       {
-        "package": "swift-backtrace",
-        "repositoryURL": "https://github.com/swift-server/swift-backtrace.git",
+        "package": "swift-argument-parser",
+        "repositoryURL": "https://github.com/apple/swift-argument-parser",
         "state": {
           "branch": null,
-          "revision": "d3e04a9d4b3833363fb6192065b763310b156d54",
-          "version": "1.3.1"
+          "revision": "83b23d940471b313427da226196661856f6ba3e0",
+          "version": "0.4.4"
         }
       },
       {
         "package": "swift-collections",
         "repositoryURL": "https://github.com/apple/swift-collections",
         "state": {
           "branch": null,
-          "revision": "2d33a0ea89c961dcb2b3da2157963d9c0370347e",
-          "version": "1.0.1"
+          "revision": "48254824bb4248676bf7ce56014ff57b142b77eb",
+          "version": "1.0.2"
         }
       },
       {
         "package": "swift-crypto",
         "repositoryURL": "https://github.com/apple/swift-crypto.git",
         "state": {
           "branch": null,
-          "revision": "9b5ef28601a9c745c9cdb54d3f243e28ac830982",
-          "version": "2.0.1"
-        }
-      },
-      {
-        "package": "swift-extras-base64",
-        "repositoryURL": "https://github.com/swift-extras/swift-extras-base64",
-        "state": {
-          "branch": null,
-          "revision": "97237cf1bc1feebaeb0febec91c1e1b9e4d839b3",
-          "version": "0.7.0"
+          "revision": "bd5abc2a123349b08a345d7d375db2a5d845ed35",
+          "version": "2.0.2"
         }
       },
       {
@@ -316,13 +271,22 @@
           "version": "2.2.0"
         }
       },
+      {
+        "package": "swift-metrics-extras",
+        "repositoryURL": "https://github.com/Apodini/swift-metrics-extras.git",
+        "state": {
+          "branch": null,
+          "revision": "a5f54d453519af7f1d6c83d03e045463bb9e659e",
+          "version": "0.1.0"
+        }
+      },
       {
         "package": "swift-nio",
         "repositoryURL": "https://github.com/apple/swift-nio.git",
         "state": {
           "branch": null,
-          "revision": "addf69cfe60376c325397c8926589415576b1dd1",
-          "version": "2.34.0"
+          "revision": "6aa9347d9bc5bbfe6a84983aec955c17ffea96ef",
+          "version": "2.33.0"
         }
       },
       {
@@ -339,17 +303,17 @@
         "repositoryURL": "https://github.com/apple/swift-nio-http2.git",
         "state": {
           "branch": null,
-          "revision": "326f7f9a8c8c8402e3691adac04911cac9f9d87f",
-          "version": "1.18.4"
+          "revision": "39ed0e753596afadad920e302ae769b28f3a982b",
+          "version": "1.19.0"
         }
       },
       {
         "package": "swift-nio-ssl",
         "repositoryURL": "https://github.com/apple/swift-nio-ssl.git",
         "state": {
           "branch": null,
-          "revision": "08e701df9a3b9108c56f1aef5d9ef9a78fda2846",
-          "version": "2.16.2"
+          "revision": "0324d60429870284810ba5bdb039640761bf10c9",
+          "version": "2.17.0"
         }
       },
       {
@@ -362,30 +326,21 @@
         }
       },
       {
-        "package": "vapor",
-        "repositoryURL": "https://github.com/vapor/vapor.git",
-        "state": {
-          "branch": null,
-          "revision": "80750314e0d9ae11b3886df7f43f495b0661d2dc",
-          "version": "4.52.2"
-        }
-      },
-      {
-        "package": "vapor-aws-lambda-runtime",
-        "repositoryURL": "https://github.com/vapor-community/vapor-aws-lambda-runtime.git",
+        "package": "websocket-kit",
+        "repositoryURL": "https://github.com/vapor/websocket-kit.git",
         "state": {
           "branch": null,
-          "revision": "610aaed1cdd7ef434ed23bc7006000948a221527",
-          "version": "0.6.2"
+          "revision": "b1c4df8f6c848c2e977726903bbe6578eed723ad",
+          "version": "2.2.0"
         }
       },
       {
-        "package": "websocket-kit",
-        "repositoryURL": "https://github.com/vapor/websocket-kit.git",
+        "package": "XCTAssertCrash",
+        "repositoryURL": "https://github.com/norio-nomura/XCTAssertCrash.git",
         "state": {
           "branch": null,
-          "revision": "b1c4df8f6c848c2e977726903bbe6578eed723ad",
-          "version": "2.2.0"
+          "revision": "880c5241254da53f32caf77248ee3d25cb2a9630",
+          "version": "0.2.0"
         }
       },
       {

diff --git a/WebService/Package.swift b/WebService/Package.swift
@@ -20,7 +20,7 @@ let package = Package(
         .executable(name: "WebService", targets: ["WebService"])
     ],
     dependencies: [
-        .package(url: "https://github.com/Apodini/Apodini.git", .upToNextMinor(from: "0.5.0")),
+        .package(url: "https://github.com/Apodini/Apodini.git", .upToNextMinor(from: "0.6.2")),
         .package(name: "Shared", path: "../Shared")
     ],
     targets: [

diff --git a/WebService/Sources/WebService/XpenseWebService.swift b/WebService/Sources/WebService/XpenseWebService.swift
@@ -37,7 +37,7 @@ struct XpenseWebService: WebService {
     }
 
     var configuration: Configuration {
-        HTTPConfiguration(port: port)
+        HTTPConfiguration(bindAddress: .interface(port: port))
         REST {
             OpenAPI()
         }