From 5d81232874ae5751d6176b8360bb7b94209727b3 Mon Sep 17 00:00:00 2001 From: Luka Bratos Date: Fri, 17 Nov 2017 14:41:10 +0000 Subject: [PATCH 1/3] Update for Swift 4.0 Using `characters` is not needed anymore in Swift 4.0 --- Sources/CryptoSwiftHMACModule.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/CryptoSwiftHMACModule.swift b/Sources/CryptoSwiftHMACModule.swift index 47a2cfbb..a7293640 100644 --- a/Sources/CryptoSwiftHMACModule.swift +++ b/Sources/CryptoSwiftHMACModule.swift @@ -229,7 +229,7 @@ internal extension CSArrayType where Iterator.Element == UInt8 { internal func toHexString() -> String { return self.lazy.reduce("") { var s = String($1, radix: 16) - if s.characters.count == 1 { + if s.count == 1 { s = "0" + s } return $0 + s From af5cd8a31811918acbc6fa7aadd998a4c78e1cf0 Mon Sep 17 00:00:00 2001 From: Luka Bratos Date: Fri, 17 Nov 2017 14:43:08 +0000 Subject: [PATCH 2/3] Update deprecated method Use requestFor(socketID: String, channelName: String) -> URLRequest? instead --- Sources/PusherConnection.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/PusherConnection.swift b/Sources/PusherConnection.swift index 86f581cb..b9b14174 100644 --- a/Sources/PusherConnection.swift +++ b/Sources/PusherConnection.swift @@ -581,7 +581,7 @@ public typealias PusherEventJSON = [String: AnyObject] sendAuthorisationRequest(request: request, channel: channel) return true case .authRequestBuilder(authRequestBuilder: let builder): - if let request = builder.requestFor?(socketID: socketId, channel: channel) { + if let request = builder.requestFor?(socketID: socketId, channelName: channel.name) { sendAuthorisationRequest(request: request as URLRequest, channel: channel) return true From 051b3a00d7408df92e0bb82d75de6ab373569498 Mon Sep 17 00:00:00 2001 From: Luka Bratos Date: Fri, 17 Nov 2017 14:58:08 +0000 Subject: [PATCH 3/3] Revert "Update deprecated method" This reverts commit af5cd8a31811918acbc6fa7aadd998a4c78e1cf0. --- Sources/PusherConnection.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/PusherConnection.swift b/Sources/PusherConnection.swift index b9b14174..86f581cb 100644 --- a/Sources/PusherConnection.swift +++ b/Sources/PusherConnection.swift @@ -581,7 +581,7 @@ public typealias PusherEventJSON = [String: AnyObject] sendAuthorisationRequest(request: request, channel: channel) return true case .authRequestBuilder(authRequestBuilder: let builder): - if let request = builder.requestFor?(socketID: socketId, channelName: channel.name) { + if let request = builder.requestFor?(socketID: socketId, channel: channel) { sendAuthorisationRequest(request: request as URLRequest, channel: channel) return true