Merge branch 'development'

* development: (31 commits)
  Add note about namespace methods
  Add note in changelog to checkout the migration guide
  Add more to the migration guide
  don't return optional from defaultSocket
  Add link to 12to13 and style
  Start working on a migration guide
  Fix socketio#855
  refactor SocketIOClient.handlePacket
  bump version
  Do we really need to update carthage?
  Make sure to turn off logging in setup
  Don't use NSDictionary in definitions
  Fix tests
  Fix changelog
  update starscream versions
  nsp should be readonly now
  Add SocketManager for multiplexing namespaces
  Change sentPing/gotPong to ping/pong since those are already reserved
  Fix comment
  Add ability to track ping/pongs
  ...

Author: nuclearace

.travis.yml

@@ -7,12 +7,12 @@ branches:
     - master
     - development
 before_install:
-  - brew update
+  # - brew update
   # - brew outdated xctool || brew upgrade xctool
-  - brew outdated carthage || brew upgrade carthage
+  # - brew outdated carthage || brew upgrade carthage
   - carthage update --platform macosx
 script:
-  - xcodebuild -project Socket.IO-Client-Swift.xcodeproj -scheme SocketIO-Mac build test -quiet
-#  - 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
+  - xcodebuild -project Socket.IO-Client-Swift.xcodeproj -scheme SocketIO build test -quiet
+#  - xcodebuild -project Socket.IO-Client-Swift.xcodeproj -scheme SocketIO build-for-testing -quiet
+#  - xctool -project Socket.IO-Client-Swift.xcodeproj -scheme SocketIO run-tests --parallelize
   - swift test

CHANGELOG.md

@@ -0,0 +1,20 @@
+# v13.0.0
+
+Checkout out the migration guide in Usage Docs for a more detailed guide on how to migrate to this version.
+
+What's new:
+---
+
+- Adds a new `SocketManager` class that multiplexes multiple namespaces through a single engine. 
+- Adds `.sentPing` and `.gotPong` client events for tracking ping/pongs.
+- watchOS support.
+
+Important API changes
+---
+
+- Many properties that were previously on `SocketIOClient` have been moved to the `SocketManager`.
+- `SocketIOClientOption.nsp` has been removed. Use `SocketManager.socket(forNamespace:)` to create/get a socket attached to a specific namespace.
+- Adds `.sentPing` and `.gotPong` client events for tracking ping/pongs.
+- Makes the framework a single target.
+- Updates Starscream to 3.0
+

Cartfile

@@ -1 +1 @@
-github "daltoniam/Starscream" ~> 2.0
+github "daltoniam/Starscream" ~> 3.0

Cartfile.resolved

@@ -1 +1,3 @@
-github "daltoniam/Starscream" "2.1.1"
+github "daltoniam/common-crypto-spm" "1.1.0"
+github "daltoniam/zlib-spm" "1.1.0"
+github "daltoniam/Starscream" "3.0.2"

Package.resolved

@@ -24,8 +24,8 @@
         "repositoryURL": "https://github.com/daltoniam/Starscream",
         "state": {
           "branch": null,
-          "revision": "21678c9426dde2a77152a0d5982cdb952baf0455",
-          "version": "2.1.1"
+          "revision": "44ce58956fae7db22fb0106cb4ce3dbef3d06d00",
+          "version": "3.0.2"
         }
       }
     ]

Package.swift

