diff --git a/CHANGELOG.md b/CHANGELOG.md index 7da7f2b36..8cf7ea76d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Change Log +## [1.2.22](https://github.com/ably/ably-cocoa/tree/1.2.22) + +[Full Changelog](https://github.com/ably/ably-cocoa/compare/1.2.21...1.2.22) + +**Fixed issues:** + +- Fixes an issue where certain errors will cause a Realtime connection to transition to `FAILED` when it should be transitioning to `DISCONNECTED` and retrying the connection attempt. [\#1817](https://github.com/ably/ably-cocoa/issues/1817) + ## [1.2.21](https://github.com/ably/ably-cocoa/tree/1.2.21) [Full Changelog](https://github.com/ably/ably-cocoa/compare/1.2.20...1.2.21) diff --git a/README.md b/README.md index be578a2f8..5b03ad664 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,7 @@ You can install Ably for iOS and macOS through Package Manager, CocoaPods, Carth - [This apple guide](https://developer.apple.com/documentation/swift_packages/adding_package_dependencies_to_your_app) explains the steps in more detail. - To install the `ably-cocoa` package in another **Swift Package**, then add the following to your `Package.Swift`: ```swift - .package(url: "https://github.com/ably/ably-cocoa", from: "1.2.21"), + .package(url: "https://github.com/ably/ably-cocoa", from: "1.2.22"), ``` ### Installing through [CocoaPods](https://cocoapods.org/) @@ -101,7 +101,7 @@ If you see, for example, a `dyld: Library not loaded: @rpath/AblyDeltaCodec.fram ### Manual installation -1. Get the code from GitHub [from the release page](https://github.com/ably/ably-cocoa/releases/tag/1.2.21), or clone it to get the latest, unstable and possibly underdocumented version: `git clone git@github.com:ably/ably-cocoa.git` +1. Get the code from GitHub [from the release page](https://github.com/ably/ably-cocoa/releases/tag/1.2.22), or clone it to get the latest, unstable and possibly underdocumented version: `git clone git@github.com:ably/ably-cocoa.git` 2. Drag the directory `ably-cocoa/ably-cocoa` into your project as a group. 3. Ably depends on our [MessagePack Fork](https://github.com/ably-forks/msgpack-objective-C) 0.2.0; get it [from the releases page](https://github.com/ably-forks/msgpack-objective-C/releases/tag/0.2.0-ably-1) and link it into your project. diff --git a/Scripts/jazzy.sh b/Scripts/jazzy.sh index 7a2c16039..c47130bf4 100755 --- a/Scripts/jazzy.sh +++ b/Scripts/jazzy.sh @@ -7,7 +7,7 @@ jazzy \ --objc \ --clean \ --author Ably \ - --module-version 1.2.21 \ + --module-version 1.2.22 \ --umbrella-header Source/include/Ably/Ably.h \ --framework-root Source \ --module Ably \ diff --git a/Source/ARTClientInformation.m b/Source/ARTClientInformation.m index 661085128..474e9a4ea 100644 --- a/Source/ARTClientInformation.m +++ b/Source/ARTClientInformation.m @@ -6,7 +6,7 @@ #import NSString *const ARTClientInformationAgentNotVersioned = @"ARTClientInformationAgentNotVersioned"; -NSString *const ARTClientInformation_libraryVersion = @"1.2.21"; +NSString *const ARTClientInformation_libraryVersion = @"1.2.22"; static NSString *const _libraryName = @"ably-cocoa"; // NSOperatingSystemVersion has NSInteger as version components for some reason, so mitigate it here. diff --git a/Test/Tests/ARTDefaultTests.swift b/Test/Tests/ARTDefaultTests.swift index c0145e640..0f895d305 100644 --- a/Test/Tests/ARTDefaultTests.swift +++ b/Test/Tests/ARTDefaultTests.swift @@ -6,6 +6,6 @@ class ARTDefaultTests: XCTestCase { func testVersions() { XCTAssertEqual(ARTDefault.apiVersion(), "1.2") - XCTAssertEqual(ARTDefault.libraryVersion(), "1.2.21") + XCTAssertEqual(ARTDefault.libraryVersion(), "1.2.22") } } diff --git a/Test/Tests/ClientInformationTests.swift b/Test/Tests/ClientInformationTests.swift index 510cfd7ce..c53569949 100644 --- a/Test/Tests/ClientInformationTests.swift +++ b/Test/Tests/ClientInformationTests.swift @@ -9,7 +9,7 @@ final class ClientInformationTests: XCTestCase { XCTAssertEqual(agents.keys.count, 2) - XCTAssertEqual(agents["ably-cocoa"], "1.2.21") + XCTAssertEqual(agents["ably-cocoa"], "1.2.22") #if os(iOS) XCTAssertTrue(agents.keys.contains("iOS")) @@ -27,7 +27,7 @@ final class ClientInformationTests: XCTestCase { // CR3, CR3b func testAgentIdentifierWithAdditionalAgents_withNilAdditionalAgents() { let expectedIdentifier = [ - "ably-cocoa/1.2.21", + "ably-cocoa/1.2.22", ARTDefault.platformAgent() ].sorted().joined(separator: " ") @@ -42,7 +42,7 @@ final class ClientInformationTests: XCTestCase { ] let expectedIdentifier = [ - "ably-cocoa/1.2.21", + "ably-cocoa/1.2.22", "demolib/0.0.1", "morelib", ARTDefault.platformAgent() diff --git a/Test/Tests/RealtimeClientConnectionTests.swift b/Test/Tests/RealtimeClientConnectionTests.swift index 346b4689d..0414998ab 100644 --- a/Test/Tests/RealtimeClientConnectionTests.swift +++ b/Test/Tests/RealtimeClientConnectionTests.swift @@ -381,7 +381,7 @@ class RealtimeClientConnectionTests: XCTestCase { done() case .connected: if let transport = client.internal.transport as? TestProxyTransport, let query = transport.lastUrl?.query { - expect(query).to(haveParam("agent", hasPrefix: "ably-cocoa/1.2.21")) + expect(query).to(haveParam("agent", hasPrefix: "ably-cocoa/1.2.22")) } else { XCTFail("MockTransport isn't working") } diff --git a/Test/Tests/RestClientTests.swift b/Test/Tests/RestClientTests.swift index 923dab460..bb7e925ca 100644 --- a/Test/Tests/RestClientTests.swift +++ b/Test/Tests/RestClientTests.swift @@ -1734,7 +1734,7 @@ class RestClientTests: XCTestCase { let headerAgent = testHTTPExecutor.requests.first!.allHTTPHeaderFields?["Ably-Agent"] let ablyAgent = ARTClientInformation.agentIdentifier(withAdditionalAgents: options.agents) XCTAssertEqual(headerAgent, ablyAgent) - XCTAssertTrue(headerAgent!.hasPrefix("ably-cocoa/1.2.21")) + XCTAssertTrue(headerAgent!.hasPrefix("ably-cocoa/1.2.22")) done() } } diff --git a/Version.xcconfig b/Version.xcconfig index 377fa25db..928635845 100644 --- a/Version.xcconfig +++ b/Version.xcconfig @@ -1 +1 @@ -CURRENT_PROJECT_VERSION = 1.2.21 +CURRENT_PROJECT_VERSION = 1.2.22