Update minimum Swift version to 6.0 (vapor#3365)

* Update package minimum Swift version to 6.0. Update source code accordingly, and add theming to API docs.

* Brutally hack around SymmetricKey not being Sendable in SwiftCrypto

* Update dependabot.yml

* Sendable stinks.

* There, that should do it

* Update ServerTests.swift

* Update URITests.swift

---------

Co-authored-by: Tim Condon <[email protected]>

Author: gwynne

.github/dependabot.yml

@@ -1,5 +1,4 @@
 version: 2
-enable-beta-ecosystems: true
 updates:
   - package-ecosystem: "github-actions"
     directory: "/"
@@ -11,14 +10,3 @@ updates:
       dependencies:
         patterns:
           - "*"
-  - package-ecosystem: "swift"
-    directory: "/"
-    schedule:
-      interval: "daily"
-    open-pull-requests-limit: 6
-    allow:
-      - dependency-type: all
-    groups:
-      all-dependencies:
-        patterns:
-          - "*"

Package.swift

@@ -1,6 +1,5 @@
-// swift-tools-version:5.9
+// swift-tools-version:6.0
 import PackageDescription
-import Foundation
 
 let package = Package(
     name: "vapor",
@@ -102,7 +101,7 @@ let package = Package(
                 .product(name: "_NIOFileSystem", package: "swift-nio"),
                 .product(name: "_NIOFileSystemFoundationCompat", package: "swift-nio"),
             ],
-            swiftSettings: [.enableExperimentalFeature("StrictConcurrency=complete")]
+            swiftSettings: swiftSettings
         ),
 
         // Development
@@ -112,7 +111,7 @@ let package = Package(
                 .target(name: "Vapor"),
             ],
             resources: [.copy("Resources")],
-            swiftSettings: [.enableExperimentalFeature("StrictConcurrency=complete")]
+            swiftSettings: swiftSettings
         ),
 
         // Testing
@@ -121,23 +120,23 @@ let package = Package(
             dependencies: [
                 .target(name: "Vapor"),
             ],
-            swiftSettings: [.enableExperimentalFeature("StrictConcurrency=complete")]
+            swiftSettings: swiftSettings
         ),
         .target(
             name: "VaporTesting",
             dependencies: [
                 .target(name: "VaporTestUtils"),
                 .target(name: "Vapor"),
             ],
-            swiftSettings: [.enableExperimentalFeature("StrictConcurrency=complete")]
+            swiftSettings: swiftSettings
         ),
         .target(
             name: "XCTVapor",
             dependencies: [
                 .target(name: "VaporTestUtils"),
                 .target(name: "Vapor"),
             ],
-            swiftSettings: [.enableExperimentalFeature("StrictConcurrency=complete")]
+            swiftSettings: swiftSettings
         ),
         .testTarget(
             name: "VaporTests",
@@ -158,10 +157,16 @@ let package = Package(
                 .copy("Utilities/expired.key"),
                 .copy("Utilities/long-test-file.txt"),
             ],
-            swiftSettings: [
-                .enableUpcomingFeature("BareSlashRegexLiterals"),
-                .enableExperimentalFeature("StrictConcurrency=complete"),
-            ]
+            swiftSettings: swiftSettings
         ),
     ]
 )
+
+var swiftSettings: [SwiftSetting] { [
+    //.enableUpcomingFeature("ExistentialAny"),
+    //.enableUpcomingFeature("InternalImportsByDefault"),
+    .enableUpcomingFeature("MemberImportVisibility"),
+    .enableUpcomingFeature("InferIsolatedConformances"),
+    //.enableUpcomingFeature("NonisolatedNonsendingByDefault"),
+    .enableUpcomingFeature("ImmutableWeakCaptures"),
+] }

README.md

@@ -21,7 +21,7 @@
         <img src="https://img.shields.io/codecov/c/github/vapor/vapor?style=plastic&logo=codecov&label=codecov" alt="Code Coverage">
     </a>
     <a href="https://swift.org">
-        <img src="https://design.vapor.codes/images/swift57up.svg" alt="Swift 5.7+">
+        <img src="https://design.vapor.codes/images/swift60up.svg" alt="Swift 6.0+">
     </a>
     <a href="https://hachyderm.io/@codevapor">
         <img src="https://img.shields.io/badge/%[email protected]?style=plastic&logo=mastodon&labelColor=gray&logoColor=%239394ff" alt="Mastodon">

Sources/Vapor/Content/JSONCoders+Content.swift

@@ -1,10 +1,11 @@
 import Foundation
 import NIOCore
+import NIOFoundationCompat
 import NIOHTTP1
 
