Merge pull request #1057 from ably/release/1.2.1

Release/1.2.1

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.

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 [email protected]: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 [email protected]: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`

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")

Version.xcconfig

@@ -1 +1 @@
-CURRENT_PROJECT_VERSION = 1.2.0
+CURRENT_PROJECT_VERSION = 1.2.1