From 6a3d82c60af5e9318650daf89d10027e0f49cf67 Mon Sep 17 00:00:00 2001
From: Erik Little
Date: Wed, 16 Jan 2019 08:51:21 -0500
Subject: [PATCH 1/2] update readme and changelog for new version
---
CHANGELOG.md | 2 ++
Package.swift | 2 +-
README.md | 10 +++++-----
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d6f548b..38fadbb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,8 @@
# v14.0.0
+- Minimum version of the client is now Swift 4.2.
- Add exponential backoff for reconnects, with `reconnectWaitMax` and `randomizationFactor` options [#1149](https://github.com/socketio/socket.io-client-swift/pull/1149)
+- `statusChange` event's data format adds a second value, the raw value of the status. This is for use in Objective-C. [#1147](https://github.com/socketio/socket.io-client-swift/issues/1147)
# v13.4.0
diff --git a/Package.swift b/Package.swift
index 3315dd4..d7a5090 100644
--- a/Package.swift
+++ b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:4.0
+// swift-tools-version:4.2
import PackageDescription
diff --git a/README.md b/README.md
index eea6ed0..964c981 100644
--- a/README.md
+++ b/README.md
@@ -63,7 +63,7 @@ SocketIOClient* socket = manager.defaultSocket;
## 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.
+Checkout the [12to13](https://nuclearace.github.io/Socket.IO-Client-Swift/12to13.html) guide for migrating to v13+ from v12 below.
## Installation
@@ -76,7 +76,7 @@ If you need Swift 3.x use v11.1.3.
### Swift Package Manager
Add the project as a dependency to your Package.swift:
```swift
-// swift-tools-version:4.0
+// swift-tools-version:4.2
import PackageDescription
@@ -86,7 +86,7 @@ let package = Package(
.executable(name: "socket.io-test", targets: ["YourTargetName"])
],
dependencies: [
- .package(url: "https://github.com/socketio/socket.io-client-swift", .upToNextMinor(from: "13.3.0"))
+ .package(url: "https://github.com/socketio/socket.io-client-swift", .upToNextMinor(from: "14.0.0"))
],
targets: [
.target(name: "YourTargetName", dependencies: ["SocketIO"], path: "./Path/To/Your/Sources")
@@ -99,7 +99,7 @@ Then import `import SocketIO`.
### Carthage
Add this line to your `Cartfile`:
```
-github "socketio/socket.io-client-swift" ~> 13.3.0
+github "socketio/socket.io-client-swift" ~> 14.0.0
```
Run `carthage update --platform ios,macosx`.
@@ -113,7 +113,7 @@ Create `Podfile` and add `pod 'Socket.IO-Client-Swift'`:
use_frameworks!
target 'YourApp' do
- pod 'Socket.IO-Client-Swift', '~> 13.3.0'
+ pod 'Socket.IO-Client-Swift', '~> 14.0.0'
end
```
From 19a177485d7bfce06fc9dc847eecb049e4d078e1 Mon Sep 17 00:00:00 2001
From: Erik Little
Date: Wed, 16 Jan 2019 08:54:32 -0500
Subject: [PATCH 2/2] bump version and docs
---
Socket.IO-Client-Swift.podspec | 6 +-
docs/12to13.html | 4 +-
docs/Classes.html | 235 ++++++------
docs/Classes/OnAckCallback.html | 7 +-
docs/Classes/SSLSecurity.html | 7 +-
docs/Classes/SocketAckEmitter.html | 12 +-
docs/Classes/SocketAnyEvent.html | 12 +-
docs/Classes/SocketEngine.html | 47 +--
docs/Classes/SocketIOClient.html | 83 ++--
docs/Classes/SocketManager.html | 86 ++++-
docs/Classes/SocketRawAckView.html | 7 +-
docs/Classes/SocketRawView.html | 10 +-
docs/Enums.html | 137 +++----
docs/Enums/SocketAckStatus.html | 11 +-
docs/Enums/SocketClientEvent.html | 46 +--
docs/Enums/SocketEnginePacketType.html | 31 +-
docs/Enums/SocketIOClientOption.html | 136 +++----
docs/Enums/SocketIOStatus.html | 30 +-
docs/Enums/SocketParsableError.html | 19 +-
docs/Guides.html | 5 +-
docs/Protocols.html | 362 +++++++++---------
docs/Protocols/ConfigSettable.html | 4 +-
docs/Protocols/SocketData.html | 4 +-
docs/Protocols/SocketDataBufferable.html | 6 +-
docs/Protocols/SocketEngineClient.html | 9 +-
docs/Protocols/SocketEnginePollable.html | 14 +-
docs/Protocols/SocketEngineSpec.html | 48 +--
docs/Protocols/SocketEngineWebsocket.html | 6 +-
docs/Protocols/SocketIOClientSpec.html | 16 +-
docs/Protocols/SocketLogger.html | 6 +-
docs/Protocols/SocketManagerSpec.html | 84 +++-
docs/Protocols/SocketParsable.html | 4 +-
docs/Structs.html | 5 +-
docs/Structs/SocketEventHandler.html | 4 +-
docs/Structs/SocketIOClientConfiguration.html | 20 +-
docs/Structs/SocketPacket.html | 14 +-
docs/Structs/SocketPacket/PacketType.html | 39 +-
docs/Typealiases.html | 5 +-
docs/faq.html | 4 +-
docs/index.html | 14 +-
docs/search.json | 2 +-
41 files changed, 845 insertions(+), 756 deletions(-)
diff --git a/Socket.IO-Client-Swift.podspec b/Socket.IO-Client-Swift.podspec
index b16f359..adebe23 100644
--- a/Socket.IO-Client-Swift.podspec
+++ b/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 = "13.4.0"
+ s.version = "14.0.0"
s.summary = "Socket.IO-client for iOS and OS X"
s.description = <<-DESC
Socket.IO-client for iOS and OS X.
@@ -18,13 +18,13 @@ Pod::Spec.new do |s|
s.requires_arc = true
s.source = {
:git => "https://github.com/socketio/socket.io-client-swift.git",
- :tag => 'v13.4.0',
+ :tag => 'v14.0.0',
:submodules => true
}
s.swift_version = "4.2"
s.pod_target_xcconfig = {
- 'SWIFT_VERSION' => '4.0'
+ 'SWIFT_VERSION' => '4.2'
}
s.source_files = "Source/SocketIO/**/*.swift", "Source/SocketIO/*.swift"
s.dependency "Starscream", "~> 3.0.6"
diff --git a/docs/12to13.html b/docs/12to13.html
index aca489a..3e4f3dd 100644
--- a/docs/12to13.html
+++ b/docs/12to13.html
@@ -283,8 +283,8 @@ and a connect event fired.
+
@@ -192,39 +193,6 @@
-
-
@@ -368,88 +336,6 @@ Example:
-
-
- -
-
-
-
-
-
-
-
A wrapper around Starscream’s SSLSecurity that provides a minimal Objective-C interface.
-
-
See more
-
-
-
Declaration
-
-
Swift
-
open class SSLSecurity : NSObject
-
-
-
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
A manager for a socket.io connection.
-
-
A SocketManager is responsible for multiplexing multiple namespaces through a single SocketEngineSpec.
-
-
Example:
-
let manager = SocketManager(socketURL: URL(string:"http://localhost:8080/")!)
-let defaultNamespaceSocket = manager.defaultSocket
-let swiftSocket = manager.socket(forNamespace: "/swift")
-
-// defaultNamespaceSocket and swiftSocket both share a single connection to the server
-
-
-
Sockets created through the manager are retained by the manager. So at the very least, a single strong reference
-to the manager must be maintained to keep sockets alive.
-
-
To disconnect a socket and remove it from the manager, either call SocketIOClient.disconnect() on the socket,
-or call one of the disconnectSocket methods on this class.
-
-
NOTE: The manager is not thread/queue safe, all interaction with the manager should be done on the handleQueue
-
-
See more
-
-
-
-
-
-
-
-
@@ -518,14 +404,129 @@ or call one of the
disconnectSocket methods on this class.
+
+
+
+ -
+
+
+
+
+
+
+
A manager for a socket.io connection.
+
+
A SocketManager is responsible for multiplexing multiple namespaces through a single SocketEngineSpec.
+
+
Example:
+
let manager = SocketManager(socketURL: URL(string:"http://localhost:8080/")!)
+let defaultNamespaceSocket = manager.defaultSocket
+let swiftSocket = manager.socket(forNamespace: "/swift")
+
+// defaultNamespaceSocket and swiftSocket both share a single connection to the server
+
+
+
Sockets created through the manager are retained by the manager. So at the very least, a single strong reference
+to the manager must be maintained to keep sockets alive.
+
+
To disconnect a socket and remove it from the manager, either call SocketIOClient.disconnect() on the socket,
+or call one of the disconnectSocket methods on this class.
+
+
NOTE: The manager is not thread/queue safe, all interaction with the manager should be done on the handleQueue
+
+
See more
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
A wrapper around Starscream’s SSLSecurity that provides a minimal Objective-C interface.
+
+
See more
+
+
+
Declaration
+
+
Swift
+
open class SSLSecurity : NSObject
+
+
+
+
+
+
+
+