From 905c32ec5c3ec4cfa4c87a45de7937125c725d93 Mon Sep 17 00:00:00 2001 From: Francesco Paolo Severino Date: Thu, 29 Oct 2026 11:28:14 +0100 Subject: [PATCH 1/3] Add `vapor/valkey` and deprecate `vapor/redis` --- Sources/APIDocs/Packages.swift | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/Sources/APIDocs/Packages.swift b/Sources/APIDocs/Packages.swift index 2d072ef..d7a56cf 100644 --- a/Sources/APIDocs/Packages.swift +++ b/Sources/APIDocs/Packages.swift @@ -18,6 +18,9 @@ private let vaporMacros = Module("VaporMacros", description: "Macros used by Vap private let jwt = Module("JWT", description: "JWT integration for Vapor authentication.") private let jwtKit = Module("JWTKit", description: "JSON Web Token signing and verification framework.") +// The Valkey drivers are available for both Vapor 5 (`main`) and Vapor 4 (`vapor4`). +private let valkey = Module("VaporValkey", title: "Valkey", description: "Vapor wrapper for using Valkey.") + let packages: [APIPackage] = [ APIPackage("vapor/vapor", group: "Core", versions: [ PackageVersion("4", name: "4.x", ref: "vapor4", isDefault: true, dependencies: [ @@ -122,8 +125,18 @@ let packages: [APIPackage] = [ APIPackage("vapor/sqlite-nio", group: "Database", versions: [ .single(ref: "main", modules: [Module("SQLiteNIO", description: "Non-blocking SQLite client built on SwiftNIO.")]), ]), + APIPackage("vapor/valkey", group: "Database", versions: [ + PackageVersion("1", name: "1.x", ref: "vapor4", isDefault: true, dependencies: [ + DependencyPin("vapor/vapor", "4") + ], modules: [valkey]), + PackageVersion("2-beta", name: "2.0 (beta)", ref: "main", isPrerelease: true, dependencies: [ + DependencyPin("vapor/vapor", "5-beta") + ], modules: [valkey]), + ]), APIPackage("vapor/redis", group: "Database", versions: [ - .single(ref: "main", modules: [Module("Redis", description: "Vapor wrapper for using Redis.")]), + PackageVersion("default", ref: "main", isDefault: true, deprecated: true, dependencies: [ + DependencyPin("vapor/vapor", "4") + ], modules: [Module("Redis", description: "Vapor wrapper for using Redis.")]) ]), APIPackage("vapor/queues", group: "Queues", versions: [ From 03b8c279a4fe9a3463e9fcb288625727599202ba Mon Sep 17 00:00:00 2001 From: Francesco Paolo Severino Date: Thu, 29 Oct 2026 11:29:06 +0100 Subject: [PATCH 2/3] Update JWT and JWTKit --- Sources/APIDocs/Packages.swift | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Sources/APIDocs/Packages.swift b/Sources/APIDocs/Packages.swift index d7a56cf..028fe8b 100644 --- a/Sources/APIDocs/Packages.swift +++ b/Sources/APIDocs/Packages.swift @@ -58,18 +58,18 @@ let packages: [APIPackage] = [ ]), APIPackage("vapor/jwt", group: "Authentication", versions: [ - PackageVersion("4", name: "4.x", ref: "v4", isDefault: true, dependencies: [ + PackageVersion("4", name: "4.x", ref: "v4", dependencies: [ DependencyPin("vapor/vapor", "4"), DependencyPin("vapor/jwt-kit", "4"), ], modules: [jwt]), - PackageVersion("5-beta", name: "5.0 (beta)", ref: "main", isPrerelease: true, dependencies: [ + PackageVersion("5", name: "5.x", ref: "main", isDefault: true, dependencies: [ DependencyPin("vapor/vapor", "4"), - DependencyPin("vapor/jwt-kit", "5-beta"), + DependencyPin("vapor/jwt-kit", "5"), ], modules: [jwt]), ]), APIPackage("vapor/jwt-kit", group: "Authentication", versions: [ - PackageVersion("4", name: "4.x", ref: "v4", isDefault: true, modules: [jwtKit]), - PackageVersion("5-beta", name: "5.0 (beta)", ref: "main", isPrerelease: true, modules: [jwtKit]), + PackageVersion("4", name: "4.x", ref: "v4", modules: [jwtKit]), + PackageVersion("5", name: "5.x", ref: "main", isDefault: true, modules: [jwtKit]), ]), APIPackage("vapor/authentication", group: "Authentication", versions: [ .single(ref: "main", modules: [Module("Authentication", description: "Authentication framework for Swift applications.")]), From 88921c21315febaa5dec2091cd2ed2b5d999d3af Mon Sep 17 00:00:00 2001 From: Francesco Paolo Severino Date: Mon, 9 Nov 2026 18:17:24 +0100 Subject: [PATCH 3/3] Update Kiln --- Package.resolved | 6 +++--- Package.swift | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Package.resolved b/Package.resolved index 344d705..c63c983 100644 --- a/Package.resolved +++ b/Package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "407262c2f9967ee52500d1d43c9591da302eaa8c533eb3e246e1ee90e9fce1cf", + "originHash" : "ed0b169ab38ee360dbb187a55bb762f64e1f5d87883cd3e40220dc1314a88424", "pins" : [ { "identity" : "design", @@ -15,8 +15,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/brokenhandsio/kiln.git", "state" : { - "revision" : "849b724cf24f965d0f2ec8638725f775c5812345", - "version" : "1.9.1" + "revision" : "c64e4baaaf3d9b308771dca1a60bf751264140ed", + "version" : "1.11.0" } }, { diff --git a/Package.swift b/Package.swift index 7be5c6a..b688ca2 100644 --- a/Package.swift +++ b/Package.swift @@ -7,7 +7,7 @@ let package = Package( .macOS(.v13) ], dependencies: [ - .package(url: "https://github.com/brokenhandsio/kiln.git", from: "1.9.1"), + .package(url: "https://github.com/brokenhandsio/kiln.git", from: "1.11.0"), .package(url: "https://github.com/vapor/design.git", from: "1.1.0"), .package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.3.0"), ],