Skip to content

Commit fb02d15

Browse files
nuclearacenuclearace
committed
Go back to Starscream 2.1.1
Add objc Fix some warnings
1 parent 883b0f3 commit fb02d15

File tree

8 files changed

+73
-20
lines changed

8 files changed

+73
-20
lines changed

‎.travis.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
language: objective-c
22
xcode_project: Socket.IO-Client-Swift.xcodeproj # path to your xcodeproj folder
3-
xcode_scheme: SocketIO-iOS
3+
xcode_scheme: SocketIO-Mac
44
osx_image: xcode9
55
branches:
66
only:
77
- master
88
- development
9-
- swift4.0
109
before_install:
1110
- brew update
1211
- brew outdated xctool || brew upgrade xctool
12+
- brew outdated carthage || brew upgrade carthage
1313
script:
14+
- carthage update
1415
- xcodebuild -project Socket.IO-Client-Swift.xcodeproj -scheme SocketIO-Mac build test -quiet
1516
# - xcodebuild -project Socket.IO-Client-Swift.xcodeproj -scheme SocketIO-Mac build-for-testing -quiet
1617
# - xctool -project Socket.IO-Client-Swift.xcodeproj -scheme SocketIO-Mac run-tests --parallelize

‎Package.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ let package = Package(
88
.library(name: "SocketIO", targets: ["SocketIO"])
99
],
1010
dependencies: [
11-
.package(url: "https://github.com/nuclearace/Starscream", .upToNextMajor(from: "9.0.0")),
11+
.package(url: "https://github.com/daltoniam/Starscream", .upToNextMajor(from: "2.1.1")),
1212
],
1313
targets: [
14-
.target(name: "SocketIO", dependencies: ["StarscreamSocketIO"], exclude: ["Sources/Starscream"])
14+
.target(name: "SocketIO", dependencies: ["Starscream"])
1515
]
1616
)

‎Socket.IO-Client-Swift.xcodeproj/project.pbxproj‎

Lines changed: 58 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,19 @@
3030
7472C65F1BCAC46E003CA70D /* SocketSideEffectTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7472C65E1BCAC46E003CA70D /* SocketSideEffectTest.swift */; };
3131
7472C6601BCAC46E003CA70D /* SocketSideEffectTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7472C65E1BCAC46E003CA70D /* SocketSideEffectTest.swift */; };
3232
747BC59F1D5F9BA200CA5FA4 /* SocketIOClientConfigurationTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 747BC59E1D5F9BA200CA5FA4 /* SocketIOClientConfigurationTest.swift */; };
33+
749FA1961F811190002FBB30 /* SocketAckManagerTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74321DC91C2D939A00CF6F43 /* SocketAckManagerTest.swift */; };
34+
749FA1971F811190002FBB30 /* SocketIOClientConfigurationTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 747BC59E1D5F9BA200CA5FA4 /* SocketIOClientConfigurationTest.swift */; };
35+
749FA1981F811190002FBB30 /* SocketObjectiveCTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 742D150B1CA5794B00BD987D /* SocketObjectiveCTest.m */; };
36+
749FA1991F811190002FBB30 /* SocketParserTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74321DCA1C2D939A00CF6F43 /* SocketParserTest.swift */; };
37+
749FA1A61F81152B002FBB30 /* Starscream.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9432E00B1F77F883006AF628 /* Starscream.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
38+
74D0F58E1F804FED0037C4DC /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 74D0F58D1F804FED0037C4DC /* libz.tbd */; };
39+
74D0F5961F8053950037C4DC /* Starscream.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9432E00B1F77F883006AF628 /* Starscream.framework */; };
3340
74DA21741F09440F009C19EE /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 74DA21731F09440F009C19EE /* libz.tbd */; };
3441
74DA217C1F09457B009C19EE /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 74DA21731F09440F009C19EE /* libz.tbd */; };
3542
74F124F01BC574CF002966F4 /* SocketBasicPacketTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74F124EF1BC574CF002966F4 /* SocketBasicPacketTest.swift */; };
3643
74F124F11BC574CF002966F4 /* SocketBasicPacketTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74F124EF1BC574CF002966F4 /* SocketBasicPacketTest.swift */; };
3744
9432E0071F77F7CA006AF628 /* SSLSecurity.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9432E0061F77F7CA006AF628 /* SSLSecurity.swift */; };
3845
9432E00A1F77F87D006AF628 /* Starscream.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9432E0091F77F87D006AF628 /* Starscream.framework */; };
39-
9432E00C1F77F883006AF628 /* Starscream.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9432E00B1F77F883006AF628 /* Starscream.framework */; };
4046
9432E00E1F77F889006AF628 /* Starscream.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9432E00D1F77F889006AF628 /* Starscream.framework */; };
4147
9432E00F1F77F8C4006AF628 /* SSLSecurity.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9432E0061F77F7CA006AF628 /* SSLSecurity.swift */; };
4248
9432E0101F77F8C4006AF628 /* SSLSecurity.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9432E0061F77F7CA006AF628 /* SSLSecurity.swift */; };
@@ -132,6 +138,19 @@
132138
};
133139
/* End PBXContainerItemProxy section */
134140

