Skip to content

Commit

Permalink
Merge pull request #1276 from ably/release/1.2.10
Browse files Browse the repository at this point in the history
Release/1.2.10
  • Loading branch information
QuintinWillison authored Jan 24, 2022
2 parents db269e4 + 3465c46 commit 3b4d306
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 7 deletions.
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
# Change Log

## [1.2.10](https://github.com/ably/ably-cocoa/tree/1.2.10)

[Full Changelog](https://github.com/ably/ably-cocoa/compare/1.2.9...1.2.10)

**Revert Bug Fix:**

We made a change, released in [version 1.2.8](https://github.com/ably/ably-cocoa/releases/tag/1.2.8), which we suspect has been causing issues for some customers.
This release reverts that change.

- Reverting Fix/1177 full reset rsh3g2a only [\#1272](https://github.com/ably/ably-cocoa/pull/1272) ([maratal](https://github.com/maratal))

## [1.2.9](https://github.com/ably/ably-cocoa/tree/1.2.9)

[Full Changelog](https://github.com/ably/ably-cocoa/compare/1.2.8...1.2.9)
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,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.9), 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.10), 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 [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.

Expand Down Expand Up @@ -720,7 +720,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 `main` 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.9 --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.10 --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`
Expand Down
2 changes: 1 addition & 1 deletion Source/ARTDefault.m
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ static inline UInt32 conformVersionComponent(const NSInteger component) {
}

NSString *const ARTDefault_apiVersion = @"1.2";
NSString *const ARTDefault_libraryVersion = @"1.2.9";
NSString *const ARTDefault_libraryVersion = @"1.2.10";

NSString *const ARTDefaultProduction = @"production";

Expand Down
2 changes: 1 addition & 1 deletion Spec/Tests/ARTDefaultTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ class ARTDefaultTests: XCTestCase {

func testVersions() {
XCTAssertEqual(ARTDefault.apiVersion(), "1.2")
XCTAssertEqual(ARTDefault.libraryVersion(), "1.2.9")
XCTAssertEqual(ARTDefault.libraryVersion(), "1.2.10")
}
}
2 changes: 1 addition & 1 deletion Spec/Tests/RealtimeClientConnectionTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,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.9"))
expect(query).to(haveParam("agent", hasPrefix: "ably-cocoa/1.2.10"))
} else {
XCTFail("MockTransport isn't working")
}
Expand Down
2 changes: 1 addition & 1 deletion Spec/Tests/RestClientTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -1678,7 +1678,7 @@ class RestClientTests: XCTestCase {
let headerAgent = testHTTPExecutor.requests.first!.allHTTPHeaderFields?["Ably-Agent"]
let ablyAgent = options.agents()
expect(headerAgent).to(equal(ablyAgent))
expect(headerAgent!.hasPrefix("ably-cocoa/1.2.9")).to(beTrue())
expect(headerAgent!.hasPrefix("ably-cocoa/1.2.10")).to(beTrue())
done()
}
}
Expand Down
2 changes: 1 addition & 1 deletion Version.xcconfig
Original file line number Diff line number Diff line change
@@ -1 +1 @@
CURRENT_PROJECT_VERSION = 1.2.9
CURRENT_PROJECT_VERSION = 1.2.10

0 comments on commit 3b4d306

Please sign in to comment.