Migrate to Swift 6.0+ and Swift 6 language mode

.github/workflows/main.yml

@@ -14,8 +14,7 @@ jobs:
     name: Unit tests
     uses: apple/swift-nio/.github/workflows/unit_tests.yml@main
     with:
-      linux_5_9_arguments_override: "--explicit-target-dependency-import-check error"
-      linux_5_10_arguments_override: "--explicit-target-dependency-import-check error"
+      linux_5_10_enabled: false
       linux_6_0_arguments_override: "--explicit-target-dependency-import-check error"
       linux_6_1_arguments_override: "--explicit-target-dependency-import-check error"
       linux_6_2_arguments_override: "--explicit-target-dependency-import-check error"
@@ -24,12 +23,12 @@ jobs:
       windows_6_0_enabled: true
       windows_6_1_enabled: true
       windows_6_2_enabled: true
-      windows_nightly_6_1_enabled: true
+      windows_nightly_next_enabled: true
       windows_nightly_main_enabled: true
       windows_6_0_arguments_override: "--explicit-target-dependency-import-check error"
       windows_6_1_arguments_override: "--explicit-target-dependency-import-check error"
       windows_6_2_arguments_override: "--explicit-target-dependency-import-check error"
-      windows_nightly_6_1_arguments_override: "--explicit-target-dependency-import-check error"
+      windows_nightly_next_arguments_override: "--explicit-target-dependency-import-check error"
       windows_nightly_main_arguments_override: "--explicit-target-dependency-import-check error"
 
   construct-integration-test-matrix:

.github/workflows/pull_request.yml

@@ -18,8 +18,7 @@ jobs:
     name: Unit tests
     uses: apple/swift-nio/.github/workflows/unit_tests.yml@main
     with:
-      linux_5_9_arguments_override: "--explicit-target-dependency-import-check error"
-      linux_5_10_arguments_override: "--explicit-target-dependency-import-check error"
+      linux_5_10_enabled: false
       linux_6_0_arguments_override: "--explicit-target-dependency-import-check error"
       linux_6_1_arguments_override: "--explicit-target-dependency-import-check error"
       linux_6_2_arguments_override: "--explicit-target-dependency-import-check error"
@@ -28,12 +27,12 @@ jobs:
       windows_6_0_enabled: true
       windows_6_1_enabled: true
       windows_6_2_enabled: true
-      windows_nightly_6_1_enabled: true
+      windows_nightly_next_enabled: true
       windows_nightly_main_enabled: true
       windows_6_0_arguments_override: "--explicit-target-dependency-import-check error"
       windows_6_1_arguments_override: "--explicit-target-dependency-import-check error"
       windows_6_2_arguments_override: "--explicit-target-dependency-import-check error"
-      windows_nightly_6_1_arguments_override: "--explicit-target-dependency-import-check error"
+      windows_nightly_next_arguments_override: "--explicit-target-dependency-import-check error"
       windows_nightly_main_arguments_override: "--explicit-target-dependency-import-check error"
 
   construct-integration-test-matrix:

.swiftformatignore

@@ -1 +1,4 @@
 **Package.swift
+Sources/OpenAPIRuntime/EventStreams/JSONLinesDecoding.swift
+Sources/OpenAPIRuntime/EventStreams/JSONSequenceDecoding.swift
+Sources/OpenAPIRuntime/EventStreams/ServerSentEventsDecoding.swift

Benchmarks/Benchmarks/OpenAPIRuntimeBenchmarks/Benchmarks.swift

@@ -11,11 +11,16 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
+
+#if canImport(FoundationEssentials)
+import FoundationEssentials
+#else
+import Foundation
+#endif
 import Benchmark
 import OpenAPIRuntime
-import Foundation
 