141+
/* Begin PBXCopyFilesBuildPhase section */
142+
749FA1A51F811521002FBB30 /* CopyFiles */ = {
143+
isa = PBXCopyFilesBuildPhase;
144+
buildActionMask = 2147483647;
145+
dstPath = "";
146+
dstSubfolderSpec = 10;
147+
files = (
148+
749FA1A61F81152B002FBB30 /* Starscream.framework in CopyFiles */,
149+
);
150+
runOnlyForDeploymentPostprocessing = 0;
151+
};
152+
/* End PBXCopyFilesBuildPhase section */
153+
135154
/* Begin PBXFileReference section */
136155
572EF2191B51F16C00EEBB58 /* SocketIO.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SocketIO.framework; sourceTree = BUILT_PRODUCTS_DIR; };
137156
572EF21D1B51F16C00EEBB58 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -154,6 +173,9 @@
154173
7472C65B1BCAB53E003CA70D /* SocketNamespacePacketTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SocketNamespacePacketTest.swift; sourceTree = "<group>"; };
155174
7472C65E1BCAC46E003CA70D /* SocketSideEffectTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SocketSideEffectTest.swift; sourceTree = "<group>"; };
156175
747BC59E1D5F9BA200CA5FA4 /* SocketIOClientConfigurationTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SocketIOClientConfigurationTest.swift; sourceTree = "<group>"; };
176+
749FA19F1F8112E7002FBB30 /* Starscream.framework.dSYM */ = {isa = PBXFileReference; lastKnownFileType = wrapper.dsym; name = Starscream.framework.dSYM; path = Carthage/Build/Mac/Starscream.framework.dSYM; sourceTree = "<group>"; };
177+
749FA1A11F811408002FBB30 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
178+
74D0F58D1F804FED0037C4DC /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.0.sdk/usr/lib/libz.tbd; sourceTree = DEVELOPER_DIR; };
157179
74DA21731F09440F009C19EE /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
158180
74DA217D1F0945E9009C19EE /* libcommonCrypto.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libcommonCrypto.tbd; path = usr/lib/system/libcommonCrypto.tbd; sourceTree = SDKROOT; };
159181
74F124EF1BC574CF002966F4 /* SocketBasicPacketTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SocketBasicPacketTest.swift; sourceTree = "<group>"; };
@@ -190,6 +212,7 @@
190212
isa = PBXFrameworksBuildPhase;
191213
buildActionMask = 2147483647;
192214
files = (
215+
74D0F58E1F804FED0037C4DC /* libz.tbd in Frameworks */,
193216
6CA08A961D615C040061FD2A /* Security.framework in Frameworks */,
194217
9432E00A1F77F87D006AF628 /* Starscream.framework in Frameworks */,
195218
);
@@ -209,7 +232,7 @@
209232
files = (
210233
74DA21741F09440F009C19EE /* libz.tbd in Frameworks */,
211234
6CA08A981D615C0B0061FD2A /* Security.framework in Frameworks */,
212-
9432E00C1F77F883006AF628 /* Starscream.framework in Frameworks */,
235+
74D0F5961F8053950037C4DC /* Starscream.framework in Frameworks */,
213236
);
214237
runOnlyForDeploymentPostprocessing = 0;
215238
};
@@ -340,6 +363,9 @@
340363
6CA08A9B1D615C190061FD2A /* Frameworks */ = {
341364
isa = PBXGroup;
342365
children = (
366+
749FA1A11F811408002FBB30 /* Foundation.framework */,
367+
749FA19F1F8112E7002FBB30 /* Starscream.framework.dSYM */,
368+
74D0F58D1F804FED0037C4DC /* libz.tbd */,
343369
9432E0091F77F87D006AF628 /* Starscream.framework */,
344370
9432E00B1F77F883006AF628 /* Starscream.framework */,
345371
9432E00D1F77F889006AF628 /* Starscream.framework */,
@@ -494,6 +520,7 @@
494520
572EF2201B51F16C00EEBB58 /* Sources */,
495521
572EF2211B51F16C00EEBB58 /* Frameworks */,
496522
572EF2221B51F16C00EEBB58 /* Resources */,
523+
749FA19A1F8111A6002FBB30 /* ShellScript */,
497524
);
498525
buildRules = (
499526
);
@@ -530,6 +557,7 @@
530557
572EF23E1B51F18A00EEBB58 /* Sources */,
531558
572EF23F1B51F18A00EEBB58 /* Frameworks */,
532559
572EF2401B51F18A00EEBB58 /* Resources */,
560+
749FA1A51F811521002FBB30 /* CopyFiles */,
533561
);
534562
buildRules = (
535563
);
@@ -670,6 +698,24 @@
670698
};
671699
/* End PBXResourcesBuildPhase section */
672700

