Update minimum Swift version (#794)

* Bump the package minimum Swift version to 6.0, update docs accordingly, run swift-format on the code

* Convert the tests to SwiftTesting

* Swift 6.0 is finicky

Author: gwynne

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.9
+// swift-tools-version:6.0
 import PackageDescription
 
 let package = Package(
@@ -13,8 +13,8 @@ let package = Package(
         .library(name: "Fluent", targets: ["Fluent"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/vapor/fluent-kit.git", from: "1.49.0"),
-        .package(url: "https://github.com/vapor/vapor.git", from: "4.101.0"),
+        .package(url: "https://github.com/vapor/fluent-kit.git", from: "1.52.2"),
+        .package(url: "https://github.com/vapor/vapor.git", from: "4.117.0"),
     ],
     targets: [
         .target(
@@ -30,7 +30,7 @@ let package = Package(
             dependencies: [
                 .target(name: "Fluent"),
                 .product(name: "XCTFluent", package: "fluent-kit"),
-                .product(name: "XCTVapor", package: "vapor"),
+                .product(name: "VaporTesting", package: "vapor"),
             ],
             swiftSettings: swiftSettings
         ),
@@ -39,9 +39,10 @@ let package = Package(
 
 var swiftSettings: [SwiftSetting] { [
     .enableUpcomingFeature("ExistentialAny"),
-    .enableUpcomingFeature("ConciseMagicFile"),
-    .enableUpcomingFeature("ForwardTrailingClosures"),
-    .enableUpcomingFeature("ImportObjcForwardDeclarations"),
-    .enableUpcomingFeature("DisableOutwardActorInference"),
-    .enableExperimentalFeature("StrictConcurrency=complete"),
+    .enableUpcomingFeature("InternalImportsByDefault"),
+    .enableUpcomingFeature("MemberImportVisibility"),
+    .enableUpcomingFeature("InferIsolatedConformances"),
+    .enableUpcomingFeature("NonisolatedNonsendingByDefault"),
+    .enableUpcomingFeature("ImmutableWeakCaptures"),
 ] }
+

README.md

@@ -1,17 +1,13 @@
 <p align="center">
-<picture>
-  <source media="(prefers-color-scheme: dark)" srcset="https://github.com/vapor/fluent/assets/1130717/f4708c0b-3c9e-4e8b-9508-aa1ca6481c70">
-  <source media="(prefers-color-scheme: light)" srcset="https://github.com/vapor/fluent/assets/1130717/bc4e1040-1e8a-4c0c-a24d-e87221a01af3">
-  <img src="https://github.com/vapor/fluent/assets/1130717/bc4e1040-1e8a-4c0c-a24d-e87221a01af3" height="96" alt="Fluent">
-</picture> 
+<img src="https://design.vapor.codes/images/vapor-fluent.svg" height="96" alt="Fluent">
 <br>
 <br>
 <a href="https://docs.vapor.codes/4.0/"><img src="https://design.vapor.codes/images/readthedocs.svg" alt="Documentation"></a>
 <a href="https://discord.gg/vapor"><img src="https://design.vapor.codes/images/discordchat.svg" alt="Team Chat"></a>
 <a href="LICENSE"><img src="https://design.vapor.codes/images/mitlicense.svg" alt="MIT License"></a>
 <a href="https://github.com/vapor/fluent/actions/workflows/test.yml"><img src="https://img.shields.io/github/actions/workflow/status/vapor/fluent/test.yml?event=push&style=plastic&logo=github&label=tests&logoColor=%23ccc" alt="Continuous Integration"></a>
-<a href="https://codecov.io/github/vapor/fluent"><img src="https://img.shields.io/codecov/c/github/vapor/fluent?style=plastic&logo=codecov&label=codecov&token=yDzzHja8lt"></a>
-<a href="https://swift.org"><img src="https://design.vapor.codes/images/swift58up.svg" alt="Swift 5.8+"></a>
+<a href="https://codecov.io/github/vapor/fluent"><img src="https://img.shields.io/codecov/c/github/vapor/fluent?style=plastic&logo=codecov&label=codecov&token=yDzzHja8lt" alt="Code Coverage"></a>
+<a href="https://swift.org"><img src="https://design.vapor.codes/images/swift60up.svg" alt="Swift 6.0+"></a>
 </p>
 
 <br>

Sources/Fluent/Concurrency/FluentProvider+Concurrency.swift

@@ -1,5 +1,5 @@
-import Vapor
 import FluentKit
+public import Vapor
 
 extension Application {
     /// Automatically runs forward migrations without confirmation.

Sources/Fluent/Concurrency/ModelCredentialsAuthenticatable+Concurrency.swift

@@ -1,6 +1,5 @@
-import NIOCore
-import Vapor
-import FluentKit
+public import FluentKit
+public import Vapor
 
 extension ModelCredentialsAuthenticatable {
     public static func asyncCredentialsAuthenticator(
@@ -11,8 +10,7 @@ extension ModelCredentialsAuthenticatable {
 }
 
 private struct AsyncModelCredentialsAuthenticator<User>: AsyncCredentialsAuthenticator
-    where User: ModelCredentialsAuthenticatable
-{
+where User: ModelCredentialsAuthenticatable {
     typealias Credentials = ModelCredentials
 
     public let database: DatabaseID?

Sources/Fluent/Concurrency/Pagination+Concurrency.swift

@@ -1,12 +1,11 @@
-import NIOCore
-import Vapor
-import FluentKit
+public import FluentKit
+public import Vapor
 
 extension QueryBuilder {
     public func paginate(
         for request: Request
     ) async throws -> Page<Model> {
         let page = try request.query.decode(PageRequest.self)
-        return try await self.paginate(page)
+        return try await self.paginate(page).get()
     }
 }

Sources/Fluent/Concurrency/Sessions+Concurrency.swift

@@ -1,6 +1,5 @@
-import NIOCore
-import Vapor
-import FluentKit
+public import FluentKit
+public import Vapor
 
 extension Model where Self: SessionAuthenticatable, Self.SessionID == Self.IDValue {
     public static func asyncSessionAuthenticator(
@@ -11,8 +10,7 @@ extension Model where Self: SessionAuthenticatable, Self.SessionID == Self.IDVal
 }
 
 private struct AsyncDatabaseSessionAuthenticator<User>: AsyncSessionAuthenticator
-    where User: SessionAuthenticatable, User: Model, User.SessionID == User.IDValue
-{
+where User: SessionAuthenticatable, User: Model, User.SessionID == User.IDValue {
     let databaseID: DatabaseID?
 
     func authenticate(sessionID: User.SessionID, for request: Request) async throws {

Sources/Fluent/Docs.docc/images/vapor-fluent-logo.svg

@@ -1,18 +1,21 @@
 {
   "theme": {
-    "aside": { "border-radius": "16px", "border-style": "double", "border-width": "3px" },
+    "aside": { "border-radius": "16px", "border-width": "3px", "border-style": "double" },
     "border-radius": "0",
     "button": { "border-radius": "16px", "border-width": "1px", "border-style": "solid" },
     "code":   { "border-radius": "16px", "border-width": "1px", "border-style": "solid" },
     "color": {
       "fluent": "#392048",
       "documentation-intro-fill":  "radial-gradient(circle at top, var(--color-fluent) 30%, #000 100%)",
       "documentation-intro-accent": "var(--color-fluent)",
+      "hero-eyebrow": "white",
+      "documentation-intro-figure": "white",
+      "hero-title": "white",
       "logo-base":  { "dark": "#fff", "light": "#000" },
       "logo-shape": { "dark": "#000", "light": "#fff" },
       "fill":       { "dark": "#000", "light": "#fff" }
     },
-    "icons": { "technology": "/fluent/images/vapor-fluent-logo.svg" }
+    "icons": { "technology": "/fluent/images/Fluent/vapor-fluent-logo.svg" }
   },
   "features": {
     "quickNavigation": { "enable": true },

Sources/Fluent/Docs.docc/theme-settings.json

@@ -1,7 +1,6 @@
-import NIOCore
+public import FluentKit
 import Foundation
-import Vapor
-import FluentKit
+public import Vapor
 
 extension Application.Caches {
     public var fluent: any Cache {
@@ -28,27 +27,22 @@ extension Application.Caches.Provider {
 private struct FluentCache: Cache {
     let id: DatabaseID?
     let database: any Database
-    
+
     init(id: DatabaseID?, database: any Database) {
         self.id = id
         self.database = database
     }
-    
+
     func get<T>(_ key: String, as type: T.Type) -> EventLoopFuture<T?>
-        where T: Decodable
-    {
+    where T: Decodable & VaporSendableMetatype {
         CacheEntry.query(on: self.database)
             .filter(\.$key == key)
             .first()
             .flatMapThrowing { entry -> T? in
-                if let entry = entry {
-                    return try JSONDecoder().decode(T.self, from: Data(entry.value.utf8))
-                } else {
-                    return nil
-                }
+                try entry.map { try JSONDecoder().decode(T.self, from: Data($0.value.utf8)) }
             }
     }
-    
+
     func set(_ key: String, to value: (some Encodable)?) -> EventLoopFuture<Void> {
         if let value = value {
             do {
@@ -65,15 +59,15 @@ private struct FluentCache: Cache {
             return CacheEntry.query(on: self.database).filter(\.$key == key).delete()
         }
     }
-    
+
     func `for`(_ request: Request) -> Self {
         .init(id: self.id, database: request.db(self.id))
     }
 }
 
 public final class CacheEntry: Model, @unchecked Sendable {
     public static let schema: String = "_fluent_cache"
-    
+
     struct Create: Migration {
         func prepare(on database: any Database) -> EventLoopFuture<Void> {
             database.schema("_fluent_cache")
@@ -83,7 +77,7 @@ public final class CacheEntry: Model, @unchecked Sendable {
                 .unique(on: "key")
                 .create()
         }
-        
+
         func revert(on database: any Database) -> EventLoopFuture<Void> {
             database.schema("_fluent_cache").delete()
         }
@@ -92,18 +86,18 @@ public final class CacheEntry: Model, @unchecked Sendable {
     public static var migration: any Migration {
         Create()
     }
-    
+
     @ID(key: .id)
     public var id: UUID?
-    
+
     @Field(key: "key")
     public var key: String
-    
+
     @Field(key: "value")
     public var value: String
-    
-    public init() { }
-    
+
+    public init() {}
+
     public init(id: UUID? = nil, key: String, value: String) {
         self.key = key
         self.value = value

Sources/Fluent/Fluent+Cache.swift

@@ -1,5 +1,5 @@
-import Vapor
-import FluentKit
+public import FluentKit
+public import Vapor
 
 struct RequestQueryHistory: StorageKey {
     typealias Value = QueryHistory