Skip to content

Commit 8f0bb05

Browse files
committed
removed objc exports
Signed-off-by: Yehor Popovych <[email protected]>
1 parent 543cae0 commit 8f0bb05

File tree

5 files changed

+8
-68
lines changed

5 files changed

+8
-68
lines changed

Kronos.xcodeproj/project.pbxproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
26447D7D1D6E54D400159BEE /* DNSResolver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26447D741D6E54D400159BEE /* DNSResolver.swift */; };
1212
26447D7E1D6E54D400159BEE /* InternetAddress.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26447D751D6E54D400159BEE /* InternetAddress.swift */; };
1313
26447D7F1D6E54D400159BEE /* Data+Bytes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26447D761D6E54D400159BEE /* Data+Bytes.swift */; };
14-
26447D801D6E54D400159BEE /* NSTimer+ClosureKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26447D771D6E54D400159BEE /* NSTimer+ClosureKit.swift */; };
1514
26447D811D6E54D400159BEE /* NTPClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26447D781D6E54D400159BEE /* NTPClient.swift */; };
1615
26447D821D6E54D400159BEE /* NTPPacket.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26447D791D6E54D400159BEE /* NTPPacket.swift */; };
1716
26447D831D6E54D400159BEE /* NTPProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26447D7A1D6E54D400159BEE /* NTPProtocol.swift */; };
@@ -41,7 +40,6 @@
4140
26447D741D6E54D400159BEE /* DNSResolver.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DNSResolver.swift; sourceTree = "<group>"; };
4241
26447D751D6E54D400159BEE /* InternetAddress.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InternetAddress.swift; sourceTree = "<group>"; };
4342
26447D761D6E54D400159BEE /* Data+Bytes.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Data+Bytes.swift"; sourceTree = "<group>"; };
44-
26447D771D6E54D400159BEE /* NSTimer+ClosureKit.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSTimer+ClosureKit.swift"; sourceTree = "<group>"; };
4543
26447D781D6E54D400159BEE /* NTPClient.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NTPClient.swift; sourceTree = "<group>"; };
4644
26447D791D6E54D400159BEE /* NTPPacket.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NTPPacket.swift; sourceTree = "<group>"; };
4745
26447D7A1D6E54D400159BEE /* NTPProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NTPProtocol.swift; sourceTree = "<group>"; };
@@ -118,7 +116,6 @@
118116
26447D741D6E54D400159BEE /* DNSResolver.swift */,
119117
26447D751D6E54D400159BEE /* InternetAddress.swift */,
120118
26447D761D6E54D400159BEE /* Data+Bytes.swift */,
121-
26447D771D6E54D400159BEE /* NSTimer+ClosureKit.swift */,
122119
26447D781D6E54D400159BEE /* NTPClient.swift */,
123120
26447D791D6E54D400159BEE /* NTPPacket.swift */,
124121
26447D7A1D6E54D400159BEE /* NTPProtocol.swift */,
@@ -249,7 +246,6 @@
249246
26447D7F1D6E54D400159BEE /* Data+Bytes.swift in Sources */,
250247
26447D841D6E54D400159BEE /* TimeFreeze.swift in Sources */,
251248
26447D821D6E54D400159BEE /* NTPPacket.swift in Sources */,
252-
26447D801D6E54D400159BEE /* NSTimer+ClosureKit.swift in Sources */,
253249
);
254250
runOnlyForDeploymentPostprocessing = 0;
255251
};

Sources/DNSResolver.swift

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -51,29 +51,25 @@ final class DNSResolver {
5151
retain: nil, release: nil, copyDescription: kCopyNoOperation)
5252

5353
let hostReference = CFHostCreateWithName(kCFAllocatorDefault, host as CFString).takeUnretainedValue()
54-
resolver.timer = Timer.scheduledTimer(timeInterval: timeout, target: resolver,
55-
selector: #selector(DNSResolver.onTimeout),
56-
userInfo: hostReference, repeats: false)
54+
55+
resolver.timer = Timer.scheduledTimer(withTimeInterval: timeout, repeats: false) { [unowned resolver] _ in
56+
resolver.onTimeout(hostReference: hostReference)
57+
}
5758

5859
CFHostSetClient(hostReference, callback, &clientContext)
5960
CFHostScheduleWithRunLoop(hostReference, CFRunLoopGetMain(), CFRunLoopMode.commonModes.rawValue)
6061
CFHostStartInfoResolution(hostReference, .addresses, nil)
6162
}
6263

63-
@objc
64-
private func onTimeout() {
64+
private func onTimeout(hostReference: CFHost) {
6565
defer {
6666
self.completion?([])
67+
self.timer = nil
6768

6869
// Manually release the previously retained self.
6970
Unmanaged.passUnretained(self).release()
7071
}
7172

72-
guard let userInfo = self.timer?.userInfo else {
73-
return
74-
}
75-
76-
let hostReference = unsafeBitCast(userInfo as AnyObject, to: CFHost.self)
7773
CFHostCancelInfoResolution(hostReference, .addresses)
7874
CFHostUnscheduleFromRunLoop(hostReference, CFRunLoopGetMain(), CFRunLoopMode.commonModes.rawValue)
7975
CFHostSetClient(hostReference, nil, nil)

Sources/NSTimer+ClosureKit.swift

Lines changed: 0 additions & 52 deletions
This file was deleted.

Sources/NTPClient.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ final class NTPClient {
108108
completion: UnsafeMutableRawPointer(retainedCallback.toOpaque())
109109
)
110110

111-
timer = BlockTimer.scheduledTimer(withTimeInterval: timeout, repeated: true) { _ in
111+
timer = Timer.scheduledTimer(withTimeInterval: timeout, repeats: true) { _ in
112112
bridgeCallback(nil, TimeInterval.infinity)
113113
retainedCallback.release()
114114

Tests/KronosTests/DNSResolverTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ final class DNSResolverTests: XCTestCase {
55

66
func testResolveOneIP() {
77
let expectation = self.expectation(description: "Query host's DNS for a single IP")
8-
DNSResolver.resolve(host: "test.com") { addresses in
8+
DNSResolver.resolve(host: "httpbin.net") { addresses in
99
XCTAssertEqual(addresses.count, 1)
1010
expectation.fulfill()
1111
}

0 commit comments

Comments
 (0)