701+
/* Begin PBXShellScriptBuildPhase section */
702+
749FA19A1F8111A6002FBB30 /* ShellScript */ = {
703+
isa = PBXShellScriptBuildPhase;
704+
buildActionMask = 2147483647;
705+
files = (
706+
);
707+
inputPaths = (
708+
"$(SRCROOT)/Carthage/Build/iOS/Starscream.framework",
709+
);
710+
outputPaths = (
711+
"$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/Starscream.framework",
712+
);
713+
runOnlyForDeploymentPostprocessing = 0;
714+
shellPath = /bin/sh;
715+
shellScript = "/usr/local/bin/carthage copy-frameworks";
716+
};
717+
/* End PBXShellScriptBuildPhase section */
718+
673719
/* Begin PBXSourcesBuildPhase section */
674720
572EF2141B51F16C00EEBB58 /* Sources */ = {
675721
isa = PBXSourcesBuildPhase;
@@ -705,6 +751,10 @@
705751
isa = PBXSourcesBuildPhase;
706752
buildActionMask = 2147483647;
707753
files = (
754+
749FA1961F811190002FBB30 /* SocketAckManagerTest.swift in Sources */,
755+
749FA1971F811190002FBB30 /* SocketIOClientConfigurationTest.swift in Sources */,
756+
749FA1981F811190002FBB30 /* SocketObjectiveCTest.m in Sources */,
757+
749FA1991F811190002FBB30 /* SocketParserTest.swift in Sources */,
708758
7472C65F1BCAC46E003CA70D /* SocketSideEffectTest.swift in Sources */,
709759
741F39EE1BD025D80026C9CC /* SocketEngineTest.swift in Sources */,
710760
74F124F01BC574CF002966F4 /* SocketBasicPacketTest.swift in Sources */,
@@ -1180,7 +1230,7 @@
11801230
SKIP_INSTALL = YES;
11811231
SWIFT_INCLUDE_PATHS = "";
11821232
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1183-
SWIFT_SWIFT3_OBJC_INFERENCE = On;
1233+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
11841234
SWIFT_VERSION = 4.0;
11851235
VERSIONING_SYSTEM = "apple-generic";
11861236
VERSION_INFO_PREFIX = "";
@@ -1242,7 +1292,7 @@
12421292
SDKROOT = macosx;
12431293
SKIP_INSTALL = YES;
12441294
SWIFT_INCLUDE_PATHS = "";
1245-
SWIFT_SWIFT3_OBJC_INFERENCE = On;
1295+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
12461296
SWIFT_VERSION = 4.0;
12471297
VERSIONING_SYSTEM = "apple-generic";
12481298
VERSION_INFO_PREFIX = "";
@@ -1275,6 +1325,7 @@
12751325
FRAMEWORK_SEARCH_PATHS = (
12761326
"$(DEVELOPER_FRAMEWORKS_DIR)",
12771327
"$(inherited)",
1328+
"$(PROJECT_DIR)/Carthage/Build/Mac",
12781329
);
12791330
GCC_C_LANGUAGE_STANDARD = gnu99;
12801331
GCC_DYNAMIC_NO_PIC = NO;
@@ -1304,7 +1355,7 @@
13041355
PRODUCT_NAME = "$(TARGET_NAME)";
13051356
SDKROOT = macosx;
13061357
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1307-
SWIFT_SWIFT3_OBJC_INFERENCE = On;
1358+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
13081359
SWIFT_VERSION = 4.0;
13091360
};
13101361
name = Debug;
@@ -1336,6 +1387,7 @@
13361387
FRAMEWORK_SEARCH_PATHS = (
13371388
"$(DEVELOPER_FRAMEWORKS_DIR)",
13381389
"$(inherited)",
1390+
"$(PROJECT_DIR)/Carthage/Build/Mac",
13391391
);
13401392
GCC_C_LANGUAGE_STANDARD = gnu99;
13411393
GCC_NO_COMMON_BLOCKS = YES;
@@ -1356,7 +1408,7 @@
13561408
PRODUCT_BUNDLE_IDENTIFIER = "io.socket.$(PRODUCT_NAME:rfc1034identifier)";
13571409
PRODUCT_NAME = "$(TARGET_NAME)";
13581410
SDKROOT = macosx;
1359-
SWIFT_SWIFT3_OBJC_INFERENCE = On;
1411+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
13601412
SWIFT_VERSION = 4.0;
13611413
};
13621414
name = Release;

