Merge branch 'main' into debug-initializer

Author: glbrntt

.github/workflows/main.yml

@@ -11,9 +11,10 @@ jobs:
         name: Unit tests
         uses: apple/swift-nio/.github/workflows/unit_tests.yml@main
         with:
-            linux_5_9_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
+            linux_5_9_enabled: false
             linux_5_10_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
             linux_6_0_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
+            linux_6_1_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
             linux_nightly_next_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
             linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
 

.github/workflows/pull_request.yml

@@ -14,15 +14,18 @@ jobs:
         name: Unit tests
         uses: apple/swift-nio/.github/workflows/unit_tests.yml@main
         with:
-            linux_5_9_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
+            linux_5_9_enabled: false
             linux_5_10_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
             linux_6_0_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
+            linux_6_1_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
             linux_nightly_next_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
             linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
 
     cxx-interop:
         name: Cxx interop
         uses: apple/swift-nio/.github/workflows/cxx_interop.yml@main
+        with:
+            linux_5_9_enabled: false
 
     static-sdk:
         name: Static SDK

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.8
+// swift-tools-version:5.9
 //===----------------------------------------------------------------------===//
 //
 // This source file is part of the AsyncHTTPClient open source project

README.md

@@ -306,7 +306,7 @@ Please have a look at [SECURITY.md](SECURITY.md) for AsyncHTTPClient's security
 
 ## Supported Versions
 
-The most recent versions of AsyncHTTPClient support Swift 5.6 and newer. The minimum Swift version supported by AsyncHTTPClient releases are detailed below:
+The most recent versions of AsyncHTTPClient support Swift 5.9 and newer. The minimum Swift version supported by AsyncHTTPClient releases are detailed below:
 
 AsyncHTTPClient     | Minimum Swift Version
 --------------------|----------------------
@@ -316,4 +316,5 @@ AsyncHTTPClient     | Minimum Swift Version
 `1.13.0 ..< 1.18.0` | 5.5.2
 `1.18.0 ..< 1.20.0` | 5.6
 `1.20.0 ..< 1.21.0` | 5.7
-`1.21.0 ...`        | 5.8
+`1.21.0 ..< 1.26.0` | 5.8
+`1.26.0 ...`        | 5.9

Tests/AsyncHTTPClientTests/AsyncAwaitEndToEndTests.swift

