Skip to content

Commit 3ba3354

Browse files
committed
Merge branch 'development'
* development: work on fixing builds Update starscream Make Starscream a dependency Update starscream for new dep; add spm build Use ibm commoncrypto Tweak some tests Remove manual install instructions
2 parents 967c5e4 + 98ac2a8 commit 3ba3354

17 files changed

+171
-1615
lines changed

.gitmodules

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[submodule "Source/Starscream"]
2+
path = Source/Starscream
3+
url = https://github.com/nuclearace/Starscream
4+
branch = socket.io

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,5 @@ before_install:
1212
script:
1313
- xcodebuild -project Socket.IO-Client-Swift.xcodeproj -scheme SocketIO-Mac build-for-testing -quiet
1414
- xctool -project Socket.IO-Client-Swift.xcodeproj -scheme SocketIO-Mac run-tests --parallelize
15+
- swift build
1516
#script: xcodebuild -project Socket.IO-Client-Swift.xcodeproj -scheme SocketIO-Mac build test

Package.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import PackageDescription
33
let package = Package(
44
name: "SocketIO",
55
dependencies: [
6-
.Package(url: "https://github.com/daltoniam/zlib-spm.git", majorVersion: 1),
7-
.Package(url: "https://github.com/daltoniam/common-crypto-spm.git", majorVersion: 1)
8-
]
6+
.Package(url: "https://github.com/nuclearace/Starscream", majorVersion: 8),
7+
],
8+
exclude: ["Source/Starscream"]
99
)

Socket.IO-Client-Swift.podspec

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Pod::Spec.new do |s|
22
s.name = "Socket.IO-Client-Swift"
33
s.module_name = "SocketIO"
4-
s.version = "10.2.0"
4+
s.version = "11.0.0"
55
s.summary = "Socket.IO-client for iOS and OS X"
66
s.description = <<-DESC
77
Socket.IO-client for iOS and OS X.
@@ -14,14 +14,12 @@ Pod::Spec.new do |s|
1414
s.ios.deployment_target = '8.0'
1515
s.osx.deployment_target = '10.10'
1616
s.tvos.deployment_target = '9.0'
17-
s.source = { :git => "https://github.com/socketio/socket.io-client-swift.git", :tag => 'v10.2.0' }
18-
s.source_files = "Source/**/*.swift"
19-
s.libraries = 'z'
20-
s.preserve_paths = 'zlib/*'
2117
s.requires_arc = true
22-
s.pod_target_xcconfig = {
23-
'SWIFT_VERSION' => '3.1',
24-
'SWIFT_INCLUDE_PATHS' => '$(PODS_ROOT)/Socket.IO-Client-Swift/zlib'
18+
s.source = {
19+
:git => "https://github.com/socketio/socket.io-client-swift.git",
20+
:tag => 'v11.0.0',
21+
:submodules => true
2522
}
26-
# s.dependency 'Starscream', '~> 0.9' # currently this repo includes Starscream swift files
23+
s.source_files = "Source/*.swift"
24+
s.dependency "StarscreamSocketIO", "~> 8.0.1"
2725
end

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

Lines changed: 144 additions & 47 deletions
Large diffs are not rendered by default.

SocketIO-MacTests/SocketSideEffectTest.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -238,23 +238,23 @@ class SocketSideEffectTest: XCTestCase {
238238

239239
socket.setTestStatus(.notConnected)
240240

241+
socket.on(clientEvent: .connect) {data, ack in
242+
expect.fulfill()
243+
}
244+
241245
socket.connect(timeoutAfter: 0.5, withHandler: {
242246
XCTFail("Should not call timeout handler if status is connected")
243247
})
244248

245249
DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + 0.1) {
246250
// Fake connecting
247-
self.socket.setTestStatus(.connected)
248-
}
249-
250-
DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + 0.7) {
251-
expect.fulfill()
251+
self.socket.parseEngineMessage("0/")
252252
}
253253

254254
waitForExpectations(timeout: 2)
255255
}
256256

257-
func testConnectIsCalledWithNamepsace() {
257+
func testConnectIsCalledWithNamespace() {
258258
let expect = expectation(description: "The client should not call the timeout function")
259259
let nspString = "/swift"
260260

Source/Compression.swift

Lines changed: 0 additions & 174 deletions
This file was deleted.

0 commit comments

Comments
 (0)