Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ 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_10_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
linux_6_0_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
linux_6_1_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ 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_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"
Expand Down
2 changes: 1 addition & 1 deletion Benchmarks/Package.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version: 5.9
// swift-tools-version:5.10

import PackageDescription

Expand Down

This file was deleted.

This file was deleted.

2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version:5.9
// swift-tools-version:5.10
//===----------------------------------------------------------------------===//
//
// This source file is part of the SwiftNIO open source project
Expand Down
4 changes: 0 additions & 4 deletions Sources/NIOSSL/ByteBufferBIO.swift
Original file line number Diff line number Diff line change
Expand Up @@ -175,12 +175,8 @@ final class ByteBufferBIO {
/// using a ByteBufferBIO. There will only ever be one value of this in a NIO program,
/// and it will always be non-NULL. Failure to initialize this structure is fatal to
/// the program.
#if compiler(>=5.10)
nonisolated(unsafe) private static let boringSSLBIOMethod: UnsafeMutablePointer<BIO_METHOD> =
buildBoringSSLBIOMethod()
#else
private static let boringSSLBIOMethod: UnsafeMutablePointer<BIO_METHOD> = buildBoringSSLBIOMethod()
#endif

private static func buildBoringSSLBIOMethod() -> UnsafeMutablePointer<BIO_METHOD> {
guard boringSSLIsInitialized else {
Expand Down
4 changes: 0 additions & 4 deletions Sources/NIOSSL/CustomPrivateKey.swift
Original file line number Diff line number Diff line change
Expand Up @@ -222,12 +222,8 @@ extension SSLConnection {

// We heap-allocate the SSL_PRIVATE_KEY_METHOD we need because we can't define a static stored property with fixed address
// in Swift.
#if compiler(>=5.10)
nonisolated(unsafe) internal let customPrivateKeyMethod: UnsafePointer<SSL_PRIVATE_KEY_METHOD> =
buildCustomPrivateKeyMethod()
#else
internal let customPrivateKeyMethod: UnsafePointer<SSL_PRIVATE_KEY_METHOD> = buildCustomPrivateKeyMethod()
#endif

private func buildCustomPrivateKeyMethod() -> UnsafePointer<SSL_PRIVATE_KEY_METHOD> {
let pointer = UnsafeMutablePointer<SSL_PRIVATE_KEY_METHOD>.allocate(capacity: 1)
Expand Down
4 changes: 0 additions & 4 deletions Sources/NIOSSLPerformanceTester/main.swift
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,7 @@ import Foundation

// MARK: Test Harness

#if compiler(>=5.10)
nonisolated(unsafe) var warning: String = ""
#else
var warning: String = ""
#endif

assert(
{
Expand Down
4 changes: 0 additions & 4 deletions Tests/NIOSSLTests/CustomPrivateKeyTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,11 @@ import XCTest

@testable import NIOSSL

#if compiler(>=5.1)
#if compiler(>=6.1)
internal import CNIOBoringSSL
#else
@_implementationOnly import CNIOBoringSSL
#endif
#else
import CNIOBoringSSL
#endif

// This is a helper that lets us work with an EVP_PKEY.
//
Expand Down
4 changes: 0 additions & 4 deletions Tests/NIOSSLTests/SecurityFrameworkVerificationTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -226,11 +226,7 @@ extension SecurityFrameworkVerificationTests {
/// by running the following command, and replacing both served certificates as leaf and intermediate,
/// in that order:
/// `openssl s_client -connect www.apple.com:443 -servername www.apple.com -showcerts`
#if compiler(>=5.10)
nonisolated(unsafe) fileprivate static let appleComCertChain: [SecCertificate] = buildAppleComCertChain()
#else
fileprivate static let appleComCertChain: [SecCertificate] = buildAppleComCertChain()
#endif

fileprivate static func buildAppleComCertChain() -> [SecCertificate] {
#if canImport(Darwin)
Expand Down
7 changes: 1 addition & 6 deletions Tests/NIOSSLTests/TLSConfigurationTest.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
//
//===----------------------------------------------------------------------===//

@preconcurrency import Dispatch
import NIOConcurrencyHelpers
import NIOCore
import NIOEmbedded
Expand All @@ -27,12 +28,6 @@ internal import CNIOBoringSSL
@_implementationOnly import CNIOBoringSSL
#endif

#if compiler(>=5.8)
@preconcurrency import Dispatch
#else
import Dispatch
#endif

final class ErrorCatcher<T: Error>: ChannelInboundHandler, Sendable {
public typealias InboundIn = Any
let _errors: NIOLockedValueBox<[T]>
Expand Down
Loading