diff --git a/gradle.properties b/gradle.properties index 27e75697f..d0ff44429 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,7 +11,7 @@ android.suppressUnsupportedOptionWarnings=android.suppressUnsupportedOptionWarni kotlin.code.style=official kotlin.mpp.stability.nowarn=true GROUP=dev.yorkie -VERSION_NAME=0.4.15 +VERSION_NAME=0.4.16 POM_DESCRIPTION=Document store for building collaborative editing applications. POM_INCEPTION_YEAR=2022 POM_URL=https://github.com/yorkie-team/yorkie-android-sdk diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 48861cd06..ad6a41313 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,7 +6,7 @@ agp = "8.3.2" connectKotlin = "0.6.0" okhttp = "4.12.0" coroutines = "1.8.0" -androidxActivity = "1.8.2" +androidxActivity = "1.9.0" androidxLifecycle = "2.7.0" androidxBenchmark = "1.2.3" androidxComposeCompiler = "1.5.11" @@ -24,7 +24,7 @@ kotlinx-collections-immutable = { group = "org.jetbrains.kotlinx", name = "kotli apache-commons-collections = { group = "org.apache.commons", name = "commons-collections4", version = "4.4" } -androidx-core = { group = "androidx.core", name = "core-ktx", version = "1.12.0" } +androidx-core = { group = "androidx.core", name = "core-ktx", version = "1.13.0" } androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version = "1.6.1" } androidx-activity = { group = "androidx.activity", name = "activity-ktx", version.ref = "androidxActivity" } androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "androidxActivity" } @@ -33,7 +33,7 @@ androidx-lifecycle-viewmodel = { group = "androidx.lifecycle", name = "lifecycle androidx-lifecycle-runtime = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "androidxLifecycle" } androidx-benchmark = { group = "androidx.benchmark", name = "benchmark-junit4", version.ref = "androidxBenchmark" } -androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version = "2024.04.00" } +androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version = "2024.04.01" } androidx-compose-ui = { module = "androidx.compose.ui:ui" } androidx-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling" } androidx-compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" } diff --git a/yorkie/src/androidTest/kotlin/dev/yorkie/core/GCTest.kt b/yorkie/src/androidTest/kotlin/dev/yorkie/core/GCTest.kt index 785131de9..54ccb8c75 100644 --- a/yorkie/src/androidTest/kotlin/dev/yorkie/core/GCTest.kt +++ b/yorkie/src/androidTest/kotlin/dev/yorkie/core/GCTest.kt @@ -496,7 +496,7 @@ class GCTest { }.await() assertEquals(3, document.garbageLength) - assertEquals(3, document.garbageLengthFromClone) + assertEquals(3, document.clone?.root?.getGarbageLength() ?: 0) document.close() client.close() diff --git a/yorkie/src/androidTest/kotlin/dev/yorkie/document/json/JsonTreeTest.kt b/yorkie/src/androidTest/kotlin/dev/yorkie/document/json/JsonTreeTest.kt index 10b5ab5a3..e9f188bf5 100644 --- a/yorkie/src/androidTest/kotlin/dev/yorkie/document/json/JsonTreeTest.kt +++ b/yorkie/src/androidTest/kotlin/dev/yorkie/document/json/JsonTreeTest.kt @@ -1418,8 +1418,8 @@ class JsonTreeTest { assertTreeEditOpInfosEquals( listOf( SimpleTreeEditOpInfo(2, 2, text { "c" }), - SimpleTreeEditOpInfo(1, 2), SimpleTreeEditOpInfo(3, 4), + SimpleTreeEditOpInfo(1, 2), ), ops2, ) diff --git a/yorkie/src/main/kotlin/dev/yorkie/document/Document.kt b/yorkie/src/main/kotlin/dev/yorkie/document/Document.kt index a9a356a18..14d4cfb2a 100644 --- a/yorkie/src/main/kotlin/dev/yorkie/document/Document.kt +++ b/yorkie/src/main/kotlin/dev/yorkie/document/Document.kt @@ -94,9 +94,6 @@ public class Document( public val garbageLength: Int get() = root.getGarbageLength() - internal val garbageLengthFromClone: Int - get() = clone?.root?.getGarbageLength() ?: 0 - private val presenceEventQueue = mutableListOf() internal val pendingPresenceEvents = mutableListOf() diff --git a/yorkie/src/main/kotlin/dev/yorkie/document/crdt/CrdtTree.kt b/yorkie/src/main/kotlin/dev/yorkie/document/crdt/CrdtTree.kt index 164d06d52..c80efff61 100644 --- a/yorkie/src/main/kotlin/dev/yorkie/document/crdt/CrdtTree.kt +++ b/yorkie/src/main/kotlin/dev/yorkie/document/crdt/CrdtTree.kt @@ -332,7 +332,7 @@ internal class CrdtTree( } } } - return changes + return changes.reversed() } private fun findRightToken(treeToken: CrdtTreeToken): CrdtTreeToken {