From 332a25f2418b0c33f196bac6393aba6ddfcfd884 Mon Sep 17 00:00:00 2001 From: Erik Little Date: Fri, 25 Aug 2023 10:40:32 -0400 Subject: [PATCH] update to newer starscream --- Cartfile | 2 +- Cartfile.resolved | 2 +- Package.resolved | 4 ++-- Package.swift | 4 ++-- Socket.IO-Client-Swift.podspec | 4 ++-- Source/SocketIO/Engine/SocketEngine.swift | 10 ++++++---- 6 files changed, 14 insertions(+), 12 deletions(-) diff --git a/Cartfile b/Cartfile index 63c8010..6d5a037 100644 --- a/Cartfile +++ b/Cartfile @@ -1 +1 @@ -github "NachoSoto/Starscream" "xros" +github "daltoniam/Starscream" ~> 4.0.6 \ No newline at end of file diff --git a/Cartfile.resolved b/Cartfile.resolved index bc8c04c..15998bb 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1 +1 @@ -github "NachoSoto/Starscream" "4a776fae4200ce2087ad1bbb45c2bc59e1231d8d" +github "daltoniam/Starscream" "4.0.6" diff --git a/Package.resolved b/Package.resolved index a9c6ce6..de0432e 100644 --- a/Package.resolved +++ b/Package.resolved @@ -6,8 +6,8 @@ "repositoryURL": "https://github.com/daltoniam/Starscream", "state": { "branch": null, - "revision": "df8d82047f6654d8e4b655d1b1525c64e1059d21", - "version": "4.0.4" + "revision": "ac6c0fc9da221873e01bd1a0d4818498a71eef33", + "version": "4.0.6" } } ] diff --git a/Package.swift b/Package.swift index a350a90..bf23db2 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.3 +// swift-tools-version:5.4 import PackageDescription @@ -8,7 +8,7 @@ let package = Package( .library(name: "SocketIO", targets: ["SocketIO"]) ], dependencies: [ - .package(url: "https://github.com/daltoniam/Starscream", .exactItem("4.0.4")), + .package(url: "https://github.com/daltoniam/Starscream", .exactItem("4.0.6")), ], targets: [ .target(name: "SocketIO", dependencies: ["Starscream"]), diff --git a/Socket.IO-Client-Swift.podspec b/Socket.IO-Client-Swift.podspec index b4e73a6..b47d166 100644 --- a/Socket.IO-Client-Swift.podspec +++ b/Socket.IO-Client-Swift.podspec @@ -24,8 +24,8 @@ Pod::Spec.new do |s| s.swift_version = "5" s.pod_target_xcconfig = { - 'SWIFT_VERSION' => '5.0' + 'SWIFT_VERSION' => '5.4' } s.source_files = "Source/SocketIO/**/*.swift", "Source/SocketIO/*.swift" - s.dependency "Starscream", "~> 4.0" + s.dependency "Starscream", "~> 4.0.6" end diff --git a/Source/SocketIO/Engine/SocketEngine.swift b/Source/SocketIO/Engine/SocketEngine.swift index 3a51629..f95b828 100644 --- a/Source/SocketIO/Engine/SocketEngine.swift +++ b/Source/SocketIO/Engine/SocketEngine.swift @@ -28,8 +28,10 @@ import Starscream /// The class that handles the engine.io protocol and transports. /// See `SocketEnginePollable` and `SocketEngineWebsocket` for transport specific methods. -open class SocketEngine: - NSObject, WebSocketDelegate, URLSessionDelegate, SocketEnginePollable, SocketEngineWebsocket, ConfigSettable { +open class SocketEngine: NSObject, WebSocketDelegate, URLSessionDelegate, + SocketEnginePollable, SocketEngineWebsocket, ConfigSettable { + + // MARK: Properties private static let logType = "SocketEngine" @@ -747,11 +749,11 @@ extension SocketEngine { /// - Parameters: /// - event: WS Event /// - _: - public func didReceive(event: WebSocketEvent, client _: WebSocket) { + public func didReceive(event: Starscream.WebSocketEvent, client: Starscream.WebSocketClient) { switch event { case let .connected(headers): wsConnected = true - client?.engineDidWebsocketUpgrade(headers: headers) + self.client?.engineDidWebsocketUpgrade(headers: headers) websocketDidConnect() case .cancelled: wsConnected = false