Skip to content

Commit 003f9d8

Browse files
glbrnttglbrntt
authored
Merge branch 'main' into debug-initializer
2 parents 134aebf + 373862a commit 003f9d8

File tree

7 files changed

+51
-46
lines changed

7 files changed

+51
-46
lines changed

‎.github/workflows/main.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@ jobs:
1111
name: Unit tests
1212
uses: apple/swift-nio/.github/workflows/unit_tests.yml@main
1313
with:
14-
linux_5_9_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
14+
linux_5_9_enabled: false
1515
linux_5_10_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
1616
linux_6_0_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
17+
linux_6_1_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
1718
linux_nightly_next_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
1819
linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
1920

‎.github/workflows/pull_request.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,18 @@ jobs:
1414
name: Unit tests
1515
uses: apple/swift-nio/.github/workflows/unit_tests.yml@main
1616
with:
17-
linux_5_9_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
17+
linux_5_9_enabled: false
1818
linux_5_10_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
1919
linux_6_0_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
20+
linux_6_1_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
2021
linux_nightly_next_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
2122
linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
2223

2324
cxx-interop:
2425
name: Cxx interop
2526
uses: apple/swift-nio/.github/workflows/cxx_interop.yml@main
27+
with:
28+
linux_5_9_enabled: false
2629

2730
static-sdk:
2831
name: Static SDK

‎Package.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:5.8
1+
// swift-tools-version:5.9
22
//===----------------------------------------------------------------------===//
33
//
44
// This source file is part of the AsyncHTTPClient open source project

‎README.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ Please have a look at [SECURITY.md](SECURITY.md) for AsyncHTTPClient's security
306306

307307
## Supported Versions
308308

309-
The most recent versions of AsyncHTTPClient support Swift 5.6 and newer. The minimum Swift version supported by AsyncHTTPClient releases are detailed below:
309+
The most recent versions of AsyncHTTPClient support Swift 5.9 and newer. The minimum Swift version supported by AsyncHTTPClient releases are detailed below:
310310

311311
AsyncHTTPClient | Minimum Swift Version
312312
--------------------|----------------------
@@ -316,4 +316,5 @@ AsyncHTTPClient | Minimum Swift Version
316316
`1.13.0 ..< 1.18.0` | 5.5.2
317317
`1.18.0 ..< 1.20.0` | 5.6
318318
`1.20.0 ..< 1.21.0` | 5.7
319-
`1.21.0 ...` | 5.8
319+
`1.21.0 ..< 1.26.0` | 5.8
320+
`1.26.0 ...` | 5.9

