From ab38a52133d8985c72ae868ce3bbb549f68f231e Mon Sep 17 00:00:00 2001 From: George Barnett Date: Tue, 17 Aug 2021 15:58:39 +0100 Subject: [PATCH] Use non-deprecated API for removing handlers Motivation: `removeHandlers(channel:)` was deprecated in NIO 2.32.0. Modifications: - Raise minimum required NIO version to 2.32.0 - Use `removeHandlers(pipeline:)` Result: We don't use deprecated API. --- Package.swift | 2 +- Sources/NIOTransportServices/StateManagedChannel.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Package.swift b/Package.swift index 0f648bb..e086fd6 100644 --- a/Package.swift +++ b/Package.swift @@ -21,7 +21,7 @@ let package = Package( .library(name: "NIOTransportServices", targets: ["NIOTransportServices"]), ], dependencies: [ - .package(url: "https://github.com/apple/swift-nio.git", from: "2.30.0"), + .package(url: "https://github.com/apple/swift-nio.git", from: "2.32.0"), ], targets: [ .target( diff --git a/Sources/NIOTransportServices/StateManagedChannel.swift b/Sources/NIOTransportServices/StateManagedChannel.swift index 05350c1..c7b2d95 100644 --- a/Sources/NIOTransportServices/StateManagedChannel.swift +++ b/Sources/NIOTransportServices/StateManagedChannel.swift @@ -225,7 +225,7 @@ extension StateManagedChannel { // Now we schedule our final cleanup. We need to keep the channel pipeline alive for at least one more event // loop tick, as more work might be using it. self.eventLoop.execute { - self.removeHandlers(channel: self) + self.removeHandlers(pipeline: self.pipeline) self.closePromise.succeed(()) }