diff --git a/Package.resolved b/Package.resolved index c628e3b4d..cf1754d64 100644 --- a/Package.resolved +++ b/Package.resolved @@ -159,8 +159,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/vapor/redis.git", "state" : { - "revision" : "b4527022376f93ade3fa366f2c3465ed3489fca4", - "version" : "4.11.1" + "revision" : "f4ac19812066c3ff735f9aac3e254ee673aa6418", + "version" : "4.13.0" } }, { @@ -276,8 +276,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-argument-parser.git", "state" : { - "revision" : "011f0c765fb46d9cac61bca19be0527e99c98c8b", - "version" : "1.5.1" + "revision" : "309a47b2b1d9b5e991f36961c983ecec72275be3", + "version" : "1.6.1" } }, { @@ -285,8 +285,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-asn1.git", "state" : { - "revision" : "a54383ada6cecde007d374f58f864e29370ba5c3", - "version" : "1.3.2" + "revision" : "f70225981241859eb4aa1a18a75531d26637c8cc", + "version" : "1.4.0" } }, { @@ -339,8 +339,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-collections.git", "state" : { - "revision" : "671108c96644956dddcd89dd59c203dcdb36cec7", - "version" : "1.1.4" + "revision" : "ad9f6723fd29591e6c0a19a9c4982cae51d65b1d", + "version" : "1.1.5" } }, { @@ -447,8 +447,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-nio.git", "state" : { - "revision" : "34d486b01cd891297ac615e40d5999536a1e138d", - "version" : "2.83.0" + "revision" : "ad6b5f17270a7008f60d35ec5378e6144a575162", + "version" : "2.84.0" } }, { @@ -465,8 +465,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-nio-http2.git", "state" : { - "revision" : "4281466512f63d1bd530e33f4aa6993ee7864be0", - "version" : "1.36.0" + "revision" : "5ca52e2f076c6a24451175f575f390569381d6a1", + "version" : "1.37.0" } }, { @@ -483,8 +483,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-nio-transport-services.git", "state" : { - "revision" : "cd1e89816d345d2523b11c55654570acd5cd4c56", - "version" : "1.24.0" + "revision" : "decfd235996bc163b44e10b8a24997a3d2104b90", + "version" : "1.25.0" } }, { @@ -546,8 +546,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/pointfreeco/swift-snapshot-testing.git", "state" : { - "revision" : "37230a37e83f1b7023be08e1b1a2603fcb1567fb", - "version" : "1.18.4" + "revision" : "b198a568ad24c5a22995c5ff0ecf9667634e860e", + "version" : "1.18.5" } }, { @@ -573,8 +573,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/swiftlang/swift-toolchain-sqlite", "state" : { - "revision" : "1c16f72b452404d4dba3003396e47421a406e7fe", - "version" : "1.0.5" + "revision" : "7c9bb9d012930a935d1ba6327459291d0b76414c", + "version" : "1.0.6" } }, { @@ -591,8 +591,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/scinfu/SwiftSoup.git", "state" : { - "revision" : "aa85ee96017a730031bafe411cde24a08a17a9c9", - "version" : "2.8.8" + "revision" : "dee225a3da7b68d34936abc4dc8f34f2264db647", + "version" : "2.9.6" } }, { @@ -600,8 +600,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/vapor/vapor.git", "state" : { - "revision" : "4014016aad591a120f244f9b9e8a57252b7e62b4", - "version" : "4.115.0" + "revision" : "3636f443474769147828a5863e81a31f6f30e92c", + "version" : "4.115.1" } }, { @@ -618,8 +618,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/pointfreeco/xctest-dynamic-overlay", "state" : { - "revision" : "39de59b2d47f7ef3ca88a039dff3084688fe27f4", - "version" : "1.5.2" + "revision" : "23e3442166b5122f73f9e3e622cd1e4bafeab3b7", + "version" : "1.6.0" } }, { diff --git a/Sources/App/Controllers/API/API+PackageCollectionController.swift b/Sources/App/Controllers/API/API+PackageCollectionController.swift index 6780cd2c1..43f5a54d9 100644 --- a/Sources/App/Controllers/API/API+PackageCollectionController.swift +++ b/Sources/App/Controllers/API/API+PackageCollectionController.swift @@ -61,7 +61,11 @@ extension API { } -extension PackageCollectionSigning.Model.SignedCollection: @retroactive Vapor.Content {} +extension SignedCollection: @retroactive RequestDecodable {} +extension SignedCollection: @retroactive ResponseEncodable {} +extension SignedCollection: @retroactive AsyncRequestDecodable {} +extension SignedCollection: @retroactive AsyncResponseEncodable {} +extension SignedCollection: @retroactive Content {} extension API { diff --git a/Tests/AppTests/Helpers/Extensions.swift b/Tests/AppTests/Helpers/Extensions.swift index 81f8e2661..713eb08ef 100644 --- a/Tests/AppTests/Helpers/Extensions.swift +++ b/Tests/AppTests/Helpers/Extensions.swift @@ -21,7 +21,9 @@ import Fluent // MARK: - Useful extensions -extension Foundation.URL: Swift.ExpressibleByStringLiteral { +extension URL: @retroactive ExpressibleByExtendedGraphemeClusterLiteral {} +extension URL: @retroactive ExpressibleByUnicodeScalarLiteral {} +extension URL: @retroactive ExpressibleByStringLiteral { public init(stringLiteral value: String) { precondition(!value.isEmpty, "cannot convert empty string to URL") self = URL(string: value)!