From cb668b486733f47a3bb3aee6e1bba997b06a3ee9 Mon Sep 17 00:00:00 2001 From: "cgrindel-self-hosted-renovate[bot]" <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Date: Thu, 24 Aug 2023 07:27:00 -0600 Subject: [PATCH] chore(deps): update dependency vapor/vapor to v4.79.0 (#544) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Update | Change | |---|---|---| | [vapor/vapor](https://togithub.com/vapor/vapor) | minor | `4.67.5` -> `4.79.0` | --- ### Release Notes
vapor/vapor (vapor/vapor) ### [`v4.79.0`](https://togithub.com/vapor/vapor/releases/tag/4.79.0): - Add Sendable Conformances to underlying types [Compare Source](https://togithub.com/vapor/vapor/compare/4.78.2...4.79.0) #### What's Changed Add Sendable Conformances to underlying types by [@​0xTim](https://togithub.com/0xTim) in [#​3054](https://togithub.com/vapor/vapor/issues/3054) > This adds Sendable annotations to many of Vapor’s types and APIs, including the request handlers. > > APIs are marked `@preconcurrency` where it makes sense to reduce warnings for anyone using the release. To fix your code and see the warnings, you can enable strict concurrency checking. > > **Note:** this PR does not touch `Request`, `Response` or `Application` as they require fundamental changes that are larger in scope and will be done in a future release. #### Reviewers Thanks to the reviewers for their help: - [@​FranzBusch](https://togithub.com/FranzBusch) - [@​Lukasa](https://togithub.com/Lukasa) ###### *This patch was released by [@​0xTim](https://togithub.com/0xTim)* **Full Changelog**: https://github.com/vapor/vapor/compare/4.78.2...4.79.0 ### [`v4.78.2`](https://togithub.com/vapor/vapor/releases/tag/4.78.2): - Resolve issue #​2650 [Compare Source](https://togithub.com/vapor/vapor/compare/4.78.1...4.78.2) #### What's Changed Resolve issue [#​2650](https://togithub.com/vapor/vapor/issues/2650) by [@​paunik](https://togithub.com/paunik) in [#​2674](https://togithub.com/vapor/vapor/issues/2674) > In order to prevent 5xx internal error we try to: > > - validate number of parameters in FormDataDecoder so we can detect when only boundary is present. #### New Contributor - [@​paunik](https://togithub.com/paunik) made their first contribution in [#​2674](https://togithub.com/vapor/vapor/issues/2674) πŸŽ‰ ###### *This patch was released by [@​gwynne](https://togithub.com/gwynne)* **Full Changelog**: https://github.com/vapor/vapor/compare/4.78.1...4.78.2 ### [`v4.78.1`](https://togithub.com/vapor/vapor/releases/tag/4.78.1): - Fix for #​2574 Missing quote from value [Compare Source](https://togithub.com/vapor/vapor/compare/4.78.0...4.78.1) #### What's Changed Fix for [#​2574](https://togithub.com/vapor/vapor/issues/2574) Missing quote from value by [@​paunik](https://togithub.com/paunik) in [#​2839](https://togithub.com/vapor/vapor/issues/2839) > - now quotes are always enforced in `DirectiveSerializer.serialize` > - adjusted tests #### New Contributor - [@​paunik](https://togithub.com/paunik) made their first contribution in [#​2839](https://togithub.com/vapor/vapor/issues/2839) πŸŽ‰ ###### *This patch was released by [@​gwynne](https://togithub.com/gwynne)* **Full Changelog**: https://github.com/vapor/vapor/compare/4.78.0...4.78.1 ### [`v4.78.0`](https://togithub.com/vapor/vapor/releases/tag/4.78.0): - Allow specifying a timeout for client requests [Compare Source](https://togithub.com/vapor/vapor/compare/4.77.2...4.78.0) #### What's Changed Allow specifying a timeout for client requests by [@​ffried](https://togithub.com/ffried) in [#​3043](https://togithub.com/vapor/vapor/issues/3043) > Adds a `timeout` property to `ClientRequest`, which is forwarded to `HTTPClient` by `EventLoopHTTPClient`. > To use it, the `beforeSend` closure can be used: > > ```swift > request.client.get("http://example.com") { > $0.timeout = .seconds(5) > } > ``` #### New Contributor - [@​ffried](https://togithub.com/ffried) made their first contribution in [#​3043](https://togithub.com/vapor/vapor/issues/3043) πŸŽ‰ ###### *This patch was released by [@​gwynne](https://togithub.com/gwynne)* **Full Changelog**: https://github.com/vapor/vapor/compare/4.77.2...4.78.0 ### [`v4.77.2`](https://togithub.com/vapor/vapor/releases/tag/4.77.2): - Update dependencies with known CVEs to the latest versions [Compare Source](https://togithub.com/vapor/vapor/compare/4.77.1...4.77.2) ###### *This patch was released by [@​0xTim](https://togithub.com/0xTim).* #### What's Changed Update dependencies with known CVEs to the latest versions by [@​0xTim](https://togithub.com/0xTim) in [#​3038](https://togithub.com/vapor/vapor/issues/3038) > Async HTTP Client and SwiftNIO and SwiftNIO extras have CVEs that have been patched. We still depend on versions that are vulnerable, so this updates that. **Full Changelog**: https://github.com/vapor/vapor/compare/4.77.1...4.77.2 ### [`v4.77.1`](https://togithub.com/vapor/vapor/releases/tag/4.77.1): Improve error reporting for `EncodingError` and `DecodingError` [Compare Source](https://togithub.com/vapor/vapor/compare/4.77.0...4.77.1) ###### *This patch was authored by [@​grahamburgsma](https://togithub.com/grahamburgsma) and released by [@​0xTim](https://togithub.com/0xTim).* As `EncodingError` and `DecodingError` both conform to `LocalizedError`, error reporting uses their `localizedDescription` which is just a generic error message. So this changes the error reporting from: > The operation could not be completed. The data isn’t in the correct format. To a description much more useful (for example): > invalidValue(inf, Swift.EncodingError.Context(codingPath: \[...], debugDescription: "Unable to encode Double.inf directly in JSON.", underlyingError: nil)) ### [`v4.77.0`](https://togithub.com/vapor/vapor/releases/tag/4.77.0): Add `ContentContainer.decode(_:as:)` [Compare Source](https://togithub.com/vapor/vapor/compare/4.76.4...4.77.0) ###### *This patch was authored by [@​MahdiBM](https://togithub.com/MahdiBM) and released by [@​0xTim](https://togithub.com/0xTim).* Adds `ContentContainer.decode(_:as:)` to compliment `ContentContainer.encode(_:as:)` to make it easy to override the `Content-Type` if calling an API or decoding a request that returns erroneous headers for the body type. ### [`v4.76.4`](https://togithub.com/vapor/vapor/releases/tag/4.76.4): Fixed drain handler call order in case of asynchronous buffer handling [Compare Source](https://togithub.com/vapor/vapor/compare/4.76.3...4.76.4) ###### *This patch was authored by [@​salpieiev](https://togithub.com/salpieiev) and released by [@​0xTim](https://togithub.com/0xTim).* During request body drain each chunk of data may be handled asynchronously. This may lead to a call of handler with `.end` parameter before previous call with `.buffer(buffer)` finished it's execution. For example: 1. Open new file descriptor 2. During `.collected` stage write ByteBuffer on disc using this file descriptor 3. During `.end` stage close file descriptor This fix ensures that file descriptor won't be closed until disc write completes ### [`v4.76.3`](https://togithub.com/vapor/vapor/releases/tag/4.76.3): Don't use UnsafeRawBufferPointer.withMemoryRebound(to:_:) before Swift 5.7.2 [Compare Source](https://togithub.com/vapor/vapor/compare/4.76.2...4.76.3) ###### *This patch was authored and released by [@​gwynne](https://togithub.com/gwynne).* This API did not exist yet in Swift 5.7.0. It will now only be called in 5.7.2 or later. (This being said, those still using Xcode 14.0.x - the only known affected version - should upgrade to 14.2 (if still running Monterey) or 14.3 (if running Ventura).) ### [`v4.76.2`](https://togithub.com/vapor/vapor/releases/tag/4.76.2): Fix `Range: bytes=0-0` header not working properly [Compare Source](https://togithub.com/vapor/vapor/compare/4.76.1...4.76.2) ###### *This patch was authored by [@​ptoffy](https://togithub.com/ptoffy) and released by [@​0xTim](https://togithub.com/0xTim).* This aims to fix the bug found in https://discord.com/channels/431917998102675485/519613337638797315/1104341522473812039, which returned a `Bad Response` rather then returning the first byte of the requested content when the `Range: bytes=0-0` request header was used ### [`v4.76.1`](https://togithub.com/vapor/vapor/releases/tag/4.76.1): Improved error logging [Compare Source](https://togithub.com/vapor/vapor/compare/4.76.0...4.76.1) ###### *This patch was authored and released by [@​gwynne](https://togithub.com/gwynne).* Some kinds of errors provide additional "debug" information, which can give much more detail than the "plain" description of the error. In many cases this debug info can contain sensitive data, such as specifics about a database schema, so Vapor only uses the plain description when sending errors to clients (and in release environments, *all* details are suppressed). To date, the plain description has also been used for logging errors. This can make it very difficult for developers to figure out what's going wrong with their code if the error in question only provides meaningful information in its debug data - for example, the PostgreSQL database driver implementation does this rather than relying on a higher-level layer like Vapor to obfuscate potentially sensitive information. This PR changes the logging of errors to include the debug information (and *only* the logging; the responses sent to clients are unchanged). ### [`v4.76.0`](https://togithub.com/vapor/vapor/releases/tag/4.76.0): Update Minimum Swift Version to 5.6 [Compare Source](https://togithub.com/vapor/vapor/compare/4.75.2...4.76.0) ###### *This patch was authored and released by [@​0xTim](https://togithub.com/0xTim).* Inline with the Swift version support and NIO's supported version, this sets the minimum supported Swift version to 5.6 now that Swift 5.8 is released. This is also the first step in adopting `Sendable` properly across Vapor ### [`v4.75.2`](https://togithub.com/vapor/vapor/compare/4.75.1...4.75.2) [Compare Source](https://togithub.com/vapor/vapor/compare/4.75.1...4.75.2) ### [`v4.75.1`](https://togithub.com/vapor/vapor/releases/tag/4.75.1): Fix crash when collecting the body [Compare Source](https://togithub.com/vapor/vapor/compare/4.75.0...4.75.1) ###### *This patch was authored and released by [@​0xTim](https://togithub.com/0xTim).* Fixes an issue where users may experience a crash when collecting the body in async routes due to pre-concurrency assumptions made by Vapor. Resolves [#​2990](https://togithub.com/vapor/vapor/issues/2990) ### [`v4.75.0`](https://togithub.com/vapor/vapor/releases/tag/4.75.0): Fix multiple correctness issues [Compare Source](https://togithub.com/vapor/vapor/compare/4.74.2...4.75.0) ###### *This patch was authored and released by [@​gwynne](https://togithub.com/gwynne).* Here's a list of changes: - `StackTrace` no longer severely misuses pointers or invokes undefined behavior when gathering backtraces on Linux. It also no longer has a number of implicit fatal error code paths. - Several deprecation warnings that show up when building with 5.8+ are gone. - Concurrency support now correctly back-deploys as far as macOS 10.15. As a side effect, the minimum Swift version has increased from 5.5 to 5.5.2. - The `Deployment` example target has been significantly improved and no longer references local paths on [@​tanner0101](https://togithub.com/tanner0101)'s computer πŸ˜† - The TOTP/HOTP logic is now both faster and safer (no more use of unsafe pointers, in particular). - `DecoderWrapper`, an unsafe `Codable` hack with serious pitfalls, has been hard-deprecated. - `PlaintextEncoder` and `PlaintextDecoder` have been significantly cleaned up and improved. All `fatalError()`s have been removed, performance has been noticeably improved, and errors are more accurate. - `URLEncodedFormEncoder` and `URLEncodedFormDecoder` got the same treatment. - The entire `Validation` submodule has been overhauled to fix systemic misuses of `Codable` that were starting to cause noticeable problems. - As a side effect of said overhaul, `ValidationKey` is now deprecated in favor of using the essentially identical `BasicCodingKey` type. - `ContentContainer` and `URLQueryContainer` received the same "fix `Codable` usage" treatment. - `ContentConfiguration` now throws more useful errors. - When `CodingKeyRepresentable` is available in the stdlib (Swift 5.6+), Vapor's protocol of the same name now becomes a `typealias` for it. ### [`v4.74.2`](https://togithub.com/vapor/vapor/releases/tag/4.74.2): Imports fixes [Compare Source](https://togithub.com/vapor/vapor/compare/4.74.1...4.74.2) ###### *This patch was authored and released by [@​gwynne](https://togithub.com/gwynne).* ### [`v4.74.1`](https://togithub.com/vapor/vapor/releases/tag/4.74.1): Correctly handle invalid numbers in range validations [Compare Source](https://togithub.com/vapor/vapor/compare/4.74.0...4.74.1) ###### *This patch was authored by [@​fred-sch](https://togithub.com/fred-sch) and released by [@​0xTim](https://togithub.com/0xTim).* Previously trying to perform a range validation check on `Float.nan` would cause a `fatalError` - this correctly handles it and throws an error instead. Closes [https://github.com/vapor/vapor/issues/2965](https://togithub.com/vapor/vapor/issues/2965). ### [`v4.74.0`](https://togithub.com/vapor/vapor/releases/tag/4.74.0): Revert "Add support for asynchronous body stream writing" [Compare Source](https://togithub.com/vapor/vapor/compare/4.73.0...4.74.0) ###### *This patch was authored and released by [@​gwynne](https://togithub.com/gwynne).* We're reverting [#​2939](https://togithub.com/vapor/vapor/issues/2939), which was accidentally merged early, as a precautionary measure. A new PR will be opened to track this work. ### [`v4.73.0`](https://togithub.com/vapor/vapor/releases/tag/4.73.0): Add support for asynchronous body stream writing [Compare Source](https://togithub.com/vapor/vapor/compare/4.72.1...4.73.0) ###### *This patch was authored and released by [@​Joannis](https://togithub.com/Joannis).* - Fixes [#​2930](https://togithub.com/vapor/vapor/issues/2930) - a crash when users try to write a body from within a task towards the ELF APIs. - Introduces a new API for writing chunked HTTP response bodies - Adds a helper that automatically managed failing and closing streams ### [`v4.72.1`](https://togithub.com/vapor/vapor/releases/tag/4.72.1): Add support for Cache-Control header 'immutable' attribute [Compare Source](https://togithub.com/vapor/vapor/compare/4.72.0...4.72.1) ###### *This patch was authored by [@​Palleas](https://togithub.com/Palleas) and released by [@​0xTim](https://togithub.com/0xTim).* Improve parsing of Cache-Control header to parse the `immutable` attribute. ### [`v4.72.0`](https://togithub.com/vapor/vapor/releases/tag/4.72.0): Add 308 Redirect [Compare Source](https://togithub.com/vapor/vapor/compare/4.71.1...4.72.0) ###### *This patch was authored by [@​NeedleInAJayStack](https://togithub.com/NeedleInAJayStack) and released by [@​0xTim](https://togithub.com/0xTim).* Adds support for a `308 redirect` to support POST method redirection. This is important because not all user-agents preserve the method and body through a 301 redirect: https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/301 `redirect(to:type:)` is now deprecated in favour of `redirect(to:redirectType:)` ### [`v4.71.1`](https://togithub.com/vapor/vapor/releases/tag/4.71.1): Better `DecodingError` description [Compare Source](https://togithub.com/vapor/vapor/compare/4.71.0...4.71.1) ###### *This patch was authored by [@​MahdiBM](https://togithub.com/MahdiBM) and released by [@​0xTim](https://togithub.com/0xTim).* The `DecodingError`'s description, when returned from HTTP requests, was missing some important info and sometimes was not clear enough. Hopefully this PR can resolve that issue. ### [`v4.71.0`](https://togithub.com/vapor/vapor/releases/tag/4.71.0): FileMiddleware redirect option [Compare Source](https://togithub.com/vapor/vapor/compare/4.70.0...4.71.0) ###### *This patch was authored by [@​NeedleInAJayStack](https://togithub.com/NeedleInAJayStack) and released by [@​0xTim](https://togithub.com/0xTim).* Previously, FileMiddleware would just serve the default file when requesting a directory with no trailing slash. This caused rendering issues when the default file loaded additional resources by relative path. This adds an option to either redirect to the url with a trailing slash (fixing rendering issues), or just pass the request through the middleware. The default is set to a redirect to preserve the intended functionality of FileMiddleware ### [`v4.70.0`](https://togithub.com/vapor/vapor/releases/tag/4.70.0): Expose Vapor Request's request-id value, so that it can be passed into logging from other libraries [Compare Source](https://togithub.com/vapor/vapor/compare/4.69.2...4.70.0) ###### *This patch was authored by [@​Joannis](https://togithub.com/Joannis) and released by [@​0xTim](https://togithub.com/0xTim).* Exposes the Request's ID as a new property on `Request` as `requestID`. This is useful for any libraries or users who want to be able to trace the request ID through a request handler. ### [`v4.69.2`](https://togithub.com/vapor/vapor/releases/tag/4.69.2): Fix: FileIO headers [Compare Source](https://togithub.com/vapor/vapor/compare/4.69.1...4.69.2) ###### *This patch was authored by [@​NeedleInAJayStack](https://togithub.com/NeedleInAJayStack) and released by [@​Joannis](https://togithub.com/Joannis).* - Adds `Last-Modified` header to file requests - Fixes `ETag` header formatting in file requests: According to [MDN documentation](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/ETag), the `ETag` header should start and end with double-quotes. ### [`v4.69.1`](https://togithub.com/vapor/vapor/releases/tag/4.69.1): Allow URLEncodedForms to decode 'on' value als Bool => true [Compare Source](https://togithub.com/vapor/vapor/compare/4.69.0...4.69.1) ###### *This patch was authored by [@​bobvoorneveld](https://togithub.com/bobvoorneveld) and released by [@​Joannis](https://togithub.com/Joannis).* When a HTML form uses a checkbox to check something as a Bool, it sends the 'on' value if checked. The URLEncodedForms decoder should be able to handle that.
struct FormData: Decodable { let isActive: Bool } let formData = try req.content.decode(FormData.self) fixes [#​2444](https://togithub.com/vapor/vapor/issues/2444) ### [`v4.69.0`](https://togithub.com/vapor/vapor/releases/tag/4.69.0): FileMiddleware: Add convenience support for serving files from a Bundle [Compare Source](https://togithub.com/vapor/vapor/compare/4.68.0...4.69.0) ###### *This patch was authored by [@​MrSkwiggs](https://togithub.com/MrSkwiggs) and released by [@​Joannis](https://togithub.com/Joannis).* Adds support for instantiating a `FileMiddleware` to serve files from a Bundle. This comes in handy when Vapor is used as a dependency in an `Xcodeproj` and simply passing the `publicDirectory` path is not sufficient. ### [`v4.68.0`](https://togithub.com/vapor/vapor/releases/tag/4.68.0): Enable back deployment of Concurrency [Compare Source](https://togithub.com/vapor/vapor/compare/4.67.5...4.68.0) ###### *This patch was authored by [@​sevki](https://togithub.com/sevki) and released by [@​0xTim](https://togithub.com/0xTim).* Enable back deployment of Vapor's concurrency APIs on older Apple platforms. This also drops support for Swift versions < 5.5.2 to match SwiftNIO
--- ### Configuration πŸ“… **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. β™» **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. πŸ‘» **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://togithub.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). Co-authored-by: Self-hosted Renovate Bot <361546+cgrindel-self-hosted-renovate[bot]@users.noreply.github.enterprise.com> --- examples/vapor_example/swift/Package.resolved | 32 ++++++++--------- examples/vapor_example/swift/Package.swift | 2 +- examples/vapor_example/swift/deps.bzl | 16 ++++----- examples/vapor_example/swift/deps_index.json | 34 ++++++++++--------- 4 files changed, 43 insertions(+), 41 deletions(-) diff --git a/examples/vapor_example/swift/Package.resolved b/examples/vapor_example/swift/Package.resolved index 0378524ed..c7310026c 100644 --- a/examples/vapor_example/swift/Package.resolved +++ b/examples/vapor_example/swift/Package.resolved @@ -5,8 +5,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/swift-server/async-http-client.git", "state" : { - "revision" : "7f05a8da46cc2a4ab43218722298b81ac7a08031", - "version" : "1.13.2" + "revision" : "16f7e62c08c6969899ce6cc277041e868364e5cf", + "version" : "1.19.0" } }, { @@ -113,8 +113,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-atomics.git", "state" : { - "revision" : "ff3d2212b6b093db7f177d0855adbc4ef9c5f036", - "version" : "1.0.3" + "revision" : "6c89474e62719ddcc1e9614989fff2f68208fe10", + "version" : "1.1.0" } }, { @@ -167,8 +167,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-nio.git", "state" : { - "revision" : "4ad2c3733845abd9ee8892a323b0fa0d80f37e34", - "version" : "2.47.0" + "revision" : "cf281631ff10ec6111f2761052aa81896a83a007", + "version" : "2.58.0" } }, { @@ -176,8 +176,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-nio-extras.git", "state" : { - "revision" : "91dd2d61fb772e1311bb5f13b59266b579d77e42", - "version" : "1.15.0" + "revision" : "0e0d0aab665ff1a0659ce75ac003081f2b1c8997", + "version" : "1.19.0" } }, { @@ -194,8 +194,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-nio-ssl.git", "state" : { - "revision" : "4fb7ead803e38949eb1d6fabb849206a72c580f3", - "version" : "2.23.0" + "revision" : "320bd978cceb8e88c125dcbb774943a92f6286e9", + "version" : "2.25.0" } }, { @@ -203,8 +203,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-nio-transport-services.git", "state" : { - "revision" : "c0d9a144cfaec8d3d596aadde3039286a266c15c", - "version" : "1.15.0" + "revision" : "e7403c35ca6bb539a7ca353b91cc2d8ec0362d58", + "version" : "1.19.0" } }, { @@ -221,8 +221,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/vapor/vapor.git", "state" : { - "revision" : "eb2da0d749e185789970c32f7fd9c114a339fa13", - "version" : "4.67.5" + "revision" : "1bb4a2ed94bec7a92f92e82896408c785d068f5c", + "version" : "4.79.0" } }, { @@ -230,8 +230,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/vapor/websocket-kit.git", "state" : { - "revision" : "2d9d2188a08eef4a869d368daab21b3c08510991", - "version" : "2.6.1" + "revision" : "53fe0639a98903858d0196b699720decb42aee7b", + "version" : "2.14.0" } } ], diff --git a/examples/vapor_example/swift/Package.swift b/examples/vapor_example/swift/Package.swift index 8763e6ace..3f4b1ee9a 100644 --- a/examples/vapor_example/swift/Package.swift +++ b/examples/vapor_example/swift/Package.swift @@ -5,7 +5,7 @@ import PackageDescription let package = Package( name: "vapor_example", dependencies: [ - .package(url: "https://github.com/vapor/vapor.git", exact: "4.67.5"), + .package(url: "https://github.com/vapor/vapor.git", exact: "4.79.0"), .package(url: "https://github.com/vapor/fluent.git", exact: "4.6.0"), .package(url: "https://github.com/vapor/fluent-sqlite-driver.git", exact: "4.3.0"), ] diff --git a/examples/vapor_example/swift/deps.bzl b/examples/vapor_example/swift/deps.bzl index 74eaa259d..001b769d8 100644 --- a/examples/vapor_example/swift/deps.bzl +++ b/examples/vapor_example/swift/deps.bzl @@ -4,7 +4,7 @@ def swift_dependencies(): # version: 1.13.2 swift_package( name = "swiftpkg_async_http_client", - commit = "7f05a8da46cc2a4ab43218722298b81ac7a08031", + commit = "16f7e62c08c6969899ce6cc277041e868364e5cf", dependencies_index = "@//swift:deps_index.json", remote = "https://github.com/swift-server/async-http-client.git", ) @@ -100,7 +100,7 @@ def swift_dependencies(): # version: 1.0.3 swift_package( name = "swiftpkg_swift_atomics", - commit = "ff3d2212b6b093db7f177d0855adbc4ef9c5f036", + commit = "6c89474e62719ddcc1e9614989fff2f68208fe10", dependencies_index = "@//swift:deps_index.json", remote = "https://github.com/apple/swift-atomics.git", ) @@ -148,7 +148,7 @@ def swift_dependencies(): # version: 2.47.0 swift_package( name = "swiftpkg_swift_nio", - commit = "4ad2c3733845abd9ee8892a323b0fa0d80f37e34", + commit = "cf281631ff10ec6111f2761052aa81896a83a007", dependencies_index = "@//swift:deps_index.json", remote = "https://github.com/apple/swift-nio.git", ) @@ -156,7 +156,7 @@ def swift_dependencies(): # version: 1.15.0 swift_package( name = "swiftpkg_swift_nio_extras", - commit = "91dd2d61fb772e1311bb5f13b59266b579d77e42", + commit = "0e0d0aab665ff1a0659ce75ac003081f2b1c8997", dependencies_index = "@//swift:deps_index.json", remote = "https://github.com/apple/swift-nio-extras.git", ) @@ -172,7 +172,7 @@ def swift_dependencies(): # version: 2.23.0 swift_package( name = "swiftpkg_swift_nio_ssl", - commit = "4fb7ead803e38949eb1d6fabb849206a72c580f3", + commit = "320bd978cceb8e88c125dcbb774943a92f6286e9", dependencies_index = "@//swift:deps_index.json", remote = "https://github.com/apple/swift-nio-ssl.git", ) @@ -180,7 +180,7 @@ def swift_dependencies(): # version: 1.15.0 swift_package( name = "swiftpkg_swift_nio_transport_services", - commit = "c0d9a144cfaec8d3d596aadde3039286a266c15c", + commit = "e7403c35ca6bb539a7ca353b91cc2d8ec0362d58", dependencies_index = "@//swift:deps_index.json", remote = "https://github.com/apple/swift-nio-transport-services.git", ) @@ -196,7 +196,7 @@ def swift_dependencies(): # version: 4.67.5 swift_package( name = "swiftpkg_vapor", - commit = "eb2da0d749e185789970c32f7fd9c114a339fa13", + commit = "1bb4a2ed94bec7a92f92e82896408c785d068f5c", dependencies_index = "@//swift:deps_index.json", remote = "https://github.com/vapor/vapor.git", ) @@ -204,7 +204,7 @@ def swift_dependencies(): # version: 2.6.1 swift_package( name = "swiftpkg_websocket_kit", - commit = "2d9d2188a08eef4a869d368daab21b3c08510991", + commit = "53fe0639a98903858d0196b699720decb42aee7b", dependencies_index = "@//swift:deps_index.json", remote = "https://github.com/vapor/websocket-kit.git", ) diff --git a/examples/vapor_example/swift/deps_index.json b/examples/vapor_example/swift/deps_index.json index ad118df04..302e864dc 100644 --- a/examples/vapor_example/swift/deps_index.json +++ b/examples/vapor_example/swift/deps_index.json @@ -386,7 +386,9 @@ "label": "@swiftpkg_swift_nio//:Sources_CNIODarwin", "package_identity": "swift-nio", "product_memberships": [ + "NIOCore", "NIO", + "NIOEmbedded", "NIOPosix", "_NIOConcurrency", "NIOTLS", @@ -1273,9 +1275,9 @@ "name": "swiftpkg_async_http_client", "identity": "async-http-client", "remote": { - "commit": "7f05a8da46cc2a4ab43218722298b81ac7a08031", + "commit": "16f7e62c08c6969899ce6cc277041e868364e5cf", "remote": "https://github.com/swift-server/async-http-client.git", - "version": "1.13.2" + "version": "1.19.0" } }, { @@ -1381,9 +1383,9 @@ "name": "swiftpkg_swift_atomics", "identity": "swift-atomics", "remote": { - "commit": "ff3d2212b6b093db7f177d0855adbc4ef9c5f036", + "commit": "6c89474e62719ddcc1e9614989fff2f68208fe10", "remote": "https://github.com/apple/swift-atomics.git", - "version": "1.0.3" + "version": "1.1.0" } }, { @@ -1435,18 +1437,18 @@ "name": "swiftpkg_swift_nio", "identity": "swift-nio", "remote": { - "commit": "4ad2c3733845abd9ee8892a323b0fa0d80f37e34", + "commit": "cf281631ff10ec6111f2761052aa81896a83a007", "remote": "https://github.com/apple/swift-nio.git", - "version": "2.47.0" + "version": "2.58.0" } }, { "name": "swiftpkg_swift_nio_extras", "identity": "swift-nio-extras", "remote": { - "commit": "91dd2d61fb772e1311bb5f13b59266b579d77e42", + "commit": "0e0d0aab665ff1a0659ce75ac003081f2b1c8997", "remote": "https://github.com/apple/swift-nio-extras.git", - "version": "1.15.0" + "version": "1.19.0" } }, { @@ -1462,18 +1464,18 @@ "name": "swiftpkg_swift_nio_ssl", "identity": "swift-nio-ssl", "remote": { - "commit": "4fb7ead803e38949eb1d6fabb849206a72c580f3", + "commit": "320bd978cceb8e88c125dcbb774943a92f6286e9", "remote": "https://github.com/apple/swift-nio-ssl.git", - "version": "2.23.0" + "version": "2.25.0" } }, { "name": "swiftpkg_swift_nio_transport_services", "identity": "swift-nio-transport-services", "remote": { - "commit": "c0d9a144cfaec8d3d596aadde3039286a266c15c", + "commit": "e7403c35ca6bb539a7ca353b91cc2d8ec0362d58", "remote": "https://github.com/apple/swift-nio-transport-services.git", - "version": "1.15.0" + "version": "1.19.0" } }, { @@ -1489,18 +1491,18 @@ "name": "swiftpkg_vapor", "identity": "vapor", "remote": { - "commit": "eb2da0d749e185789970c32f7fd9c114a339fa13", + "commit": "1bb4a2ed94bec7a92f92e82896408c785d068f5c", "remote": "https://github.com/vapor/vapor.git", - "version": "4.67.5" + "version": "4.79.0" } }, { "name": "swiftpkg_websocket_kit", "identity": "websocket-kit", "remote": { - "commit": "2d9d2188a08eef4a869d368daab21b3c08510991", + "commit": "53fe0639a98903858d0196b699720decb42aee7b", "remote": "https://github.com/vapor/websocket-kit.git", - "version": "2.6.1" + "version": "2.14.0" } } ]