Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
nuclearace committed Jul 24, 2017
2 parents 967c5e4 + 98ac2a8 commit 3ba3354
Show file tree
Hide file tree
Showing 17 changed files with 171 additions and 1,615 deletions.
4 changes: 4 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[submodule "Source/Starscream"]
path = Source/Starscream
url = https://github.com/nuclearace/Starscream
branch = socket.io
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@ before_install:
script:
- xcodebuild -project Socket.IO-Client-Swift.xcodeproj -scheme SocketIO-Mac build-for-testing -quiet
- xctool -project Socket.IO-Client-Swift.xcodeproj -scheme SocketIO-Mac run-tests --parallelize
- swift build
#script: xcodebuild -project Socket.IO-Client-Swift.xcodeproj -scheme SocketIO-Mac build test
6 changes: 3 additions & 3 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import PackageDescription
let package = Package(
name: "SocketIO",
dependencies: [
.Package(url: "https://github.com/daltoniam/zlib-spm.git", majorVersion: 1),
.Package(url: "https://github.com/daltoniam/common-crypto-spm.git", majorVersion: 1)
]
.Package(url: "https://github.com/nuclearace/Starscream", majorVersion: 8),
],
exclude: ["Source/Starscream"]
)
16 changes: 7 additions & 9 deletions Socket.IO-Client-Swift.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|
s.name = "Socket.IO-Client-Swift"
s.module_name = "SocketIO"
s.version = "10.2.0"
s.version = "11.0.0"
s.summary = "Socket.IO-client for iOS and OS X"
s.description = <<-DESC
Socket.IO-client for iOS and OS X.
Expand All @@ -14,14 +14,12 @@ Pod::Spec.new do |s|
s.ios.deployment_target = '8.0'
s.osx.deployment_target = '10.10'
s.tvos.deployment_target = '9.0'
s.source = { :git => "https://github.com/socketio/socket.io-client-swift.git", :tag => 'v10.2.0' }
s.source_files = "Source/**/*.swift"
s.libraries = 'z'
s.preserve_paths = 'zlib/*'
s.requires_arc = true
s.pod_target_xcconfig = {
'SWIFT_VERSION' => '3.1',
'SWIFT_INCLUDE_PATHS' => '$(PODS_ROOT)/Socket.IO-Client-Swift/zlib'
s.source = {
:git => "https://github.com/socketio/socket.io-client-swift.git",
:tag => 'v11.0.0',
:submodules => true
}
# s.dependency 'Starscream', '~> 0.9' # currently this repo includes Starscream swift files
s.source_files = "Source/*.swift"
s.dependency "StarscreamSocketIO", "~> 8.0.1"
end
191 changes: 144 additions & 47 deletions Socket.IO-Client-Swift.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions SocketIO-MacTests/SocketSideEffectTest.swift
Original file line number Diff line number Diff line change
Expand Up @@ -238,23 +238,23 @@ class SocketSideEffectTest: XCTestCase {

socket.setTestStatus(.notConnected)

socket.on(clientEvent: .connect) {data, ack in
expect.fulfill()
}

socket.connect(timeoutAfter: 0.5, withHandler: {
XCTFail("Should not call timeout handler if status is connected")
})

DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + 0.1) {
// Fake connecting
self.socket.setTestStatus(.connected)
}

DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + 0.7) {
expect.fulfill()
self.socket.parseEngineMessage("0/")
}

waitForExpectations(timeout: 2)
}

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

Expand Down
174 changes: 0 additions & 174 deletions Source/Compression.swift

This file was deleted.

Loading

0 comments on commit 3ba3354

Please sign in to comment.