-#if swift(<6.0)
-extension Foundation.JSONEncoder: @unchecked Swift.Sendable {}
-extension Foundation.JSONDecoder: @unchecked Swift.Sendable {}
+#if canImport(Darwin)
+extension JSONEncoder: @retroactive @unchecked Sendable {} // JSONEncoder Sendable conformance is not available before macOS 13.0/iOS 16.0/watchOS 9.0/tvOS 16.0
+extension JSONDecoder: @retroactive @unchecked Sendable {} // JSONDecoder Sendable conformance is not available before macOS 13.0/iOS 16.0/watchOS 9.0/tvOS 16.0
 #endif
 
 extension JSONEncoder: ContentEncoder {
@@ -18,16 +19,17 @@ extension JSONEncoder: ContentEncoder {
         where E: Encodable
     {
         headers.contentType = .json
-        
+
         if !userInfo.isEmpty { // Changing a coder's userInfo is a thread-unsafe mutation, operate on a copy
-            try body.writeBytes(JSONEncoder.custom(
+            let encoder = JSONEncoder.custom(
                 dates: self.dateEncodingStrategy,
                 data: self.dataEncodingStrategy,
                 keys: self.keyEncodingStrategy,
                 format: self.outputFormatting,
-                floats: self.nonConformingFloatEncodingStrategy,
-                userInfo: self.userInfo.merging(userInfo) { $1 }
-            ).encode(encodable))
+                floats: self.nonConformingFloatEncodingStrategy
+            ) // don't use userInfo parameter of `JSONEncoder.custom()` until Swift 6.2 is required
+            encoder.userInfo = self.userInfo.merging(userInfo) { $1 }
+            try body.writeBytes(encoder.encode(encodable))
         } else {
             try body.writeBytes(self.encode(encodable))
         }

Sources/Vapor/Content/PlaintextEncoder.swift

@@ -73,7 +73,7 @@ private final class _PlaintextEncoder: Encoder, SingleValueEncodingContainer {
     func encode<T>(_ value: T) throws where T: Encodable {
         if let data = value as? Data {
             // special case for data
-            let utf8Maybe = data.withUnsafeBytes({ $0.withMemoryRebound(to: CChar.self, { String(validatingUTF8: $0.baseAddress!) }) })
+            let utf8Maybe = data.withUnsafeBytes({ $0.withMemoryRebound(to: CChar.self, { String(validatingCString: $0.baseAddress!) }) })
             if let utf8 = utf8Maybe {
                 self.plaintext = utf8
             } else {

Sources/Vapor/Docs.docc/Resources/vapor-vapor-logo.svg

@@ -12,12 +12,8 @@ extension HTTPStatus: ResponseEncodable {
     }
 }
 
-#if compiler(>=6.1)
 extension HTTPStatus: @retroactive Decodable {}
 extension HTTPStatus: @retroactive Encodable {}
-#else
-extension HTTPStatus: Codable {}
-#endif
 
 extension HTTPStatus {
     public init(from decoder: Decoder) throws {

Sources/Vapor/HTTP/HTTPStatus.swift

@@ -211,6 +211,4 @@ extension HTTPHeaders {
     }
 }
 
-#if !$InferSendableFromCaptures
-extension Swift.WritableKeyPath: @unchecked Swift.Sendable {}
-#endif
+extension WritableKeyPath: @retroactive @unchecked Sendable {}

Sources/Vapor/HTTP/Headers/HTTPHeaderCacheControl.swift

@@ -34,12 +34,8 @@ extension HTTPHeaders {
     }
 }
 
-#if compiler(>=6.1)
 extension HTTPHeaders: @retroactive Decodable {}
 extension HTTPHeaders: @retroactive Encodable {}
-#else
-extension HTTPHeaders: Codable {}
-#endif
 
 extension HTTPHeaders {
     private enum CodingKeys: String, CodingKey { case name, value }

Sources/Vapor/HTTP/Headers/HTTPHeaders.swift

@@ -20,12 +20,8 @@ extension LoggingSystem {
     }
 }
 
-#if compiler(>=6.1)
-extension Logging.Logger.Level: @retroactive CustomStringConvertible {}
-extension Logging.Logger.Level: @retroactive Swift.LosslessStringConvertible {}
-#else
-extension Logging.Logger.Level: Swift.LosslessStringConvertible {}
-#endif
+extension Logger.Level: @retroactive CustomStringConvertible {}
+extension Logger.Level: @retroactive LosslessStringConvertible {}
 
 extension Logging.Logger.Level {
     public init?(_ description: String) { self.init(rawValue: description.lowercased()) }