@@ -8,7 +8,7 @@ let package = Package(
         .library(name: "SocketIO", targets: ["SocketIO"])
     ],
     dependencies: [
-        .package(url: "https://github.com/daltoniam/Starscream", .upToNextMajor(from: "2.1.1")),
+        .package(url: "https://github.com/daltoniam/Starscream", .upToNextMinor(from: "3.0.0")),
     ],
     targets: [
         .target(name: "SocketIO", dependencies: ["Starscream"]),

README.md

@@ -7,20 +7,21 @@ Socket.IO-client for iOS/OS X.
 ```swift
 import SocketIO
 
-let socket = SocketIOClient(socketURL: URL(string: "http://localhost:8080")!, config: [.log(true), .compress])
+let manager = SocketManager(socketURL: URL(string: "http://localhost:8080")!, config: [.log(true), .compress])
+let socket = manager.defaultSocket
 
 socket.on(clientEvent: .connect) {data, ack in
     print("socket connected")
 }
 
 socket.on("currentAmount") {data, ack in
-    if let cur = data[0] as? Double {
-        socket.emitWithAck("canUpdate", cur).timingOut(after: 0) {data in
-            socket.emit("update", ["amount": cur + 2.50])
-        }
-
-        ack.with("Got your currentAmount", "dude")
+    guard let cur = data[0] as? Double else { return }
+    
+    socket.emitWithAck("canUpdate", cur).timingOut(after: 0) {data in
+        socket.emit("update", ["amount": cur + 2.50])
     }
+
+    ack.with("Got your currentAmount", "dude")
 }
 
 socket.connect()
@@ -29,8 +30,10 @@ socket.connect()
 ## Objective-C Example
 ```objective-c
 @import SocketIO;
+
 NSURL* url = [[NSURL alloc] initWithString:@"http://localhost:8080"];
-SocketIOClient* socket = [[SocketIOClient alloc] initWithSocketURL:url config:@{@"log": @YES, @"compress": @YES}];
+SocketManager* manager = [[SocketManager alloc] initWithSocketURL:url config:@{@"log": @YES, @"compress": @YES}];
+SocketIOClient* socket = manager.defaultSocket;
 
 [socket on:@"connect" callback:^(NSArray* data, SocketAckEmitter* ack) {
     NSLog(@"socket connected");
@@ -60,6 +63,9 @@ SocketIOClient* socket = [[SocketIOClient alloc] initWithSocketURL:url config:@{
 ## FAQS
 Checkout the [FAQs](https://nuclearace.github.io/Socket.IO-Client-Swift/faq.html) for commonly asked questions.
 
+Checkout the [12to13](https://nuclearace.github.io/Socket.IO-Client-Swift/12to13.html) guide for migrating to v13.
+
+
 ## Installation
 Requires Swift 4/Xcode 9.x
 
@@ -80,7 +86,7 @@ let package = Package(
         .executable(name: "socket.io-test", targets: ["YourTargetName"])
     ],
     dependencies: [
-        .package(url: "https://github.com/socketio/socket.io-client-swift", .upToNextMajor(from: "12.1.0"))
+        .package(url: "https://github.com/socketio/socket.io-client-swift", .upToNextMinor(from: "13.0.0"))
     ],
     targets: [
         .target(name: "YourTargetName", dependencies: ["SocketIO"], path: "./Path/To/Your/Sources")
@@ -93,7 +99,7 @@ Then import `import SocketIO`.
 ### Carthage
 Add this line to your `Cartfile`:
 ```
-github "socketio/socket.io-client-swift" ~> 12.1.3 # Or latest version
+github "socketio/socket.io-client-swift" ~> 13.0.0 # Or latest version
 ```
 
 Run `carthage update --platform ios,macosx`.
@@ -107,7 +113,7 @@ Create `Podfile` and add `pod 'Socket.IO-Client-Swift'`:
 use_frameworks!
 
 target 'YourApp' do
-    pod 'Socket.IO-Client-Swift', '~> 12.1.3' # Or latest version
+    pod 'Socket.IO-Client-Swift', '~> 13.0.0' # Or latest version
 end
 ```
 
@@ -134,6 +140,7 @@ Objective-C:
 # [Docs](https://nuclearace.github.io/Socket.IO-Client-Swift/index.html)
 
 - [Client](https://nuclearace.github.io/Socket.IO-Client-Swift/Classes/SocketIOClient.html)
+- [Manager](https://nuclearace.github.io/Socket.IO-Client-Swift/Classes/SocketManager.html)
 - [Engine](https://nuclearace.github.io/Socket.IO-Client-Swift/Classes/SocketEngine.html)
 - [Options](https://nuclearace.github.io/Socket.IO-Client-Swift/Enums/SocketIOClientOption.html)
 

Socket.IO-Client-Swift.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name         = "Socket.IO-Client-Swift"
   s.module_name  = "SocketIO"
-  s.version      = "12.1.3"
+  s.version      = "13.0.0"
   s.summary      = "Socket.IO-client for iOS and OS X"
   s.description  = <<-DESC
                    Socket.IO-client for iOS and OS X.
@@ -14,15 +14,16 @@ Pod::Spec.new do |s|
   s.ios.deployment_target = '8.0'
   s.osx.deployment_target = '10.10'
   s.tvos.deployment_target = '9.0'
+  s.watchos.deployment_target = '2.0'
   s.requires_arc = true
   s.source = {
     :git => "https://github.com/socketio/socket.io-client-swift.git",
-    :tag => 'v12.1.3',
+    :tag => 'v13.0.0',
     :submodules => true
   }
   s.pod_target_xcconfig = {
       'SWIFT_VERSION' => '4.0'
   }
   s.source_files  = "Source/SocketIO/**/*.swift", "Source/SocketIO/*.swift"
-  s.dependency "Starscream", "~> 2.1.1"
+  s.dependency "Starscream", "~> 3.0.2"
 end