mirror
/
swift-nio-transport-services
mirror of https://github.com/apple/swift-nio-transport-services.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Replace Lock with NIOLock (#157) 

Motivation:

Lock has been deprecated in favour of NIOLock. Warnings aren't great.

Modifications:

- Replace Lock with NIOLock
- Update the minimum required NIO version to 2.42.0.

Result:

Everything builds cleanly
This commit is contained in:
Cory Benfield 2022-09-27 13:48:00 +01:00 committed by GitHub
parent 5cd6fd45f7
commit b39e53ad42
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Package.swift
View File

@ -21,7 +21,7 @@ let package = Package(
.library(name: "NIOTransportServices", targets: ["NIOTransportServices"]), .library(name: "NIOTransportServices", targets: ["NIOTransportServices"]),
], ],
dependencies: [ dependencies: [
.package(url: "https://github.com/apple/swift-nio.git", from: "2.41.1"), .package(url: "https://github.com/apple/swift-nio.git", from: "2.42.0"),
.package(url: "https://github.com/apple/swift-atomics.git", from: "1.0.2"), .package(url: "https://github.com/apple/swift-atomics.git", from: "1.0.2"),
.package(url: "https://github.com/apple/swift-docc-plugin", from: "1.0.0"), .package(url: "https://github.com/apple/swift-docc-plugin", from: "1.0.0"),
], ],

2
Package@swift-5.4.swift
View File

@ -21,7 +21,7 @@ let package = Package(
.library(name: "NIOTransportServices", targets: ["NIOTransportServices"]), .library(name: "NIOTransportServices", targets: ["NIOTransportServices"]),
], ],
dependencies: [ dependencies: [
.package(url: "https://github.com/apple/swift-nio.git", from: "2.32.0"), .package(url: "https://github.com/apple/swift-nio.git", from: "2.42.0"),
.package(url: "https://github.com/apple/swift-atomics.git", from: "1.0.2"), .package(url: "https://github.com/apple/swift-atomics.git", from: "1.0.2"),
], ],
targets: [ targets: [

2
Package@swift-5.5.swift
View File

@ -21,7 +21,7 @@ let package = Package(
.library(name: "NIOTransportServices", targets: ["NIOTransportServices"]), .library(name: "NIOTransportServices", targets: ["NIOTransportServices"]),
], ],
dependencies: [ dependencies: [
.package(url: "https://github.com/apple/swift-nio.git", from: "2.32.0"), .package(url: "https://github.com/apple/swift-nio.git", from: "2.42.0"),
.package(url: "https://github.com/apple/swift-atomics.git", from: "1.0.2"), .package(url: "https://github.com/apple/swift-atomics.git", from: "1.0.2"),
], ],
targets: [ targets: [

2
Sources/NIOTransportServices/NIOTSConnectionChannel.swift
View File

@ -204,7 +204,7 @@ internal final class NIOTSConnectionChannel {
private var _addressCache = AddressCache(local: nil, remote: nil) private var _addressCache = AddressCache(local: nil, remote: nil)
/// A lock that guards the _addressCache. /// A lock that guards the _addressCache.
private let _addressCacheLock = Lock() private let _addressCacheLock = NIOLock()
/// Create a `NIOTSConnectionChannel` on a given `NIOTSEventLoop`. /// Create a `NIOTSConnectionChannel` on a given `NIOTSEventLoop`.
/// ///

2
Sources/NIOTransportServices/NIOTSListenerChannel.swift
View File

@ -101,7 +101,7 @@ internal final class NIOTSListenerChannel {
private var _addressCache = AddressCache(local: nil, remote: nil) private var _addressCache = AddressCache(local: nil, remote: nil)
/// A lock that guards the _addressCache. /// A lock that guards the _addressCache.
private let _addressCacheLock = Lock() private let _addressCacheLock = NIOLock()
/// Create a `NIOTSListenerChannel` on a given `NIOTSEventLoop`. /// Create a `NIOTSListenerChannel` on a given `NIOTSEventLoop`.

2
Tests/NIOTransportServicesTests/NIOTSBootstrapTests.swift
View File

@ -25,7 +25,7 @@ import Foundation
@available(OSX 10.14, iOS 12.0, tvOS 12.0, *) @available(OSX 10.14, iOS 12.0, tvOS 12.0, *)
final class NIOTSBootstrapTests: XCTestCase { final class NIOTSBootstrapTests: XCTestCase {
var groupBag: [NIOTSEventLoopGroup]? = nil // protected by `self.lock` var groupBag: [NIOTSEventLoopGroup]? = nil // protected by `self.lock`
let lock = Lock() let lock = NIOLock()
override func setUp() { override func setUp() {
self.lock.withLock { self.lock.withLock {