Merge branch 'main' into dn-remove-niosendable

This commit is contained in:
David Nadoba 2022-10-13 15:33:22 +01:00 committed by GitHub
commit 1e6692b75e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 12 deletions

View File

@ -14,7 +14,7 @@ All code will go through code review like in the other repositories related to t
`swift-nio-extras` part of the SwiftNIO 2 family of repositories and depends on the following: `swift-nio-extras` part of the SwiftNIO 2 family of repositories and depends on the following:
- [`swift-nio`](https://github.com/apple/swift-nio), version 2.30.0 or better. - [`swift-nio`](https://github.com/apple/swift-nio), version 2.30.0 or better.
- Swift 5.5. - Swift 5.5.2
- `zlib` and its development headers installed on the system. But don't worry, you'll find `zlib` on pretty much any UNIX system that can compile any sort of code. - `zlib` and its development headers installed on the system. But don't worry, you'll find `zlib` on pretty much any UNIX system that can compile any sort of code.
To depend on `swift-nio-extras`, put the following in the `dependencies` of your `Package.swift`: To depend on `swift-nio-extras`, put the following in the `dependencies` of your `Package.swift`:
@ -25,14 +25,14 @@ To depend on `swift-nio-extras`, put the following in the `dependencies` of your
### Support for older Swift versions ### Support for older Swift versions
The most recent versions of SwiftNIO Extras support Swift 5.5 and newer. The minimum Swift version supported by SwiftNIO Extras releases are detailed below: The most recent versions of SwiftNIO Extras support Swift 5.5.2 and newer. The minimum Swift version supported by SwiftNIO Extras releases are detailed below:
SwiftNIO Extras | Minimum Swift Version SwiftNIO Extras | Minimum Swift Version
--------------------|---------------------- --------------------|----------------------
`1.0.0 ..< 1.10.0` | 5.0 `1.0.0 ..< 1.10.0` | 5.0
`1.10.0 ..< 1.11.0` | 5.2 `1.10.0 ..< 1.11.0` | 5.2
`1.11.0 ..< 1.14.0` | 5.4 `1.11.0 ..< 1.14.0` | 5.4
`1.14.0 ...` | 5.5 `1.14.0 ...` | 5.5.2
On the [`nio-extras-0.1`](https://github.com/apple/swift-nio-extras/tree/nio-extras-0.1) branch, you can find the `swift-nio-extras` version for the SwiftNIO 1 family. It requires Swift 4.1 or better. On the [`nio-extras-0.1`](https://github.com/apple/swift-nio-extras/tree/nio-extras-0.1) branch, you can find the `swift-nio-extras` version for the SwiftNIO 1 family. It requires Swift 4.1 or better.

View File

@ -144,11 +144,8 @@ private final class ChannelCollector {
} }
} }
#if swift(>=5.5) && canImport(_Concurrency)
extension ChannelCollector: @unchecked Sendable {
} extension ChannelCollector: @unchecked Sendable {}
#endif
/// A `ChannelHandler` that adds all channels that it receives through the `ChannelPipeline` to a `ChannelCollector`. /// A `ChannelHandler` that adds all channels that it receives through the `ChannelPipeline` to a `ChannelCollector`.
/// ///

View File

@ -722,8 +722,4 @@ extension NIOWritePCAPHandler {
} }
} }
#if swift(>=5.5) && canImport(_Concurrency) extension NIOWritePCAPHandler.SynchronizedFileSink: @unchecked Sendable {}
extension NIOWritePCAPHandler.SynchronizedFileSink: @unchecked Sendable {
}
#endif