Skip to content

Commit 974698f

Browse files
jpsimjpsim
authored
Merge pull request #21 from IgorMuzyka/master
Update to Swift 3
2 parents 7dabc4b + 6ada0a6 commit 974698f

File tree

6 files changed

+74
-68
lines changed

6 files changed

+74
-68
lines changed

‎PeerKit.xcodeproj/project.pbxproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@
400400
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
401401
PRODUCT_BUNDLE_IDENTIFIER = "com.jpsim.$(PRODUCT_NAME:rfc1034identifier)";
402402
PRODUCT_NAME = "$(TARGET_NAME)";
403-
SWIFT_VERSION = 2.3;
403+
SWIFT_VERSION = 3.0;
404404
};
405405
name = Debug;
406406
};
@@ -419,7 +419,7 @@
419419
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
420420
PRODUCT_BUNDLE_IDENTIFIER = "com.jpsim.$(PRODUCT_NAME:rfc1034identifier)";
421421
PRODUCT_NAME = "$(TARGET_NAME)";
422-
SWIFT_VERSION = 2.3;
422+
SWIFT_VERSION = 3.0;
423423
};
424424
name = Release;
425425
};
@@ -443,7 +443,7 @@
443443
PRODUCT_BUNDLE_IDENTIFIER = "com.jpsim.$(PRODUCT_NAME:rfc1034identifier)";
444444
PRODUCT_NAME = "$(TARGET_NAME)";
445445
SDKROOT = macosx;
446-
SWIFT_VERSION = 2.3;
446+
SWIFT_VERSION = 3.0;
447447
};
448448
name = Debug;
449449
};
@@ -464,7 +464,7 @@
464464
PRODUCT_BUNDLE_IDENTIFIER = "com.jpsim.$(PRODUCT_NAME:rfc1034identifier)";
465465
PRODUCT_NAME = "$(TARGET_NAME)";
466466
SDKROOT = macosx;
467-
SWIFT_VERSION = 2.3;
467+
SWIFT_VERSION = 3.0;
468468
};
469469
name = Release;
470470
};
@@ -578,7 +578,7 @@
578578
PRODUCT_NAME = PeerKit;
579579
SKIP_INSTALL = YES;
580580
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
581-
SWIFT_VERSION = 2.3;
581+
SWIFT_VERSION = 3.0;
582582
};
583583
name = Debug;
584584
};
@@ -598,7 +598,7 @@
598598
PRODUCT_BUNDLE_IDENTIFIER = "com.jpsim.$(PRODUCT_NAME:rfc1034identifier)";
599599
PRODUCT_NAME = PeerKit;
600600
SKIP_INSTALL = YES;
601-
SWIFT_VERSION = 2.3;
601+
SWIFT_VERSION = 3.0;
602602
};
603603
name = Release;
604604
};
@@ -626,7 +626,7 @@
626626
PRODUCT_NAME = PeerKit;
627627
SDKROOT = macosx;
628628
SKIP_INSTALL = YES;
629-
SWIFT_VERSION = 2.3;
629+
SWIFT_VERSION = 3.0;
630630
};
631631
name = Debug;
632632
};
@@ -651,7 +651,7 @@
651651
PRODUCT_NAME = PeerKit;
652652
SDKROOT = macosx;
653653
SKIP_INSTALL = YES;
654-
SWIFT_VERSION = 2.3;
654+
SWIFT_VERSION = 3.0;
655655
};
656656
name = Release;
657657
};

