Skip to content

Commit

Permalink
Merge pull request #1558 from ably/release/1.2.19
Browse files Browse the repository at this point in the history
Release/1.2.19
  • Loading branch information
lawrence-forooghian authored Dec 8, 2022
2 parents 3bed345 + ed25b70 commit 5c3d12f
Show file tree
Hide file tree
Showing 9 changed files with 20 additions and 12 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Change Log

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

[Full Changelog](/~https://github.com/ably/ably-cocoa/compare/1.2.18...1.2.19)

**Closed issues:**

- Replace all calls to `NSLog` with calls to the `ARTLog` instance [\#1554](/~https://github.com/ably/ably-cocoa/issues/1554)

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

[Full Changelog](/~https://github.com/ably/ably-cocoa/compare/1.2.17...1.2.18)
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,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.18"),
.package(url: "/~https://github.com/ably/ably-cocoa", from: "1.2.19"),
```
### Installing through [CocoaPods](https://cocoapods.org/)

Expand Down Expand Up @@ -103,7 +103,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.18), 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.19), 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.

Expand Down
2 changes: 1 addition & 1 deletion Scripts/jazzy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jazzy \
--objc \
--clean \
--author Ably \
--module-version 1.2.18 \
--module-version 1.2.19 \
--umbrella-header Source/Ably.h \
--framework-root Source \
--module Ably \
Expand Down
2 changes: 1 addition & 1 deletion Source/ARTClientInformation.m
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#import <sys/utsname.h>

NSString *const ARTClientInformationAgentNotVersioned = @"ARTClientInformationAgentNotVersioned";
NSString *const ARTClientInformation_libraryVersion = @"1.2.18";
NSString *const ARTClientInformation_libraryVersion = @"1.2.19";
static NSString *const _libraryName = @"ably-cocoa";

// NSOperatingSystemVersion has NSInteger as version components for some reason, so mitigate it here.
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.18")
XCTAssertEqual(ARTDefault.libraryVersion(), "1.2.19")
}
}
6 changes: 3 additions & 3 deletions Spec/Tests/ClientInformationTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ final class ClientInformationTests: XCTestCase {

XCTAssertEqual(agents.keys.count, 2)

XCTAssertEqual(agents["ably-cocoa"], "1.2.18")
XCTAssertEqual(agents["ably-cocoa"], "1.2.19")

#if os(iOS)
XCTAssertTrue(agents.keys.contains("iOS"))
Expand All @@ -27,7 +27,7 @@ final class ClientInformationTests: XCTestCase {
// CR3, CR3b
func testAgentIdentifierWithAdditionalAgents_withNilAdditionalAgents() {
let expectedIdentifier = [
"ably-cocoa/1.2.18",
"ably-cocoa/1.2.19",
ARTDefault.platformAgent()
].sorted().joined(separator: " ")

Expand All @@ -42,7 +42,7 @@ final class ClientInformationTests: XCTestCase {
]

let expectedIdentifier = [
"ably-cocoa/1.2.18",
"ably-cocoa/1.2.19",
"demolib/0.0.1",
"morelib",
ARTDefault.platformAgent()
Expand Down
4 changes: 2 additions & 2 deletions 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.18"))
expect(query).to(haveParam("agent", hasPrefix: "ably-cocoa/1.2.19"))
} else {
XCTFail("MockTransport isn't working")
}
Expand Down Expand Up @@ -2772,7 +2772,7 @@ class RealtimeClientConnectionTests: XCTestCase {
}
}

// FIXME: Fix flaky presence tests and re-enable. See https://ably-real-time.slack.com/archives/C030C5YLY/p1.2.182436085700
// FIXME: Fix flaky presence tests and re-enable. See https://ably-real-time.slack.com/archives/C030C5YLY/p1623172436085700
// RTN15d
func skipped__test__065__Connection__connection_failures_once_CONNECTED__should_recover_from_disconnection_and_messages_should_be_delivered_once_the_connection_is_resumed() {
let options = AblyTests.commonAppSetup()
Expand Down
2 changes: 1 addition & 1 deletion Spec/Tests/RestClientTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -1668,7 +1668,7 @@ class RestClientTests: XCTestCase {
let headerAgent = testHTTPExecutor.requests.first!.allHTTPHeaderFields?["Ably-Agent"]
let ablyAgent = ARTClientInformation.agentIdentifier(withAdditionalAgents: options.agents)
expect(headerAgent).to(equal(ablyAgent))
expect(headerAgent!.hasPrefix("ably-cocoa/1.2.18")).to(beTrue())
expect(headerAgent!.hasPrefix("ably-cocoa/1.2.19")).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.18
CURRENT_PROJECT_VERSION = 1.2.19

0 comments on commit 5c3d12f

Please sign in to comment.