Commit 9a0ec71
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.kt48 files changed
Lines changed: 1651 additions & 711 deletions
File tree
- gradle
- images
- lib/src
- main/java/io/ably/lib
- http
- objects
- type/counter
- transport
- test/java/io/ably/lib
- http
- test/realtime
- live-objects/src
- main/kotlin/io/ably/lib/objects
- serialization
- type
- livecounter
- livemap
- test/kotlin/io/ably/lib/objects
- integration
- helpers
- fixtures
- unit
- fixtures
- objects
- type
- livecounter
- livemap
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
3 | 14 | | |
4 | 15 | | |
5 | 16 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
215 | 215 | | |
216 | 216 | | |
217 | 217 | | |
218 | | - | |
| 218 | + | |
219 | 219 | | |
220 | 220 | | |
221 | 221 | | |
| |||
0 commit comments