‎SocketIO-MacTests/SocketObjectiveCTest.m‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
@import Foundation;
1212
@import XCTest;
1313
@import SocketIO;
14-
@import StarscreamSocketIO;
1514

1615
@interface SocketObjectiveCTest : XCTestCase
1716

‎SocketIO-MacTests/SocketSideEffectTest.swift‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
import XCTest
1010
@testable import SocketIO
11-
@testable import StarscreamSocketIO
1211

1312
class SocketSideEffectTest: XCTestCase {
1413
func testInitialCurrentAck() {

‎Source/SocketIO/Engine/SocketEngine.swift‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -310,22 +310,22 @@ public final class SocketEngine : NSObject, URLSessionDelegate, SocketEnginePoll
310310

311311
private func createWebSocketAndConnect() {
312312
ws?.delegate = nil // TODO this seems a bit defensive, is this really needed?
313-
var request = URLRequest(url: urlWebSocketWithSid)
313+
ws = WebSocket(url: urlWebSocketWithSid)
314314

315315
if cookies != nil {
316316
let headers = HTTPCookie.requestHeaderFields(with: cookies!)
317317
for (key, value) in headers {
318-
request.setValue(value, forHTTPHeaderField: key)
318+
ws?.headers[key] = value
319319
}
320320
}
321321

322322
if extraHeaders != nil {
323323
for (headerName, value) in extraHeaders! {
324-
request.setValue(value, forHTTPHeaderField: headerName)
324+
ws?.headers[headerName] = value
325325
}
326326
}
327327

328-
ws = WebSocket(request: request)
328+
329329
ws?.callbackQueue = engineQueue
330330
ws?.enableCompression = compress
331331
ws?.delegate = self
@@ -605,7 +605,7 @@ public final class SocketEngine : NSObject, URLSessionDelegate, SocketEnginePoll
605605
// MARK: Starscream delegate conformance
606606

607607
/// Delegate method for connection.
608-
public func websocketDidConnect(socket: WebSocketClient) {
608+
public func websocketDidConnect(socket: WebSocket) {
609609
if !forceWebsockets {
610610
probing = true
611611
probeWebSocket()
@@ -617,7 +617,7 @@ public final class SocketEngine : NSObject, URLSessionDelegate, SocketEnginePoll
617617
}
618618

619619
/// Delegate method for disconnection.
620-
public func websocketDidDisconnect(socket: WebSocketClient, error: Error?) {
620+
public func websocketDidDisconnect(socket: WebSocket, error: NSError?) {
621621
probing = false
622622

623623
if closed {

‎Source/SocketIO/Engine/SocketEngineWebsocket.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,12 @@ extension SocketEngineWebsocket {
6868
// MARK: Starscream delegate methods
6969

7070
/// Delegate method for when a message is received.
71-
public func websocketDidReceiveMessage(socket: WebSocketClient, text: String) {
71+
public func websocketDidReceiveMessage(socket: WebSocket, text: String) {
7272
parseEngineMessage(text)
7373
}
7474

7575
/// Delegate method for when binary is received.
76-
public func websocketDidReceiveData(socket: WebSocketClient, data: Data) {
76+
public func websocketDidReceiveData(socket: WebSocket, data: Data) {
7777
parseEngineData(data)
7878
}
7979
}

‎Source/SocketIO/Util/SSLSecurity.swift‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
// Created by Lukas Schmidt on 24.09.17.
66
//
77

8+
import Foundation
89
import Starscream
910

1011
public class SSLSecurity: NSObject {
@@ -14,6 +15,7 @@ public class SSLSecurity: NSObject {
1415
self.security = security
1516
}
1617

18+
@objc
1719
public convenience init(usePublicKeys: Bool = true) {
1820
let security = Starscream.SSLSecurity(usePublicKeys: usePublicKeys)
1921
self.init(security: security)

0 commit comments

Comments
 (0)