Skip to content

Commit 9c4a3ba

Browse files
committed
Merge branch 'v11.0.0' into development
* v11.0.0: Make Starscream a dependency
2 parents 781a9e3 + b3ea49f commit 9c4a3ba

15 files changed

+162
-1609
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

Package.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ 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/IBM-Swift/CommonCrypto.git", majorVersion: 0),
6+
.Package(url: "https://github.com/nuclearace/Starscream", majorVersion: 8),
87
]
98
)

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.0"
2725
end

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

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

Source/Compression.swift

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

0 commit comments

Comments
 (0)