@@ -635,33 +635,33 @@ final class AsyncAwaitEndToEndTests: XCTestCase {
 
     func testDnsOverride() {
         XCTAsyncTest(timeout: 5) {
-            /// key + cert was created with the following code (depends on swift-certificates)
-            /// ```
-            /// import X509
-            /// import CryptoKit
-            /// import Foundation
-            ///
-            /// let privateKey = P384.Signing.PrivateKey()
-            /// let name = try DistinguishedName {
-            ///     OrganizationName("Self Signed")
-            ///     CommonName("localhost")
-            /// }
-            /// let certificate = try Certificate(
-            ///     version: .v3,
-            ///     serialNumber: .init(),
-            ///     publicKey: .init(privateKey.publicKey),
-            ///     notValidBefore: Date(),
-            ///     notValidAfter: Date().advanced(by: 365 * 24 * 3600),
-            ///     issuer: name,
-            ///     subject: name,
-            ///     signatureAlgorithm: .ecdsaWithSHA384,
-            ///     extensions: try .init {
-            ///         SubjectAlternativeNames([.dnsName("example.com")])
-            ///         try ExtendedKeyUsage([.serverAuth])
-            ///     },
-            ///     issuerPrivateKey: .init(privateKey)
-            /// )
-            /// ```
+            // key + cert was created with the following code (depends on swift-certificates)
+            // ```
+            // import X509
+            // import CryptoKit
+            // import Foundation
+            //
+            // let privateKey = P384.Signing.PrivateKey()
+            // let name = try DistinguishedName {
+            //     OrganizationName("Self Signed")
+            //     CommonName("localhost")
+            // }
+            // let certificate = try Certificate(
+            //     version: .v3,
+            //     serialNumber: .init(),
+            //     publicKey: .init(privateKey.publicKey),
+            //     notValidBefore: Date(),
+            //     notValidAfter: Date().advanced(by: 365 * 24 * 3600),
+            //     issuer: name,
+            //     subject: name,
+            //     signatureAlgorithm: .ecdsaWithSHA384,
+            //     extensions: try .init {
+            //         SubjectAlternativeNames([.dnsName("example.com")])
+            //         try ExtendedKeyUsage([.serverAuth])
+            //     },
+            //     issuerPrivateKey: .init(privateKey)
+            // )
+            // ```
             let certPath = Bundle.module.path(forResource: "example.com.cert", ofType: "pem")!
             let keyPath = Bundle.module.path(forResource: "example.com.private-key", ofType: "pem")!
             let key = try NIOSSLPrivateKey(file: keyPath, format: .pem)

Tests/AsyncHTTPClientTests/Resources/example.com.cert.pem

@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBxDCCAUmgAwIBAgIVAPY31L1kyEnjO1E4inpE7+SYRO9mMAoGCCqGSM49BAMD
-MCoxFDASBgNVBAoMC1NlbGYgU2lnbmVkMRIwEAYDVQQDDAlsb2NhbGhvc3QwHhcN
-MjQwMzI4MjI0MDUyWhcNMjUwMzI4MjI0MDUyWjAqMRQwEgYDVQQKDAtTZWxmIFNp
-Z25lZDESMBAGA1UEAwwJbG9jYWxob3N0MHYwEAYHKoZIzj0CAQYFK4EEACIDYgAE
-o2i+uiLtMu0Jzsk3oEUnfoM9n44/aV9UeOXxyDs57i2E13HrJeWIXACetybkB+Q8
-Poab6ohbskTwrS7WN3tFgoGdRBCKQow/rTECdezR/fdz2cGADaBN+CNMuFSnFSr5
-oy8wLTAWBgNVHREEDzANggtleGFtcGxlLmNvbTATBgNVHSUEDDAKBggrBgEFBQcD
-ATAKBggqhkjOPQQDAwNpADBmAjEAwF5OlUBOloDTIAxgaSSvHBMSVOE1rY5hUlkT
-kQ+dQFeUe3Fn+Er5ohvkt+qVOQ5yAjEAt9s5b/Iz+JmWxKKUyExHob6QHEuuHmJy
-AKdrn20Ply60bb8qxGYHhwhoyV2MZYVV
+MIIBwTCCAUigAwIBAgIUX7f9BABxGdAqG5EvLpQScFt9lOkwCgYIKoZIzj0EAwMw
+KjEUMBIGA1UECgwLU2VsZiBTaWduZWQxEjAQBgNVBAMMCWxvY2FsaG9zdDAeFw0y
+NTA0MDExNDMwMTFaFw0yNjA0MDExNDMwMTFaMCoxFDASBgNVBAoMC1NlbGYgU2ln
+bmVkMRIwEAYDVQQDDAlsb2NhbGhvc3QwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQW
+szfO5HCWIWgKUqyXUU0pFpYgaq01RRL69XZz1CkV6XTrxMfIvvwez2886EQDL8QX
+i5NpKg3qvPgWuDjVHaj4WEJe5XMNqcujxcTufBlmaQ6o4vtoK7CIHDIDldF/HRij
+LzAtMBYGA1UdEQQPMA2CC2V4YW1wbGUuY29tMBMGA1UdJQQMMAoGCCsGAQUFBwMB
+MAoGCCqGSM49BAMDA2cAMGQCMBJ8Dxg0qX2bEZ3r6dI3UCGAUYxJDVk+XhiIY1Fm
+5FJeQqhaVayCRPrPXXGZUJGY/wIwXej70FwkxHKLq+XxfHTC5CzmoOK469C9Rk9Y
+ucddXM83ebFxVNgRCWetH9tDdXJ9
 -----END CERTIFICATE-----

Tests/AsyncHTTPClientTests/Resources/example.com.private-key.pem

@@ -1,6 +1,6 @@
 -----BEGIN PRIVATE KEY-----
-MIG2AgEAMBAGByqGSM49AgEGBSuBBAAiBIGeMIGbAgEBBDDhC5OSjPQeYRm4irIH
-z4EyM/NbJsX39SlI6J4/q0Syt0BwojgJKhCWfeveanbIjbWhZANiAASjaL66Iu0y
-7QnOyTegRSd+gz2fjj9pX1R45fHIOznuLYTXcesl5YhcAJ63JuQH5Dw+hpvqiFuy
-RPCtLtY3e0WCgZ1EEIpCjD+tMQJ17NH993PZwYANoE34I0y4VKcVKvk=
+MIG2AgEAMBAGByqGSM49AgEGBSuBBAAiBIGeMIGbAgEBBDD9v51MTOcgFIbiHbok
+U+QOubosGF1u1q+D3fEUb1U2cgjCofKmPHekXTz0xu9MJi2hZANiAAQWszfO5HCW
+IWgKUqyXUU0pFpYgaq01RRL69XZz1CkV6XTrxMfIvvwez2886EQDL8QXi5NpKg3q
+vPgWuDjVHaj4WEJe5XMNqcujxcTufBlmaQ6o4vtoK7CIHDIDldF/HRg=
 -----END PRIVATE KEY-----