diff --git a/Package.resolved b/Package.resolved index 5e83402..fbdc203 100644 --- a/Package.resolved +++ b/Package.resolved @@ -6,8 +6,8 @@ "repositoryURL": "https://github.com/swift-server/async-http-client.git", "state": { "branch": null, - "revision": "70826d038d5bdc3142a386b735792d87ef7a5dfc", - "version": "1.8.1" + "revision": "24425989dadab6d6e4167174791a23d4e2a6d0c3", + "version": "1.10.0" } }, { @@ -60,8 +60,8 @@ "repositoryURL": "https://github.com/vapor/routing-kit.git", "state": { "branch": null, - "revision": "5603b81ceb744b8318feab1e60943704977a866b", - "version": "4.3.1" + "revision": "9e181d685a3dec1eef1fc6dacf606af364f86d68", + "version": "4.5.0" } }, { @@ -73,6 +73,15 @@ "version": "3.15.0" } }, + { + "package": "swift-algorithms", + "repositoryURL": "https://github.com/apple/swift-algorithms.git", + "state": { + "branch": null, + "revision": "b14b7f4c528c942f121c8b860b9410b2bf57825e", + "version": "1.0.0" + } + }, { "package": "swift-backtrace", "repositoryURL": "https://github.com/swift-server/swift-backtrace.git", @@ -114,8 +123,8 @@ "repositoryURL": "https://github.com/apple/swift-nio.git", "state": { "branch": null, - "revision": "37e7a33de45bac894c0b08b56a2f755ebe4884e6", - "version": "2.35.0" + "revision": "124119f0bb12384cef35aa041d7c3a686108722d", + "version": "2.40.0" } }, { @@ -132,8 +141,8 @@ "repositoryURL": "https://github.com/apple/swift-nio-http2.git", "state": { "branch": null, - "revision": "39ed0e753596afadad920e302ae769b28f3a982b", - "version": "1.19.0" + "revision": "72bcaf607b40d7c51044f65b0f5ed8581a911832", + "version": "1.21.0" } }, { @@ -150,8 +159,17 @@ "repositoryURL": "https://github.com/apple/swift-nio-transport-services.git", "state": { "branch": null, - "revision": "e7f5278a26442dc46783ba7e063643d524e414a0", - "version": "1.11.3" + "revision": "1a4692acb88156e3da1b0c6732a8a38b2a744166", + "version": "1.12.0" + } + }, + { + "package": "swift-numerics", + "repositoryURL": "https://github.com/apple/swift-numerics", + "state": { + "branch": null, + "revision": "0a5bc04095a675662cf24757cc0640aa2204253b", + "version": "1.0.2" } }, { @@ -159,8 +177,8 @@ "repositoryURL": "https://github.com/vapor/vapor.git", "state": { "branch": null, - "revision": "34bf1b303623de04801d2b9bef5b2ed48b3e9319", - "version": "4.54.0" + "revision": "6c63226a4ab82ce53730eb1afb9ca63866fcf033", + "version": "4.61.1" } }, { diff --git a/Package.swift b/Package.swift index aac0428..829802c 100644 --- a/Package.swift +++ b/Package.swift @@ -14,8 +14,8 @@ let package = Package( ], dependencies: [ // Dependencies declare other packages that this package depends on. - .package(url: "https://github.com/vapor/vapor.git", from: "4.0.0"), - .package(url: "https://github.com/vapor/fluent.git", from: "4.0.0") + .package(url: "https://github.com/vapor/vapor.git", from: "4.61.1"), + .package(url: "https://github.com/vapor/fluent.git", from: "4.4.0") ], targets: [ // Targets are the basic building blocks of a package. A target can define a module or a test suite. diff --git a/Sources/YData/Client/InternalResponse+Vapor.swift b/Sources/YData/Client/InternalResponse+Vapor.swift index 3396855..8e030ab 100644 --- a/Sources/YData/Client/InternalResponse+Vapor.swift +++ b/Sources/YData/Client/InternalResponse+Vapor.swift @@ -4,7 +4,7 @@ import Vapor extension ResponseEncodable where Self: InternalResponse { func encodeResponse(for request: Request) -> EventLoopFuture { let response = Vapor.Response(status: status, headers: headers) - response.body ?= body.flatMap(Vapor.Response.Body.init) + response.body ?= body.flatMap { Vapor.Response.Body(buffer: $0) } return request.eventLoop.makeSucceededFuture(response) } } @@ -57,25 +57,29 @@ public extension ClientResponse { do { return try content.decode(C.self) } catch { - throw Internal.ErrorResponse(headers: [:], - status: .internalServerError, - message: "failed to decode response \(error)") + throw Internal.ErrorResponse( + headers: [:], + status: .internalServerError, + message: "failed to decode response \(error)") } default: do { let contentError = try content.decode(Internal.ServiceError.self) - throw Internal.ErrorResponse(headers: headers, - status: status, - message:contentError.message) + throw Internal.ErrorResponse( + headers: headers, + status: status, + message: contentError.message) } catch DecodingError.keyNotFound { let contentError = try content.decode(String.self) - throw Internal.ErrorResponse(headers: headers, - status: status, - message: contentError) + throw Internal.ErrorResponse( + headers: headers, + status: status, + message: contentError) } catch { - throw Internal.ErrorResponse(headers: [:], - status: .internalServerError, - message: "failed to decode response with error \(error)") + throw Internal.ErrorResponse( + headers: [:], + status: .internalServerError, + message: "failed to decode response with error \(error)") } } } @@ -84,7 +88,7 @@ public extension ClientResponse { extension Internal.SuccessResponse: ResponseEncodable { public func encodeResponse(for request: Request) -> EventLoopFuture { let response = Vapor.Response(status: status, headers: headers) - response.body ?= body.flatMap(Vapor.Response.Body.init) + response.body ?= body.flatMap { Vapor.Response.Body(buffer: $0) } return request.eventLoop.makeSucceededFuture(response) } }