Skip to content

Commit 332a25f

Browse files
committed
update to newer starscream
1 parent 12b08a9 commit 332a25f

File tree

6 files changed

+14
-12
lines changed

6 files changed

+14
-12
lines changed

Cartfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "NachoSoto/Starscream" "xros"
1+
github "daltoniam/Starscream" ~> 4.0.6

Cartfile.resolved

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "NachoSoto/Starscream" "4a776fae4200ce2087ad1bbb45c2bc59e1231d8d"
1+
github "daltoniam/Starscream" "4.0.6"

Package.resolved

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"repositoryURL": "https://github.com/daltoniam/Starscream",
77
"state": {
88
"branch": null,
9-
"revision": "df8d82047f6654d8e4b655d1b1525c64e1059d21",
10-
"version": "4.0.4"
9+
"revision": "ac6c0fc9da221873e01bd1a0d4818498a71eef33",
10+
"version": "4.0.6"
1111
}
1212
}
1313
]

Package.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:5.3
1+
// swift-tools-version:5.4
22

33
import PackageDescription
44

@@ -8,7 +8,7 @@ let package = Package(
88
.library(name: "SocketIO", targets: ["SocketIO"])
99
],
1010
dependencies: [
11-
.package(url: "https://github.com/daltoniam/Starscream", .exactItem("4.0.4")),
11+
.package(url: "https://github.com/daltoniam/Starscream", .exactItem("4.0.6")),
1212
],
1313
targets: [
1414
.target(name: "SocketIO", dependencies: ["Starscream"]),

Socket.IO-Client-Swift.podspec

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ Pod::Spec.new do |s|
2424

2525
s.swift_version = "5"
2626
s.pod_target_xcconfig = {
27-
'SWIFT_VERSION' => '5.0'
27+
'SWIFT_VERSION' => '5.4'
2828
}
2929
s.source_files = "Source/SocketIO/**/*.swift", "Source/SocketIO/*.swift"
30-
s.dependency "Starscream", "~> 4.0"
30+
s.dependency "Starscream", "~> 4.0.6"
3131
end

Source/SocketIO/Engine/SocketEngine.swift

+6-4
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,10 @@ import Starscream
2828

2929
/// The class that handles the engine.io protocol and transports.
3030
/// See `SocketEnginePollable` and `SocketEngineWebsocket` for transport specific methods.
31-
open class SocketEngine:
32-
NSObject, WebSocketDelegate, URLSessionDelegate, SocketEnginePollable, SocketEngineWebsocket, ConfigSettable {
31+
open class SocketEngine: NSObject, WebSocketDelegate, URLSessionDelegate,
32+
SocketEnginePollable, SocketEngineWebsocket, ConfigSettable {
33+
34+
3335
// MARK: Properties
3436

3537
private static let logType = "SocketEngine"
@@ -747,11 +749,11 @@ extension SocketEngine {
747749
/// - Parameters:
748750
/// - event: WS Event
749751
/// - _:
750-
public func didReceive(event: WebSocketEvent, client _: WebSocket) {
752+
public func didReceive(event: Starscream.WebSocketEvent, client: Starscream.WebSocketClient) {
751753
switch event {
752754
case let .connected(headers):
753755
wsConnected = true
754-
client?.engineDidWebsocketUpgrade(headers: headers)
756+
self.client?.engineDidWebsocketUpgrade(headers: headers)
755757
websocketDidConnect()
756758
case .cancelled:
757759
wsConnected = false

0 commit comments

Comments
 (0)