From 99ce8e2354f905f3c1be98dbcce86ebc00c4d0c8 Mon Sep 17 00:00:00 2001 From: Apodini Bot <83810032+ApodiniBot@users.noreply.github.com> Date: Fri, 3 Dec 2021 21:44:09 +0100 Subject: [PATCH] Update dependencies (#8) * Update Apodini to 0.6.2 Co-authored-by: ApodiniBot Co-authored-by: Paul Schmiedmayer --- .github/workflows/build-and-test.yml | 2 +- .../xcshareddata/swiftpm/Package.resolved | 205 ++++++++---------- Shared/Package.resolved | 16 +- Shared/Package.swift | 2 +- WebService/Package.resolved | 205 ++++++++---------- WebService/Package.swift | 2 +- .../Sources/ExampleWebService/Example.swift | 2 +- 7 files changed, 190 insertions(+), 244 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 88ab79d..e8aeb0f 100644 --- 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 App -destination 'platform=iOS Simulator,OS=15.0,name=iPhone 12' + run: xcodebuild test -scheme App -destination 'platform=iOS Simulator,name=iPhone 13' macoswebservice: name: macOS WebService ${{ matrix.configuration }} runs-on: macos-11 diff --git a/Example.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Example.xcworkspace/xcshareddata/swiftpm/Package.resolved index 88366af..cbd74e1 100644 --- a/Example.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Example.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -6,8 +6,8 @@ "repositoryURL": "https://github.com/kylebrowning/APNSwift.git", "state": { "branch": null, - "revision": "03e83e2332d13a3c06d5cd70948166e5724c43c7", - "version": "3.0.0" + "revision": "b53fd38f5611c6b935427febb43d91b15be26c0d", + "version": "3.2.0" } }, { @@ -15,53 +15,53 @@ "repositoryURL": "https://github.com/Apodini/Apodini.git", "state": { "branch": null, - "revision": "e6a943b0db29b2df5c0c139ab993e57752bf22b7", - "version": "0.5.0" + "revision": "b0d2936496168e2635122534451a8537b2679668", + "version": "0.6.2" } }, { - "package": "AssociatedTypeRequirementsKit", - "repositoryURL": "https://github.com/nerdsupremacist/AssociatedTypeRequirementsKit.git", + "package": "ApodiniMigrator", + "repositoryURL": "https://github.com/Apodini/ApodiniMigrator.git", "state": { "branch": null, - "revision": "2e4c49c21ffb2135f1c99fbfcf2119c9d24f5e8c", - "version": "0.3.2" + "revision": "c2bb44275a82ec61de70e114d07eafc803d73f41", + "version": "0.1.4" } }, { - "package": "async-http-client", - "repositoryURL": "https://github.com/swift-server/async-http-client.git", + "package": "ApodiniTypeInformation", + "repositoryURL": "https://github.com/Apodini/ApodiniTypeInformation.git", "state": { "branch": null, - "revision": "8fa7f082b155ea325bcf7b2dbffaf81d4eea1ae4", - "version": "1.5.1" + "revision": "95109a6f3cf93a828d1b0adf2cdc299e31fe5e87", + "version": "0.2.1" } }, { - "package": "async-kit", - "repositoryURL": "https://github.com/vapor/async-kit.git", + "package": "AssociatedTypeRequirementsKit", + "repositoryURL": "https://github.com/nerdsupremacist/AssociatedTypeRequirementsKit.git", "state": { "branch": null, - "revision": "ae12394e466f7fe44725655e763f7e603ed876b5", - "version": "1.4.0" + "revision": "2e4c49c21ffb2135f1c99fbfcf2119c9d24f5e8c", + "version": "0.3.2" } }, { - "package": "console-kit", - "repositoryURL": "https://github.com/vapor/console-kit.git", + "package": "async-http-client", + "repositoryURL": "https://github.com/swift-server/async-http-client.git", "state": { "branch": null, - "revision": "75ea3b627d88221440b878e5dfccc73fd06842ed", - "version": "4.2.7" + "revision": "1081b0b0541f535ca088acdb56f5ca5598bc6247", + "version": "1.6.3" } }, { - "package": "FCM", - "repositoryURL": "https://github.com/MihaelIsaev/FCM.git", + "package": "async-kit", + "repositoryURL": "https://github.com/vapor/async-kit.git", "state": { "branch": null, - "revision": "5d35a93bde97fd34879bf1f7ca198f4efacd8eca", - "version": "2.11.1" + "revision": "3b1e7e9069a62295151c6c1609050cd38a0a7af5", + "version": "1.11.0" } }, { @@ -78,8 +78,8 @@ "repositoryURL": "https://github.com/vapor/fluent-kit.git", "state": { "branch": null, - "revision": "7d9982a788dc0bbc80937537a0e2b0a42d282202", - "version": "1.15.1" + "revision": "a3630ca9939bcb21b9f23c258764d82349f4d12d", + "version": "1.17.0" } }, { @@ -100,31 +100,22 @@ "version": "1.0.0" } }, - { - "package": "jwt", - "repositoryURL": "https://github.com/vapor/jwt.git", - "state": { - "branch": null, - "revision": "46eddb526fa70fd9d765a3bdffac73b2be487cfc", - "version": "4.0.0" - } - }, { "package": "jwt-kit", "repositoryURL": "https://github.com/vapor/jwt-kit.git", "state": { "branch": null, - "revision": "7a9a04df93e71de10fa2e8d6e9430dd0a7924643", - "version": "4.2.4" + "revision": "1822bb0abf0a31a4b5078ec19061c548835253b5", + "version": "4.3.0" } }, { - "package": "multipart-kit", - "repositoryURL": "https://github.com/vapor/multipart-kit.git", + "package": "MetadataSystem", + "repositoryURL": "https://github.com/Apodini/MetadataSystem.git", "state": { "branch": null, - "revision": "c9ea04017b7fb3b1f034ad7a77f8e53d3e080be5", - "version": "4.2.1" + "revision": "06cac46a958fdf700054f12f682b5c8f27577c9f", + "version": "0.1.1" } }, { @@ -137,30 +128,30 @@ } }, { - "package": "RichJSONParser", - "repositoryURL": "https://github.com/omochi/RichJSONParser.git", + "package": "PathKit", + "repositoryURL": "https://github.com/kylef/PathKit.git", "state": { "branch": null, - "revision": "263e2ecfe88d0500fa99e4cbc8c948529d335534", - "version": "3.0.0" + "revision": "3bfd2737b700b9a36565a8c94f4ad2b050a5e574", + "version": "1.0.1" } }, { - "package": "routing-kit", - "repositoryURL": "https://github.com/vapor/routing-kit.git", + "package": "RichJSONParser", + "repositoryURL": "https://github.com/omochi/RichJSONParser.git", "state": { "branch": null, - "revision": "a0801a36a6ad501d5ad6285cbcd4774de6b0a734", - "version": "4.3.0" + "revision": "263e2ecfe88d0500fa99e4cbc8c948529d335534", + "version": "3.0.0" } }, { "package": "Runtime", - "repositoryURL": "https://github.com/Supereg/Runtime.git", + "repositoryURL": "https://github.com/wickwirew/Runtime.git", "state": { "branch": null, - "revision": "596e22a518bb3f8177cd796cd77e5386098a33f8", - "version": "2.2.3" + "revision": "dad03135d7701a4e7b3a4051e75d6b37bd8e178e", + "version": "2.2.4" } }, { @@ -168,8 +159,8 @@ "repositoryURL": "https://github.com/soto-project/soto.git", "state": { "branch": null, - "revision": "693fc693b580a2c635c1457d09cbf54411691ffe", - "version": "5.7.0" + "revision": "cd90cff19b892078c17baae08270707e3fc1590c", + "version": "5.11.0" } }, { @@ -177,8 +168,8 @@ "repositoryURL": "https://github.com/soto-project/soto-core.git", "state": { "branch": null, - "revision": "98c7f11f9e66480984340950e7d0241c7456ac8e", - "version": "5.5.0" + "revision": "988f0d906f5c76cf93c88fa5820f7c72e4b8fd98", + "version": "5.8.0" } }, { @@ -190,13 +181,22 @@ "version": "0.4.0" } }, + { + "package": "Spectre", + "repositoryURL": "https://github.com/kylef/Spectre.git", + "state": { + "branch": null, + "revision": "26cc5e9ae0947092c7139ef7ba612e34646086c7", + "version": "0.10.1" + } + }, { "package": "sql-kit", "repositoryURL": "https://github.com/vapor/sql-kit.git", "state": { "branch": null, - "revision": "b70d1fea1b544dd819c17e83d59fb9aa85c81e74", - "version": "3.10.0" + "revision": "bfcaa637917faf2e2fbb4cec6aa45e9659c945b4", + "version": "3.14.0" } }, { @@ -235,31 +235,13 @@ "version": "0.4.4" } }, - { - "package": "swift-aws-lambda-runtime", - "repositoryURL": "https://github.com/swift-server/swift-aws-lambda-runtime.git", - "state": { - "branch": null, - "revision": "a9e15b13b30b6700056c4cfbdcf6a69382a9fb6f", - "version": "0.5.0" - } - }, - { - "package": "swift-backtrace", - "repositoryURL": "https://github.com/swift-server/swift-backtrace.git", - "state": { - "branch": null, - "revision": "d3e04a9d4b3833363fb6192065b763310b156d54", - "version": "1.3.1" - } - }, { "package": "swift-collections", "repositoryURL": "https://github.com/apple/swift-collections", "state": { "branch": null, - "revision": "9d8719c8bebdc79740b6969c912ac706eb721d7a", - "version": "0.0.7" + "revision": "48254824bb4248676bf7ce56014ff57b142b77eb", + "version": "1.0.2" } }, { @@ -267,17 +249,8 @@ "repositoryURL": "https://github.com/apple/swift-crypto.git", "state": { "branch": null, - "revision": "3bea268b223651c4ab7b7b9ad62ef9b2d4143eb6", - "version": "1.1.6" - } - }, - { - "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" } }, { @@ -298,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": "9a992ee3de1f8da9f2968fc96b26714834f3105f", - "version": "2.31.1" + "revision": "6aa9347d9bc5bbfe6a84983aec955c17ffea96ef", + "version": "2.33.0" } }, { @@ -312,8 +294,8 @@ "repositoryURL": "https://github.com/apple/swift-nio-extras.git", "state": { "branch": null, - "revision": "f72c4688f89c28502105509186eadc49a49cb922", - "version": "1.10.0" + "revision": "f73ca5ee9c6806800243f1ac415fcf82de9a4c91", + "version": "1.10.2" } }, { @@ -321,8 +303,8 @@ "repositoryURL": "https://github.com/apple/swift-nio-http2.git", "state": { "branch": null, - "revision": "f6cde03ef8ad57e3bd25743d1e678efd1e5239f7", - "version": "1.18.1" + "revision": "39ed0e753596afadad920e302ae769b28f3a982b", + "version": "1.19.0" } }, { @@ -330,8 +312,8 @@ "repositoryURL": "https://github.com/apple/swift-nio-ssl.git", "state": { "branch": null, - "revision": "4829979d9f5ed9a2f4c6efd9c1ed51d1ab4d0394", - "version": "2.14.1" + "revision": "0324d60429870284810ba5bdb039640761bf10c9", + "version": "2.17.0" } }, { @@ -339,35 +321,26 @@ "repositoryURL": "https://github.com/apple/swift-nio-transport-services.git", "state": { "branch": null, - "revision": "39587bceccda72780e2a8a8c5e857e42a9df2fa8", - "version": "1.11.0" - } - }, - { - "package": "vapor", - "repositoryURL": "https://github.com/vapor/vapor.git", - "state": { - "branch": null, - "revision": "5113bfcb0dbcfaefdc043acd8e161046eb4fbb65", - "version": "4.48.4" + "revision": "e7f5278a26442dc46783ba7e063643d524e414a0", + "version": "1.11.3" } }, { - "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/Shared/Package.resolved b/Shared/Package.resolved index 971163d..139ae58 100644 --- a/Shared/Package.resolved +++ b/Shared/Package.resolved @@ -6,8 +6,8 @@ "repositoryURL": "https://github.com/vapor/async-kit.git", "state": { "branch": null, - "revision": "ae12394e466f7fe44725655e763f7e603ed876b5", - "version": "1.4.0" + "revision": "3b1e7e9069a62295151c6c1609050cd38a0a7af5", + "version": "1.11.0" } }, { @@ -15,8 +15,8 @@ "repositoryURL": "https://github.com/vapor/fluent-kit.git", "state": { "branch": null, - "revision": "7d9982a788dc0bbc80937537a0e2b0a42d282202", - "version": "1.15.1" + "revision": "a3630ca9939bcb21b9f23c258764d82349f4d12d", + "version": "1.17.0" } }, { @@ -24,8 +24,8 @@ "repositoryURL": "https://github.com/vapor/sql-kit.git", "state": { "branch": null, - "revision": "b70d1fea1b544dd819c17e83d59fb9aa85c81e74", - "version": "3.10.0" + "revision": "bfcaa637917faf2e2fbb4cec6aa45e9659c945b4", + "version": "3.14.0" } }, { @@ -42,8 +42,8 @@ "repositoryURL": "https://github.com/apple/swift-nio.git", "state": { "branch": null, - "revision": "94f41c4121a82fae5c7b1cb03e630e9f9e5e20f1", - "version": "2.32.1" + "revision": "37e7a33de45bac894c0b08b56a2f755ebe4884e6", + "version": "2.35.0" } } ] diff --git a/Shared/Package.swift b/Shared/Package.swift index 2cff4d8..9c59deb 100644 --- a/Shared/Package.swift +++ b/Shared/Package.swift @@ -24,7 +24,7 @@ let package = Package( ) ], dependencies: [ - .package(url: "https://github.com/vapor/fluent-kit.git", from: "1.12.0") + .package(url: "https://github.com/vapor/fluent-kit.git", from: "1.17.0") ], targets: [ .target( diff --git a/WebService/Package.resolved b/WebService/Package.resolved index 88366af..cbd74e1 100644 --- a/WebService/Package.resolved +++ b/WebService/Package.resolved @@ -6,8 +6,8 @@ "repositoryURL": "https://github.com/kylebrowning/APNSwift.git", "state": { "branch": null, - "revision": "03e83e2332d13a3c06d5cd70948166e5724c43c7", - "version": "3.0.0" + "revision": "b53fd38f5611c6b935427febb43d91b15be26c0d", + "version": "3.2.0" } }, { @@ -15,53 +15,53 @@ "repositoryURL": "https://github.com/Apodini/Apodini.git", "state": { "branch": null, - "revision": "e6a943b0db29b2df5c0c139ab993e57752bf22b7", - "version": "0.5.0" + "revision": "b0d2936496168e2635122534451a8537b2679668", + "version": "0.6.2" } }, { - "package": "AssociatedTypeRequirementsKit", - "repositoryURL": "https://github.com/nerdsupremacist/AssociatedTypeRequirementsKit.git", + "package": "ApodiniMigrator", + "repositoryURL": "https://github.com/Apodini/ApodiniMigrator.git", "state": { "branch": null, - "revision": "2e4c49c21ffb2135f1c99fbfcf2119c9d24f5e8c", - "version": "0.3.2" + "revision": "c2bb44275a82ec61de70e114d07eafc803d73f41", + "version": "0.1.4" } }, { - "package": "async-http-client", - "repositoryURL": "https://github.com/swift-server/async-http-client.git", + "package": "ApodiniTypeInformation", + "repositoryURL": "https://github.com/Apodini/ApodiniTypeInformation.git", "state": { "branch": null, - "revision": "8fa7f082b155ea325bcf7b2dbffaf81d4eea1ae4", - "version": "1.5.1" + "revision": "95109a6f3cf93a828d1b0adf2cdc299e31fe5e87", + "version": "0.2.1" } }, { - "package": "async-kit", - "repositoryURL": "https://github.com/vapor/async-kit.git", + "package": "AssociatedTypeRequirementsKit", + "repositoryURL": "https://github.com/nerdsupremacist/AssociatedTypeRequirementsKit.git", "state": { "branch": null, - "revision": "ae12394e466f7fe44725655e763f7e603ed876b5", - "version": "1.4.0" + "revision": "2e4c49c21ffb2135f1c99fbfcf2119c9d24f5e8c", + "version": "0.3.2" } }, { - "package": "console-kit", - "repositoryURL": "https://github.com/vapor/console-kit.git", + "package": "async-http-client", + "repositoryURL": "https://github.com/swift-server/async-http-client.git", "state": { "branch": null, - "revision": "75ea3b627d88221440b878e5dfccc73fd06842ed", - "version": "4.2.7" + "revision": "1081b0b0541f535ca088acdb56f5ca5598bc6247", + "version": "1.6.3" } }, { - "package": "FCM", - "repositoryURL": "https://github.com/MihaelIsaev/FCM.git", + "package": "async-kit", + "repositoryURL": "https://github.com/vapor/async-kit.git", "state": { "branch": null, - "revision": "5d35a93bde97fd34879bf1f7ca198f4efacd8eca", - "version": "2.11.1" + "revision": "3b1e7e9069a62295151c6c1609050cd38a0a7af5", + "version": "1.11.0" } }, { @@ -78,8 +78,8 @@ "repositoryURL": "https://github.com/vapor/fluent-kit.git", "state": { "branch": null, - "revision": "7d9982a788dc0bbc80937537a0e2b0a42d282202", - "version": "1.15.1" + "revision": "a3630ca9939bcb21b9f23c258764d82349f4d12d", + "version": "1.17.0" } }, { @@ -100,31 +100,22 @@ "version": "1.0.0" } }, - { - "package": "jwt", - "repositoryURL": "https://github.com/vapor/jwt.git", - "state": { - "branch": null, - "revision": "46eddb526fa70fd9d765a3bdffac73b2be487cfc", - "version": "4.0.0" - } - }, { "package": "jwt-kit", "repositoryURL": "https://github.com/vapor/jwt-kit.git", "state": { "branch": null, - "revision": "7a9a04df93e71de10fa2e8d6e9430dd0a7924643", - "version": "4.2.4" + "revision": "1822bb0abf0a31a4b5078ec19061c548835253b5", + "version": "4.3.0" } }, { - "package": "multipart-kit", - "repositoryURL": "https://github.com/vapor/multipart-kit.git", + "package": "MetadataSystem", + "repositoryURL": "https://github.com/Apodini/MetadataSystem.git", "state": { "branch": null, - "revision": "c9ea04017b7fb3b1f034ad7a77f8e53d3e080be5", - "version": "4.2.1" + "revision": "06cac46a958fdf700054f12f682b5c8f27577c9f", + "version": "0.1.1" } }, { @@ -137,30 +128,30 @@ } }, { - "package": "RichJSONParser", - "repositoryURL": "https://github.com/omochi/RichJSONParser.git", + "package": "PathKit", + "repositoryURL": "https://github.com/kylef/PathKit.git", "state": { "branch": null, - "revision": "263e2ecfe88d0500fa99e4cbc8c948529d335534", - "version": "3.0.0" + "revision": "3bfd2737b700b9a36565a8c94f4ad2b050a5e574", + "version": "1.0.1" } }, { - "package": "routing-kit", - "repositoryURL": "https://github.com/vapor/routing-kit.git", + "package": "RichJSONParser", + "repositoryURL": "https://github.com/omochi/RichJSONParser.git", "state": { "branch": null, - "revision": "a0801a36a6ad501d5ad6285cbcd4774de6b0a734", - "version": "4.3.0" + "revision": "263e2ecfe88d0500fa99e4cbc8c948529d335534", + "version": "3.0.0" } }, { "package": "Runtime", - "repositoryURL": "https://github.com/Supereg/Runtime.git", + "repositoryURL": "https://github.com/wickwirew/Runtime.git", "state": { "branch": null, - "revision": "596e22a518bb3f8177cd796cd77e5386098a33f8", - "version": "2.2.3" + "revision": "dad03135d7701a4e7b3a4051e75d6b37bd8e178e", + "version": "2.2.4" } }, { @@ -168,8 +159,8 @@ "repositoryURL": "https://github.com/soto-project/soto.git", "state": { "branch": null, - "revision": "693fc693b580a2c635c1457d09cbf54411691ffe", - "version": "5.7.0" + "revision": "cd90cff19b892078c17baae08270707e3fc1590c", + "version": "5.11.0" } }, { @@ -177,8 +168,8 @@ "repositoryURL": "https://github.com/soto-project/soto-core.git", "state": { "branch": null, - "revision": "98c7f11f9e66480984340950e7d0241c7456ac8e", - "version": "5.5.0" + "revision": "988f0d906f5c76cf93c88fa5820f7c72e4b8fd98", + "version": "5.8.0" } }, { @@ -190,13 +181,22 @@ "version": "0.4.0" } }, + { + "package": "Spectre", + "repositoryURL": "https://github.com/kylef/Spectre.git", + "state": { + "branch": null, + "revision": "26cc5e9ae0947092c7139ef7ba612e34646086c7", + "version": "0.10.1" + } + }, { "package": "sql-kit", "repositoryURL": "https://github.com/vapor/sql-kit.git", "state": { "branch": null, - "revision": "b70d1fea1b544dd819c17e83d59fb9aa85c81e74", - "version": "3.10.0" + "revision": "bfcaa637917faf2e2fbb4cec6aa45e9659c945b4", + "version": "3.14.0" } }, { @@ -235,31 +235,13 @@ "version": "0.4.4" } }, - { - "package": "swift-aws-lambda-runtime", - "repositoryURL": "https://github.com/swift-server/swift-aws-lambda-runtime.git", - "state": { - "branch": null, - "revision": "a9e15b13b30b6700056c4cfbdcf6a69382a9fb6f", - "version": "0.5.0" - } - }, - { - "package": "swift-backtrace", - "repositoryURL": "https://github.com/swift-server/swift-backtrace.git", - "state": { - "branch": null, - "revision": "d3e04a9d4b3833363fb6192065b763310b156d54", - "version": "1.3.1" - } - }, { "package": "swift-collections", "repositoryURL": "https://github.com/apple/swift-collections", "state": { "branch": null, - "revision": "9d8719c8bebdc79740b6969c912ac706eb721d7a", - "version": "0.0.7" + "revision": "48254824bb4248676bf7ce56014ff57b142b77eb", + "version": "1.0.2" } }, { @@ -267,17 +249,8 @@ "repositoryURL": "https://github.com/apple/swift-crypto.git", "state": { "branch": null, - "revision": "3bea268b223651c4ab7b7b9ad62ef9b2d4143eb6", - "version": "1.1.6" - } - }, - { - "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" } }, { @@ -298,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": "9a992ee3de1f8da9f2968fc96b26714834f3105f", - "version": "2.31.1" + "revision": "6aa9347d9bc5bbfe6a84983aec955c17ffea96ef", + "version": "2.33.0" } }, { @@ -312,8 +294,8 @@ "repositoryURL": "https://github.com/apple/swift-nio-extras.git", "state": { "branch": null, - "revision": "f72c4688f89c28502105509186eadc49a49cb922", - "version": "1.10.0" + "revision": "f73ca5ee9c6806800243f1ac415fcf82de9a4c91", + "version": "1.10.2" } }, { @@ -321,8 +303,8 @@ "repositoryURL": "https://github.com/apple/swift-nio-http2.git", "state": { "branch": null, - "revision": "f6cde03ef8ad57e3bd25743d1e678efd1e5239f7", - "version": "1.18.1" + "revision": "39ed0e753596afadad920e302ae769b28f3a982b", + "version": "1.19.0" } }, { @@ -330,8 +312,8 @@ "repositoryURL": "https://github.com/apple/swift-nio-ssl.git", "state": { "branch": null, - "revision": "4829979d9f5ed9a2f4c6efd9c1ed51d1ab4d0394", - "version": "2.14.1" + "revision": "0324d60429870284810ba5bdb039640761bf10c9", + "version": "2.17.0" } }, { @@ -339,35 +321,26 @@ "repositoryURL": "https://github.com/apple/swift-nio-transport-services.git", "state": { "branch": null, - "revision": "39587bceccda72780e2a8a8c5e857e42a9df2fa8", - "version": "1.11.0" - } - }, - { - "package": "vapor", - "repositoryURL": "https://github.com/vapor/vapor.git", - "state": { - "branch": null, - "revision": "5113bfcb0dbcfaefdc043acd8e161046eb4fbb65", - "version": "4.48.4" + "revision": "e7f5278a26442dc46783ba7e063643d524e414a0", + "version": "1.11.3" } }, { - "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 index 90b01d4..300336c 100644 --- a/WebService/Package.swift +++ b/WebService/Package.swift @@ -19,7 +19,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(url: "https://github.com/vapor/fluent-sqlite-driver.git", from: "4.1.0"), .package(path: "../Shared") ], diff --git a/WebService/Sources/ExampleWebService/Example.swift b/WebService/Sources/ExampleWebService/Example.swift index aa85f81..60683dc 100644 --- a/WebService/Sources/ExampleWebService/Example.swift +++ b/WebService/Sources/ExampleWebService/Example.swift @@ -29,7 +29,7 @@ public struct Example: WebService { } // Defines on which hostname and port the webservice should be bound to, configurable via CLI-arguments, else defaults - HTTPConfiguration(port: port) + HTTPConfiguration(bindAddress: .interface(port: port)) // Setup of example database (in this case SQlite) and add migrations to create the respective tables DatabaseConfiguration(.sqlite(.file(databasePath)), as: .sqlite)