‎PeerKit/Advertiser.swift

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class Advertiser: NSObject, MCNearbyServiceAdvertiserDelegate {
2020

2121
private var advertiser: MCNearbyServiceAdvertiser?
2222

23-
func startAdvertising(serviceType serviceType: String, discoveryInfo: [String: String]? = nil) {
23+
func startAdvertising(serviceType: String, discoveryInfo: [String: String]? = nil) {
2424
advertiser = MCNearbyServiceAdvertiser(peer: mcSession.myPeerID, discoveryInfo: discoveryInfo, serviceType: serviceType)
2525
advertiser?.delegate = self
2626
advertiser?.startAdvertisingPeer()
@@ -31,7 +31,13 @@ class Advertiser: NSObject, MCNearbyServiceAdvertiserDelegate {
3131
advertiser?.stopAdvertisingPeer()
3232
}
3333

34-
func advertiser(advertiser: MCNearbyServiceAdvertiser, didReceiveInvitationFromPeer peerID: MCPeerID, withContext context: NSData?, invitationHandler: ((Bool, MCSession?) -> Void)) {
34+
35+
// @available(iOSApplicationExtension 7.0, *)
36+
// public func advertiser(_ advertiser: MCNearbyServiceAdvertiser, didReceiveInvitationFromPeer peerID: MCPeerID, withContext context: Data?, invitationHandler: @escaping (Bool, MCSession?) -> Void) {
37+
// <#code#>
38+
// }
39+
40+
func advertiser(_ advertiser: MCNearbyServiceAdvertiser, didReceiveInvitationFromPeer peerID: MCPeerID, withContext context: Data?, invitationHandler: @escaping (Bool, MCSession?) -> Void) {
3541
let accept = mcSession.myPeerID.hashValue > peerID.hashValue
3642
invitationHandler(accept, mcSession)
3743
if accept {

‎PeerKit/Browser.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ class Browser: NSObject, MCNearbyServiceBrowserDelegate {
3333
mcBrowser?.stopBrowsingForPeers()
3434
}
3535

36-
func browser(browser: MCNearbyServiceBrowser, foundPeer peerID: MCPeerID, withDiscoveryInfo info: [String : String]?) {
37-
browser.invitePeer(peerID, toSession: mcSession, withContext: nil, timeout: 30)
36+
func browser(_ browser: MCNearbyServiceBrowser, foundPeer peerID: MCPeerID, withDiscoveryInfo info: [String : String]?) {
37+
browser.invitePeer(peerID, to: mcSession, withContext: nil, timeout: 30)
3838
}
3939

40-
func browser(browser: MCNearbyServiceBrowser, lostPeer peerID: MCPeerID) {
40+
func browser(_ browser: MCNearbyServiceBrowser, lostPeer peerID: MCPeerID) {
4141
// unused
4242
}
4343
}

‎PeerKit/PeerKit.swift

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ import MultipeerConnectivity
1111

1212
// MARK: Type Aliases
1313

14-
public typealias PeerBlock = ((myPeerID: MCPeerID, peerID: MCPeerID) -> Void)
15-
public typealias EventBlock = ((peerID: MCPeerID, event: String, object: AnyObject?) -> Void)
16-
public typealias ObjectBlock = ((peerID: MCPeerID, object: AnyObject?) -> Void)
17-
public typealias ResourceBlock = ((myPeerID: MCPeerID, resourceName: String, peer: MCPeerID, localURL: NSURL) -> Void)
14+
public typealias PeerBlock = ((_ myPeerID: MCPeerID, _ peerID: MCPeerID) -> Void)
15+
public typealias EventBlock = ((_ peerID: MCPeerID, _ event: String, _ object: AnyObject?) -> Void)
16+
public typealias ObjectBlock = ((_ peerID: MCPeerID, _ object: AnyObject?) -> Void)
17+
public typealias ResourceBlock = ((_ myPeerID: MCPeerID, _ resourceName: String, _ peer: MCPeerID, _ localURL: URL) -> Void)
1818

1919
// MARK: Event Blocks
2020

@@ -30,9 +30,9 @@ public var eventBlocks = [String: ObjectBlock]()
3030

3131
#if os(iOS)
3232
import UIKit
33-
public let myName = UIDevice.currentDevice().name
33+
public let myName = UIDevice.current.name
3434
#else
35-
public let myName = NSHost.currentHost().localizedName ?? ""
35+
public let myName = Host.current().localizedName ?? ""
3636
#endif
3737

3838
public var transceiver = Transceiver(displayName: myName)
@@ -42,8 +42,8 @@ public var session: MCSession?
4242

4343
func didConnecting(myPeerID: MCPeerID, peer: MCPeerID) {
4444
if let onConnecting = onConnecting {
45-
dispatch_async(dispatch_get_main_queue()) {
46-
onConnecting(myPeerID: myPeerID, peerID: peer)
45+
DispatchQueue.main.async {
46+
onConnecting(myPeerID, peer)
4747
}
4848
}
4949
}
@@ -53,39 +53,39 @@ func didConnect(myPeerID: MCPeerID, peer: MCPeerID) {
5353
session = transceiver.session.mcSession
5454
}
5555
if let onConnect = onConnect {
56-
dispatch_async(dispatch_get_main_queue()) {
57-
onConnect(myPeerID: myPeerID, peerID: peer)
56+
DispatchQueue.main.async {
57+
onConnect(myPeerID, peer)
5858
}
5959
}
6060
}
6161

6262
func didDisconnect(myPeerID: MCPeerID, peer: MCPeerID) {
6363
if let onDisconnect = onDisconnect {
64-
dispatch_async(dispatch_get_main_queue()) {
65-
onDisconnect(myPeerID: myPeerID, peerID: peer)
64+
DispatchQueue.main.async {
65+
onDisconnect(myPeerID, peer)
6666
}
6767
}
6868
}
6969

70-
func didReceiveData(data: NSData, fromPeer peer: MCPeerID) {
71-
if let dict = NSKeyedUnarchiver.unarchiveObjectWithData(data) as? [String: AnyObject],
70+
func didReceiveData(_ data: Data, fromPeer peer: MCPeerID) {
71+
if let dict = NSKeyedUnarchiver.unarchiveObject(with: data) as? [String: AnyObject],
7272
let event = dict["event"] as? String,
73-
let object: AnyObject? = dict["object"] {
74-
dispatch_async(dispatch_get_main_queue()) {
73+
let object = dict["object"] {
74+
DispatchQueue.main.async {
7575
if let onEvent = onEvent {
76-
onEvent(peerID: peer, event: event, object: object)
76+
onEvent(peer, event, object)
7777
}
7878
if let eventBlock = eventBlocks[event] {
79-
eventBlock(peerID: peer, object: object)
79+
eventBlock(peer, object)
8080
}
8181
}
8282
}
8383
}
8484

85-
func didFinishReceivingResource(myPeerID: MCPeerID, resourceName: String, fromPeer peer: MCPeerID, atURL localURL: NSURL) {
85+
func didFinishReceivingResource(myPeerID: MCPeerID, resourceName: String, fromPeer peer: MCPeerID, atURL localURL: URL) {
8686
if let onFinishReceivingResource = onFinishReceivingResource {
87-
dispatch_async(dispatch_get_main_queue()) {
88-
onFinishReceivingResource(myPeerID: myPeerID, resourceName: resourceName, peer: peer, localURL: localURL)
87+
DispatchQueue.main.async {
88+
onFinishReceivingResource(myPeerID, resourceName, peer, localURL)
8989
}
9090
}
9191
}
@@ -111,33 +111,33 @@ public func stopTransceiving() {
111111

112112
// MARK: Events
113113

114-
public func sendEvent(event: String, object: AnyObject? = nil, toPeers peers: [MCPeerID]? = session?.connectedPeers) {
115-
guard let peers = peers where !peers.isEmpty else {
114+
public func sendEvent(_ event: String, object: AnyObject? = nil, toPeers peers: [MCPeerID]? = session?.connectedPeers) {
115+
guard let peers = peers, !peers.isEmpty else {
116116
return
117117
}
118118

119-
var rootObject: [String: AnyObject] = ["event": event]
119+
var rootObject: [String: AnyObject] = ["event": event as AnyObject]
120120

121121
if let object: AnyObject = object {
122122
rootObject["object"] = object
123123
}
124124

125-
let data = NSKeyedArchiver.archivedDataWithRootObject(rootObject)
125+
let data = NSKeyedArchiver.archivedData(withRootObject: rootObject)
126126

127127
do {
128-
try session?.sendData(data, toPeers: peers, withMode: .Reliable)
128+
try session?.send(data, toPeers: peers, with: .reliable)
129129
} catch _ {
130130
}
131131
}
132132

133-
public func sendResourceAtURL(resourceURL: NSURL,
133+
public func sendResourceAtURL(_ resourceURL: URL,
134134
withName resourceName: String,
135135
toPeers peers: [MCPeerID]? = session?.connectedPeers,
136-
withCompletionHandler completionHandler: ((NSError?) -> Void)?) -> [NSProgress?]? {
136+
withCompletionHandler completionHandler: ((Error?) -> Void)?) -> [Progress?]? {
137137

138138
if let session = session {
139139
return peers?.map { peerID in
140-
return session.sendResourceAtURL(resourceURL, withName: resourceName, toPeer: peerID, withCompletionHandler: completionHandler)
140+
return session.sendResource(at: resourceURL, withName: resourceName, toPeer: peerID, withCompletionHandler: completionHandler)
141141
}
142142
}
143143
return nil

‎PeerKit/Session.swift

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ public protocol SessionDelegate {
1313
func connecting(myPeerID: MCPeerID, toPeer peer: MCPeerID)
1414
func connected(myPeerID: MCPeerID, toPeer peer: MCPeerID)
1515
func disconnected(myPeerID: MCPeerID, fromPeer peer: MCPeerID)
16-
func receivedData(myPeerID: MCPeerID, data: NSData, fromPeer peer: MCPeerID)
17-
func finishReceivingResource(myPeerID: MCPeerID, resourceName: String, fromPeer peer: MCPeerID, atURL localURL: NSURL)
16+
func receivedData(myPeerID: MCPeerID, data: Data, fromPeer peer: MCPeerID)
17+
func finishReceivingResource(myPeerID: MCPeerID, resourceName: String, fromPeer peer: MCPeerID, atURL localURL: URL)
1818
}
1919

2020
public class Session: NSObject, MCSessionDelegate {
@@ -38,32 +38,32 @@ public class Session: NSObject, MCSessionDelegate {
3838

3939
// MARK: MCSessionDelegate
4040

41-
public func session(session: MCSession, peer peerID: MCPeerID, didChangeState state: MCSessionState) {
41+
public func session(_ session: MCSession, peer peerID: MCPeerID, didChange state: MCSessionState) {
4242
switch state {
43-
case .Connecting:
44-
delegate?.connecting(myPeerID, toPeer: peerID)
45-
case .Connected:
46-
delegate?.connected(myPeerID, toPeer: peerID)
47-
case .NotConnected:
48-
delegate?.disconnected(myPeerID, fromPeer: peerID)
43+
case .connecting:
44+
delegate?.connecting(myPeerID: myPeerID, toPeer: peerID)
45+
case .connected:
46+
delegate?.connected(myPeerID: myPeerID, toPeer: peerID)
47+
case .notConnected:
48+
delegate?.disconnected(myPeerID: myPeerID, fromPeer: peerID)
4949
}
5050
}
5151

52-
public func session(session: MCSession, didReceiveData data: NSData, fromPeer peerID: MCPeerID) {
53-
delegate?.receivedData(myPeerID, data: data, fromPeer: peerID)
52+
public func session(_ session: MCSession, didReceive data: Data, fromPeer peerID: MCPeerID) {
53+
delegate?.receivedData(myPeerID: myPeerID, data: data, fromPeer: peerID)
5454
}
5555

56-
public func session(session: MCSession, didReceiveStream stream: NSInputStream, withName streamName: String, fromPeer peerID: MCPeerID) {
56+
public func session(_ session: MCSession, didReceive stream: InputStream, withName streamName: String, fromPeer peerID: MCPeerID) {
5757
// unused
5858
}
5959

60-
public func session(session: MCSession, didStartReceivingResourceWithName resourceName: String, fromPeer peerID: MCPeerID, withProgress progress: NSProgress) {
60+
public func session(_ session: MCSession, didStartReceivingResourceWithName resourceName: String, fromPeer peerID: MCPeerID, with progress: Progress) {
6161
// unused
6262
}
6363

64-
public func session(session: MCSession, didFinishReceivingResourceWithName resourceName: String, fromPeer peerID: MCPeerID, atURL localURL: NSURL, withError error: NSError?) {
64+
public func session(_ session: MCSession, didFinishReceivingResourceWithName resourceName: String, fromPeer peerID: MCPeerID, at localURL: URL, withError error: Error?) {
6565
if (error == nil) {
66-
delegate?.finishReceivingResource(myPeerID, resourceName: resourceName, fromPeer: peerID, atURL: localURL)
66+
delegate?.finishReceivingResource(myPeerID: myPeerID, resourceName: resourceName, fromPeer: peerID, atURL: localURL)
6767
}
6868
}
6969
}

‎PeerKit/Transceiver.swift

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ public class Transceiver: SessionDelegate {
2727
session.delegate = self
2828
}
2929

30-
func startTransceiving(serviceType serviceType: String, discoveryInfo: [String: String]? = nil) {
30+
func startTransceiving(serviceType: String, discoveryInfo: [String: String]? = nil) {
3131
advertiser.startAdvertising(serviceType: serviceType, discoveryInfo: discoveryInfo)
32-
browser.startBrowsing(serviceType)
32+
browser.startBrowsing(serviceType: serviceType)
3333
transceiverMode = .Both
3434
}
3535

@@ -40,33 +40,33 @@ public class Transceiver: SessionDelegate {
4040
session.disconnect()
4141
}
4242

43-
func startAdvertising(serviceType serviceType: String, discoveryInfo: [String: String]? = nil) {
43+
func startAdvertising(serviceType: String, discoveryInfo: [String: String]? = nil) {
4444
advertiser.startAdvertising(serviceType: serviceType, discoveryInfo: discoveryInfo)
4545
transceiverMode = .Advertise
4646
}
4747

48-
func startBrowsing(serviceType serviceType: String) {
49-
browser.startBrowsing(serviceType)
48+
func startBrowsing(serviceType: String) {
49+
browser.startBrowsing(serviceType: serviceType)
5050
transceiverMode = .Browse
5151
}
5252

5353
public func connecting(myPeerID: MCPeerID, toPeer peer: MCPeerID) {
54-
didConnecting(myPeerID, peer: peer)
54+
didConnecting(myPeerID: myPeerID, peer: peer)
5555
}
5656

5757
public func connected(myPeerID: MCPeerID, toPeer peer: MCPeerID) {
58-
didConnect(myPeerID, peer: peer)
58+
didConnect(myPeerID: myPeerID, peer: peer)
5959
}
6060

6161
public func disconnected(myPeerID: MCPeerID, fromPeer peer: MCPeerID) {
62-
didDisconnect(myPeerID, peer: peer)
62+
didDisconnect(myPeerID: myPeerID, peer: peer)
6363
}
6464

65-
public func receivedData(myPeerID: MCPeerID, data: NSData, fromPeer peer: MCPeerID) {
65+
public func receivedData(myPeerID: MCPeerID, data: Data, fromPeer peer: MCPeerID) {
6666
didReceiveData(data, fromPeer: peer)
6767
}
6868

69-
public func finishReceivingResource(myPeerID: MCPeerID, resourceName: String, fromPeer peer: MCPeerID, atURL localURL: NSURL) {
70-
didFinishReceivingResource(myPeerID, resourceName: resourceName, fromPeer: peer, atURL: localURL)
69+
public func finishReceivingResource(myPeerID: MCPeerID, resourceName: String, fromPeer peer: MCPeerID, atURL localURL: URL) {
70+
didFinishReceivingResource(myPeerID: myPeerID, resourceName: resourceName, fromPeer: peer, atURL: localURL)
7171
}
7272
}

0 commit comments

Comments
 (0)