‎Tests/AsyncHTTPClientTests/AsyncAwaitEndToEndTests.swift‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -635,33 +635,33 @@ final class AsyncAwaitEndToEndTests: XCTestCase {
635635

636636
func testDnsOverride() {
637637
XCTAsyncTest(timeout: 5) {
638-
/// key + cert was created with the following code (depends on swift-certificates)
639-
/// ```
640-
/// import X509
641-
/// import CryptoKit
642-
/// import Foundation
643-
///
644-
/// let privateKey = P384.Signing.PrivateKey()
645-
/// let name = try DistinguishedName {
646-
/// OrganizationName("Self Signed")
647-
/// CommonName("localhost")
648-
/// }
649-
/// let certificate = try Certificate(
650-
/// version: .v3,
651-
/// serialNumber: .init(),
652-
/// publicKey: .init(privateKey.publicKey),
653-
/// notValidBefore: Date(),
654-
/// notValidAfter: Date().advanced(by: 365 * 24 * 3600),
655-
/// issuer: name,
656-
/// subject: name,
657-
/// signatureAlgorithm: .ecdsaWithSHA384,
658-
/// extensions: try .init {
659-
/// SubjectAlternativeNames([.dnsName("example.com")])
660-
/// try ExtendedKeyUsage([.serverAuth])
661-
/// },
662-
/// issuerPrivateKey: .init(privateKey)
663-
/// )
664-
/// ```
638+
// key + cert was created with the following code (depends on swift-certificates)
639+
// ```
640+
// import X509
641+
// import CryptoKit
642+
// import Foundation
643+
//
644+
// let privateKey = P384.Signing.PrivateKey()
645+
// let name = try DistinguishedName {
646+
// OrganizationName("Self Signed")
647+
// CommonName("localhost")
648+
// }
649+
// let certificate = try Certificate(
650+
// version: .v3,
651+
// serialNumber: .init(),
652+
// publicKey: .init(privateKey.publicKey),
653+
// notValidBefore: Date(),
654+
// notValidAfter: Date().advanced(by: 365 * 24 * 3600),
655+
// issuer: name,
656+
// subject: name,
657+
// signatureAlgorithm: .ecdsaWithSHA384,
658+
// extensions: try .init {
659+
// SubjectAlternativeNames([.dnsName("example.com")])
660+
// try ExtendedKeyUsage([.serverAuth])
661+
// },
662+
// issuerPrivateKey: .init(privateKey)
663+
// )
664+
// ```
665665
let certPath = Bundle.module.path(forResource: "example.com.cert", ofType: "pem")!
666666
let keyPath = Bundle.module.path(forResource: "example.com.private-key", ofType: "pem")!
667667
let key = try NIOSSLPrivateKey(file: keyPath, format: .pem)

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
-----BEGIN CERTIFICATE-----
2-
MIIBxDCCAUmgAwIBAgIVAPY31L1kyEnjO1E4inpE7+SYRO9mMAoGCCqGSM49BAMD
3-
MCoxFDASBgNVBAoMC1NlbGYgU2lnbmVkMRIwEAYDVQQDDAlsb2NhbGhvc3QwHhcN
4-
MjQwMzI4MjI0MDUyWhcNMjUwMzI4MjI0MDUyWjAqMRQwEgYDVQQKDAtTZWxmIFNp
5-
Z25lZDESMBAGA1UEAwwJbG9jYWxob3N0MHYwEAYHKoZIzj0CAQYFK4EEACIDYgAE
6-
o2i+uiLtMu0Jzsk3oEUnfoM9n44/aV9UeOXxyDs57i2E13HrJeWIXACetybkB+Q8
7-
Poab6ohbskTwrS7WN3tFgoGdRBCKQow/rTECdezR/fdz2cGADaBN+CNMuFSnFSr5
8-
oy8wLTAWBgNVHREEDzANggtleGFtcGxlLmNvbTATBgNVHSUEDDAKBggrBgEFBQcD
9-
ATAKBggqhkjOPQQDAwNpADBmAjEAwF5OlUBOloDTIAxgaSSvHBMSVOE1rY5hUlkT
10-
kQ+dQFeUe3Fn+Er5ohvkt+qVOQ5yAjEAt9s5b/Iz+JmWxKKUyExHob6QHEuuHmJy
11-
AKdrn20Ply60bb8qxGYHhwhoyV2MZYVV
2+
MIIBwTCCAUigAwIBAgIUX7f9BABxGdAqG5EvLpQScFt9lOkwCgYIKoZIzj0EAwMw
3+
KjEUMBIGA1UECgwLU2VsZiBTaWduZWQxEjAQBgNVBAMMCWxvY2FsaG9zdDAeFw0y
4+
NTA0MDExNDMwMTFaFw0yNjA0MDExNDMwMTFaMCoxFDASBgNVBAoMC1NlbGYgU2ln
5+
bmVkMRIwEAYDVQQDDAlsb2NhbGhvc3QwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQW
6+
szfO5HCWIWgKUqyXUU0pFpYgaq01RRL69XZz1CkV6XTrxMfIvvwez2886EQDL8QX
7+
i5NpKg3qvPgWuDjVHaj4WEJe5XMNqcujxcTufBlmaQ6o4vtoK7CIHDIDldF/HRij
8+
LzAtMBYGA1UdEQQPMA2CC2V4YW1wbGUuY29tMBMGA1UdJQQMMAoGCCsGAQUFBwMB
9+
MAoGCCqGSM49BAMDA2cAMGQCMBJ8Dxg0qX2bEZ3r6dI3UCGAUYxJDVk+XhiIY1Fm
10+
5FJeQqhaVayCRPrPXXGZUJGY/wIwXej70FwkxHKLq+XxfHTC5CzmoOK469C9Rk9Y
11+
ucddXM83ebFxVNgRCWetH9tDdXJ9
1212
-----END CERTIFICATE-----

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
-----BEGIN PRIVATE KEY-----
2-
MIG2AgEAMBAGByqGSM49AgEGBSuBBAAiBIGeMIGbAgEBBDDhC5OSjPQeYRm4irIH
3-
z4EyM/NbJsX39SlI6J4/q0Syt0BwojgJKhCWfeveanbIjbWhZANiAASjaL66Iu0y
4-
7QnOyTegRSd+gz2fjj9pX1R45fHIOznuLYTXcesl5YhcAJ63JuQH5Dw+hpvqiFuy
5-
RPCtLtY3e0WCgZ1EEIpCjD+tMQJ17NH993PZwYANoE34I0y4VKcVKvk=
2+
MIG2AgEAMBAGByqGSM49AgEGBSuBBAAiBIGeMIGbAgEBBDD9v51MTOcgFIbiHbok
3+
U+QOubosGF1u1q+D3fEUb1U2cgjCofKmPHekXTz0xu9MJi2hZANiAAQWszfO5HCW
4+
IWgKUqyXUU0pFpYgaq01RRL69XZz1CkV6XTrxMfIvvwez2886EQDL8QXi5NpKg3q
5+
vPgWuDjVHaj4WEJe5XMNqcujxcTufBlmaQ6o4vtoK7CIHDIDldF/HRg=
66
-----END PRIVATE KEY-----

0 commit comments

Comments
 (0)