From 7fd6b08119cac2e53e44782e6cb6c44ac7d27644 Mon Sep 17 00:00:00 2001 From: Marat Al Date: Thu, 14 Nov 2024 22:16:00 +0100 Subject: [PATCH 1/2] Bump version to 1.2.34. --- README.md | 4 ++-- Scripts/jazzy.sh | 2 +- Source/ARTClientInformation.m | 2 +- Test/Tests/ARTDefaultTests.swift | 2 +- Test/Tests/ClientInformationTests.swift | 6 +++--- Test/Tests/RealtimeClientConnectionTests.swift | 2 +- Test/Tests/RestClientTests.swift | 2 +- Version.xcconfig | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 8c5f1b25e..dd0aaa036 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.33"), + .package(url: "https://github.com/ably/ably-cocoa", from: "1.2.34"), ``` ### 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.33), 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.34), 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 7519fce88..5aa5c338b 100755 --- a/Scripts/jazzy.sh +++ b/Scripts/jazzy.sh @@ -7,7 +7,7 @@ jazzy \ --objc \ --clean \ --author Ably \ - --module-version 1.2.33 \ + --module-version 1.2.34 \ --umbrella-header Source/include/Ably/Ably.h \ --framework-root Source \ --module Ably \ diff --git a/Source/ARTClientInformation.m b/Source/ARTClientInformation.m index 8c5cc8c77..c8b78d8e0 100644 --- a/Source/ARTClientInformation.m +++ b/Source/ARTClientInformation.m @@ -6,7 +6,7 @@ #import NSString *const ARTClientInformationAgentNotVersioned = @"ARTClientInformationAgentNotVersioned"; -NSString *const ARTClientInformation_libraryVersion = @"1.2.33"; +NSString *const ARTClientInformation_libraryVersion = @"1.2.34"; 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 5fabbf13a..b680d089e 100644 --- a/Test/Tests/ARTDefaultTests.swift +++ b/Test/Tests/ARTDefaultTests.swift @@ -6,6 +6,6 @@ class ARTDefaultTests: XCTestCase { func testVersions() { XCTAssertEqual(ARTDefault.apiVersion(), "2") - XCTAssertEqual(ARTDefault.libraryVersion(), "1.2.33") + XCTAssertEqual(ARTDefault.libraryVersion(), "1.2.34") } } diff --git a/Test/Tests/ClientInformationTests.swift b/Test/Tests/ClientInformationTests.swift index b98280f92..3be595fec 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.33") + XCTAssertEqual(agents["ably-cocoa"], "1.2.34") #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.33", + "ably-cocoa/1.2.34", ARTDefault.platformAgent() ].sorted().joined(separator: " ") @@ -42,7 +42,7 @@ final class ClientInformationTests: XCTestCase { ] let expectedIdentifier = [ - "ably-cocoa/1.2.33", + "ably-cocoa/1.2.34", "demolib/0.0.1", "morelib", ARTDefault.platformAgent() diff --git a/Test/Tests/RealtimeClientConnectionTests.swift b/Test/Tests/RealtimeClientConnectionTests.swift index bf78207d9..a7395306a 100644 --- a/Test/Tests/RealtimeClientConnectionTests.swift +++ b/Test/Tests/RealtimeClientConnectionTests.swift @@ -384,7 +384,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.33")) + expect(query).to(haveParam("agent", hasPrefix: "ably-cocoa/1.2.34")) } else { XCTFail("MockTransport isn't working") } diff --git a/Test/Tests/RestClientTests.swift b/Test/Tests/RestClientTests.swift index 0b373cd36..54b6d1316 100644 --- a/Test/Tests/RestClientTests.swift +++ b/Test/Tests/RestClientTests.swift @@ -1736,7 +1736,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.33")) + XCTAssertTrue(headerAgent!.hasPrefix("ably-cocoa/1.2.34")) done() } } diff --git a/Version.xcconfig b/Version.xcconfig index e1ea69c15..e1a1f78c1 100644 --- a/Version.xcconfig +++ b/Version.xcconfig @@ -1 +1 @@ -CURRENT_PROJECT_VERSION = 1.2.33 +CURRENT_PROJECT_VERSION = 1.2.34 From 3ae52f9fed4c8ef047576ab34c527b865f2e984a Mon Sep 17 00:00:00 2001 From: Marat Al Date: Thu, 14 Nov 2024 22:30:00 +0100 Subject: [PATCH 2/2] Update change log. --- CHANGELOG.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 59b5a0cc7..114e5d235 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,15 @@ # Change Log +## [1.2.34](https://github.com/ably/ably-cocoa/tree/1.2.34) + +**Full Changelog**: https://github.com/ably/ably-cocoa/compare/1.2.33...1.2.34 + +**What's Changed:** + +* Prepare library for swift 6 concurrency by @maratal in https://github.com/ably/ably-cocoa/pull/1963, https://github.com/ably/ably-cocoa/pull/1988 +* Preparing for use with Xcode 16 by @maratal in https://github.com/ably/ably-cocoa/pull/1978 +* Added `attachOnSubscribe` to `ARTRealtimeChannelOptions` by @maratal in https://github.com/ably/ably-cocoa/pull/1976 + ## [1.2.33](https://github.com/ably/ably-cocoa/tree/1.2.33) [Full Changelog](https://github.com/ably/ably-cocoa/compare/1.2.32...1.2.33)