Skip to content

Commit 9a0ec71

Browse files
committed
Merge branch 'feature/objects-getroot' into feature/object-subscriptions
# Conflicts: # live-objects/src/main/kotlin/io/ably/lib/objects/type/BaseLiveObject.kt # live-objects/src/main/kotlin/io/ably/lib/objects/type/livecounter/DefaultLiveCounter.kt # live-objects/src/main/kotlin/io/ably/lib/objects/type/livecounter/LiveCounterManager.kt # live-objects/src/main/kotlin/io/ably/lib/objects/type/livemap/DefaultLiveMap.kt # live-objects/src/test/kotlin/io/ably/lib/objects/unit/type/livemap/LiveMapManagerTest.kt
2 parents 9989a1e + 6d7f0fe commit 9a0ec71

48 files changed

Lines changed: 1651 additions & 711 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
11
# Change Log
22

3+
## [1.2.54](https://github.com/ably/ably-java/tree/v1.2.54)
4+
5+
[Full Changelog](https://github.com/ably/ably-java/compare/v1.2.53...v1.2.54)
6+
7+
This release includes minor improvements and bug fixes.
8+
9+
**Implemented enhancements:**
10+
11+
- Prevents NPE in the connectivity check [\#1111](https://github.com/ably/ably-java/issues/1111)
12+
- Fixes async connection state transition side effects [\#1119](https://github.com/ably/ably-java/issues/1119)
13+
314
## [1.2.53](https://github.com/ably/ably-java/tree/v1.2.53)
415

516
[Full Changelog](https://github.com/ably/ably-java/compare/v1.2.52...v1.2.53)

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ You may wish to make changes to Ably Java or Ably Android, and test it immediate
215215
- Open the directory printed from the output of that command. Inside that folder, get the `ably-android-x.y.z.aar`, and place it your Android project's `libs/` directory. Create this directory if it doesn't exist.
216216
- Add an `implementation` dependency on the `.aar`:
217217
```groovy
218-
implementation files('libs/ably-android-1.2.53.aar')
218+
implementation files('libs/ably-android-1.2.54.aar')
219219
```
220220
- Add the `implementation` (not `testImplementation`) dependencies found in `dependencies.gradle` to your project. This is because the `.aar` does not contain dependencies.
221221
- Build/run your application.

0 commit comments

Comments
 (0)