-let benchmarks = {
+let benchmarks: @Sendable () -> Void = {
     let defaultMetrics: [BenchmarkMetric] = [.mallocCountTotal, .cpuTotal]
 
     Benchmark(

Benchmarks/Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version: 5.9
+// swift-tools-version: 6.0
 import PackageDescription
 
 let package = Package(

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version: 5.9
+// swift-tools-version: 6.0
 //===----------------------------------------------------------------------===//
 //
 // This source file is part of the SwiftOpenAPIGenerator open source project
@@ -51,16 +51,23 @@ let package = Package(
     ]
 )
 
-// ---    STANDARD CROSS-REPO SETTINGS DO NOT EDIT   --- //
 for target in package.targets {
-    switch target.type {
-    case .regular, .test, .executable:
-        var settings = target.swiftSettings ?? []
-        // https://github.com/swiftlang/swift-evolution/blob/main/proposals/0444-member-import-visibility.md
-        settings.append(.enableUpcomingFeature("MemberImportVisibility"))
-        target.swiftSettings = settings
-    case .macro, .plugin, .system, .binary: ()  // not applicable
-    @unknown default: ()  // we don't know what to do here, do nothing
-    }
+    var settings = target.swiftSettings ?? []
+
+    // https://github.com/apple/swift-evolution/blob/main/proposals/0335-existential-any.md
+    // Require `any` for existential types.
+    settings.append(.enableUpcomingFeature("ExistentialAny"))
+
+    // https://github.com/swiftlang/swift-evolution/blob/main/proposals/0444-member-import-visibility.md
+    settings.append(.enableUpcomingFeature("MemberImportVisibility"))
+
+    // https://github.com/swiftlang/swift-evolution/blob/main/proposals/0409-access-level-on-imports.md
+    settings.append(.enableUpcomingFeature("InternalImportsByDefault"))
+
+    #if compiler(>=6.2)
+    // Ensure all public types are explicitly annotated as Sendable or not Sendable.
+    settings.append(.unsafeFlags(["-Xfrontend", "-require-explicit-sendable"]))
+    #endif
+
+    target.swiftSettings = settings
 }
-// --- END: STANDARD CROSS-REPO SETTINGS DO NOT EDIT --- //

Sources/OpenAPIRuntime/Base/Acceptable.swift

@@ -11,6 +11,8 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
+
+// Full Foundation needed for String(format:)
 import Foundation
 
 /// The protocol that all generated `AcceptableContentType` enums conform to.

Sources/OpenAPIRuntime/Base/Base64EncodedData.swift

@@ -12,7 +12,11 @@
 //
 //===----------------------------------------------------------------------===//
 
+#if canImport(FoundationEssentials)
+import FoundationEssentials
+#else
 import Foundation
+#endif
 
 /// A type for converting data as a base64 string.
 ///

Sources/OpenAPIRuntime/Base/ContentDisposition.swift

@@ -11,6 +11,8 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
+
+// Full Foundation needed for String.trimmingCharacters
 import Foundation
 
 /// A parsed representation of the `content-disposition` header described by RFC 6266 containing only
@@ -105,9 +107,10 @@ extension ContentDisposition: RawRepresentable {
         var components = rawValue.split(separator: ";").map { $0.trimmingCharacters(in: .whitespacesAndNewlines) }
         guard !components.isEmpty else { return nil }
         self.dispositionType = DispositionType(rawValue: components.removeFirst())
-        let parameterTuples: [(ParameterName, String)] = components.compactMap { component in
+        let parameterTuples: [(ParameterName, String)] = components.compactMap {
+            (component: String) -> (ParameterName, String)? in
             let parameterComponents = component.split(separator: "=", maxSplits: 1)
-                .map { $0.trimmingCharacters(in: .whitespacesAndNewlines) }
+                .map { $0.trimmingCharacters(in: CharacterSet.whitespacesAndNewlines) }
             guard parameterComponents.count == 2 else { return nil }
             let valueWithoutQuotes = parameterComponents[1].trimmingCharacters(in: ["\""])
             return (.init(rawValue: parameterComponents[0]), valueWithoutQuotes)

Sources/OpenAPIRuntime/Base/CopyOnWriteBox.swift

@@ -46,6 +46,8 @@
     }
 }
 
+@available(*, unavailable) extension CopyOnWriteBox.Storage: Sendable {}
+
 extension CopyOnWriteBox: Encodable where Wrapped: Encodable {
 
     /// Encodes this value into the given encoder.

Sources/OpenAPIRuntime/Base/OpenAPIMIMEType.swift

@@ -11,7 +11,12 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
+
+#if canImport(FoundationEssentials)
+import FoundationEssentials
+#else
 import Foundation
+#endif
 
 /// A container for a parsed, valid MIME type.
 @_spi(Generated) public struct OpenAPIMIMEType: Equatable, Sendable {

Sources/OpenAPIRuntime/Base/OpenAPIValue.swift

@@ -12,17 +12,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#if canImport(Foundation)
-#if canImport(Darwin)
-import class Foundation.NSNull
-#else
-@preconcurrency import class Foundation.NSNull
-#endif
-import class Foundation.NSNumber
+// Full Foundation needed for NSNull
+import Foundation
 #if canImport(CoreFoundation)
 import CoreFoundation
 #endif
-#endif
 
 /// A container for a value represented by JSON Schema.
 ///

Sources/OpenAPIRuntime/Base/UndocumentedPayload.swift

@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import HTTPTypes
+public import HTTPTypes
 
 /// A payload value used by undocumented operation responses.
 ///

Sources/OpenAPIRuntime/Conversion/Configuration.swift

@@ -11,7 +11,9 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
-import Foundation
+
+// Full Foundation needed for NSLock
+public import Foundation
 
 /// A type that allows customization of Date encoding and decoding.
 ///

Sources/OpenAPIRuntime/Conversion/Converter+Client.swift

@@ -11,8 +11,9 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
+
 import Foundation
-import HTTPTypes
+public import HTTPTypes
 
 extension Converter {
 

Sources/OpenAPIRuntime/Conversion/Converter+Common.swift

@@ -11,8 +11,13 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
+
+#if canImport(FoundationEssentials)
+import FoundationEssentials
+#else
 import Foundation
-import HTTPTypes
+#endif
+public import HTTPTypes
 
 extension Converter {
 

Sources/OpenAPIRuntime/Conversion/Converter+Server.swift

@@ -11,8 +11,9 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
+
 import Foundation
-import HTTPTypes
+public import HTTPTypes
 
 extension Converter {
 

Sources/OpenAPIRuntime/Conversion/Converter.swift

@@ -11,12 +11,12 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
-#if canImport(Darwin)
-import class Foundation.JSONEncoder
+
+#if canImport(FoundationEssentials)
+import FoundationEssentials
 #else
-@preconcurrency import class Foundation.JSONEncoder
+import Foundation
 #endif
-import class Foundation.JSONDecoder
 
 /// Converter between generated and HTTP currency types.
 @_spi(Generated) public struct Converter: Sendable {

Sources/OpenAPIRuntime/Conversion/CurrencyExtensions.swift

@@ -11,6 +11,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
+
 import Foundation
 import HTTPTypes
 

Sources/OpenAPIRuntime/Conversion/ErrorExtensions.swift

@@ -11,6 +11,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
+
 import Foundation
 
 extension DecodingError {

Sources/OpenAPIRuntime/Conversion/FoundationExtensions.swift

@@ -11,6 +11,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
+
 import Foundation
 
 extension String {

Sources/OpenAPIRuntime/Conversion/ServerVariable.swift

@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Foundation
+public import Foundation
 
 extension URL {
     /// Returns a validated server URL created from the URL template, or

Sources/OpenAPIRuntime/Conversion/URLExtensions.swift

@@ -11,7 +11,12 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
-import Foundation
+
+#if canImport(FoundationEssentials)
+public import FoundationEssentials
+#else
+public import Foundation
+#endif
 
 extension URL {
     /// Returns the default server URL of "/".

Sources/OpenAPIRuntime/Deprecated/Deprecated.swift

@@ -11,7 +11,12 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
-import Foundation
+
+#if canImport(FoundationEssentials)
+public import FoundationEssentials
+#else
+public import Foundation
+#endif
 import HTTPTypes
 
 // MARK: - Functionality to be removed in the future

Sources/OpenAPIRuntime/Errors/ClientError.swift

@@ -12,13 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-import HTTPTypes
-#if canImport(Darwin)
-import struct Foundation.URL
-#else
-@preconcurrency import struct Foundation.URL
-#endif
-import protocol Foundation.LocalizedError
+public import Foundation
+public import HTTPTypes
 
 /// An error thrown by a client performing an OpenAPI operation.
 ///

Sources/OpenAPIRuntime/Errors/CodingErrors.swift

@@ -11,7 +11,12 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
+
+#if canImport(FoundationEssentials)
+import FoundationEssentials
+#else
 import Foundation
+#endif
 
 extension DecodingError: PrettyStringConvertible {
     var prettyDescription: String {

Sources/OpenAPIRuntime/Errors/RuntimeError.swift

@@ -11,8 +11,12 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
-import protocol Foundation.LocalizedError
-import struct Foundation.Data
+
+#if canImport(FoundationEssentials)
+import FoundationEssentials
+#else
+import Foundation
+#endif
 import HTTPTypes
 
 /// Error thrown by generated code.

Sources/OpenAPIRuntime/Errors/ServerError.swift

@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-import HTTPTypes
-import protocol Foundation.LocalizedError
+public import Foundation
+public import HTTPTypes
 
 /// An error thrown by a server handling an OpenAPI operation.
 public struct ServerError: Error, HTTPResponseConvertible {