From ea165ab6a9d2f7b69bf38d5fedfa5441a8544042 Mon Sep 17 00:00:00 2001 From: Quintin Willison Date: Thu, 2 Jul 2020 16:23:40 +0100 Subject: [PATCH 1/2] Bump version to 1.2.1. --- README.md | 4 ++-- Spec/RealtimeClientConnection.swift | 2 +- Version.xcconfig | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 1451488eb..f7c68d808 100644 --- a/README.md +++ b/README.md @@ -126,7 +126,7 @@ If you see, for example, a `dyld: Library not loaded: @rpath/SocketRocketAblyFor ### Manual installation -1. Get the code from GitHub [from the release page](https://github.com/ably/ably-cocoa/releases/tag/1.2.0), 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.1), 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 [SocketRocket Fork](https://github.com/ably-forks/SocketRocket) 0.5.2; get it [from the releases page](https://github.com/ably-forks/SocketRocket/releases/tag/0.5.2-ably-2) and follow [its manual installation instructions](https://github.com/ably-forks/SocketRocket/#installing). 4. Ably also 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. @@ -705,7 +705,7 @@ For each release, the following needs to be done: * Create a new branch `release/x.x.x` (where `x.x.x` is the new version number) from the `master` branch * Run `make bump_[major|minor|patch]` to bump the new version number (creates a Git commit) * Run [`github_changelog_generator`](https://github.com/github-changelog-generator/github-changelog-generator) to automate the update of the [CHANGELOG](./CHANGELOG.md). This may require some manual intervention, both in terms of how the command is run and how the change log file is modified. Your mileage may vary: - * The command you will need to run will look something like this: `github_changelog_generator -u ably -p ably-cocoa --since-tag 1.2.0 --output delta.md` + * The command you will need to run will look something like this: `github_changelog_generator -u ably -p ably-cocoa --since-tag 1.2.1 --output delta.md` * Using the command above, `--output delta.md` writes changes made after `--since-tag` to a new file * The contents of that new file (`delta.md`) then need to be manually inserted at the top of the `CHANGELOG.md`, changing the "Unreleased" heading and linking with the current version numbers * Also ensure that the "Full Changelog" link points to the new version tag instead of the `HEAD` diff --git a/Spec/RealtimeClientConnection.swift b/Spec/RealtimeClientConnection.swift index 6b3c2ee0d..8ec516b28 100644 --- a/Spec/RealtimeClientConnection.swift +++ b/Spec/RealtimeClientConnection.swift @@ -244,7 +244,7 @@ class RealtimeClientConnection: QuickSpec { done() case .connected: if let transport = client.internal.transport as? TestProxyTransport, let query = transport.lastUrl?.query { - expect(query).to(haveParam("lib", withValue: "cocoa\(ARTDefault_variant)-1.2.0")) + expect(query).to(haveParam("lib", withValue: "cocoa\(ARTDefault_variant)-1.2.1")) } else { XCTFail("MockTransport isn't working") diff --git a/Version.xcconfig b/Version.xcconfig index 78e58d8b4..9f689cab0 100644 --- a/Version.xcconfig +++ b/Version.xcconfig @@ -1 +1 @@ -CURRENT_PROJECT_VERSION = 1.2.0 +CURRENT_PROJECT_VERSION = 1.2.1 From 1cd6583496fee4f47e3d3f7ec2fcbe21759b7780 Mon Sep 17 00:00:00 2001 From: Quintin Willison Date: Thu, 2 Jul 2020 16:52:03 +0100 Subject: [PATCH 2/2] Add change log entry. --- CHANGELOG.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 518593086..f4af40701 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,21 @@ # Change Log +## [1.2.1](https://github.com/ably/ably-cocoa/tree/1.2.1) + +Fixes issues in our uncaught exception handling code: + +- **Fix** Data race in ARTstartHandlingUncaughtExceptions [\#1030](https://github.com/ably/ably-cocoa/issues/1030) +- **Merge** Improve unhandled exception handling code [\#1056](https://github.com/ably/ably-cocoa/pull/1056) ([QuintinWillison](https://github.com/QuintinWillison)) + +Also some improvements to our test suite: + +- **Fix** Flaky test: message receiving order [\#977](https://github.com/ably/ably-cocoa/issues/977) +- **Merge** Test suite: fix lib version [\#1026](https://github.com/ably/ably-cocoa/pull/1026) ([ricardopereira](https://github.com/ricardopereira)) +- **Merge** Should not wait for AblyTest.options in 'context' scope [\#1023](https://github.com/ably/ably-cocoa/pull/1023) ([ricardopereira](https://github.com/ricardopereira)) +- **Merge** Fix 977 [\#1022](https://github.com/ably/ably-cocoa/pull/1022) ([ricardopereira](https://github.com/ricardopereira)) + +[Full Changelog](https://github.com/ably/ably-cocoa/compare/1.2.0...1.2.1) + ## [1.2.0](https://github.com/ably/ably-cocoa/tree/1.2.0) Adds the capability to subscribe to a channel in delta mode.