From c3088e06bab7edcb25aedd12b6945f2c66e6e19d Mon Sep 17 00:00:00 2001 From: Jeff Lockhart Date: Fri, 24 Nov 2023 14:58:15 -0700 Subject: [PATCH 1/5] Update Kotlin to 1.9.21 Atomicfu 0.23.1 AGP 8.1.4 Compose 1.5.11 --- examples/getting-started-compose/gradle/libs.versions.toml | 6 +++--- examples/getting-started/gradle/libs.versions.toml | 6 +++--- gradle/libs.versions.toml | 7 +++---- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/examples/getting-started-compose/gradle/libs.versions.toml b/examples/getting-started-compose/gradle/libs.versions.toml index bb0b71716..95f59fdcb 100644 --- a/examples/getting-started-compose/gradle/libs.versions.toml +++ b/examples/getting-started-compose/gradle/libs.versions.toml @@ -1,12 +1,12 @@ [versions] activity-compose = "1.8.1" -android-gradle-plugin = "8.1.3" +android-gradle-plugin = "8.1.4" androidx-appcompat = "1.6.1" androidx-core-ktx = "1.12.0" -compose = "1.5.10" +compose = "1.5.11" couchbase-lite-objc = "3.0.12" kotbase = "3.0.12-1.0.0" -kotlin = "1.9.20" +kotlin = "1.9.21" [plugins] android-application = { id = "com.android.application", version.ref = "android-gradle-plugin" } diff --git a/examples/getting-started/gradle/libs.versions.toml b/examples/getting-started/gradle/libs.versions.toml index c9fd44ee4..ffcbc42e6 100644 --- a/examples/getting-started/gradle/libs.versions.toml +++ b/examples/getting-started/gradle/libs.versions.toml @@ -1,15 +1,15 @@ [versions] -android-gradle-plugin = "8.1.3" +android-gradle-plugin = "8.1.4" androidx-appcompat = "1.6.1" androidx-constraintlayout = "2.1.4" androidx-core-ktx = "1.12.0" androidx-lifecycle-ktx = "2.6.2" androidx-material = "1.10.0" -compose = "1.5.10" +compose = "1.5.11" couchbase-lite-c = "3.0.12" kmp-native-coroutines = "1.0.0-ALPHA-20" kotbase = "3.0.12-1.0.0" -kotlin = "1.9.20" +kotlin = "1.9.21" ksp = "1.9.20-1.0.14" [plugins] diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4284b5fa4..c3fce4d78 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -8,9 +8,9 @@ kotlinx-serialization = "1.6.1" mockk = "1.13.3" [plugins] -android-library = { id = "com.android.library", version = "8.1.3" } +android-library = { id = "com.android.library", version = "8.1.4" } dokka = { id = "org.jetbrains.dokka", version = "1.9.10" } -kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version = "1.9.20" } +kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version = "1.9.21" } kotlinx-binary-compatibility-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.13.2" } kotlinx-kover = { id = "org.jetbrains.kotlinx.kover", version = "0.7.4" } vanniktech-maven-publish = { id = "com.vanniktech.maven.publish", version = "0.25.3" } @@ -28,8 +28,7 @@ kermit = { module = "co.touchlab:kermit", version = "2.0.2" } korlibs-korio = { module = "com.soywiz.korlibs.korio:korio", version = "4.0.10" } kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test" } kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit" } -# 0.23.0 fails to build with kotlinx-coroutines 1.7.3 https://github.com/Kotlin/kotlinx-atomicfu/issues/365 -kotlinx-atomicfu = { module = "org.jetbrains.kotlinx:atomicfu", version = "0.22.0" } +kotlinx-atomicfu = { module = "org.jetbrains.kotlinx:atomicfu", version = "0.23.1" } kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version = "1.7.3" } kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version = "0.4.1" } kotlinx-io = { module = "org.jetbrains.kotlinx:kotlinx-io-core", version = "0.3.0" } From 01c1432116cc09c0c40a42d44a4f8a2ca7d6be9a Mon Sep 17 00:00:00 2001 From: Jeff Lockhart Date: Mon, 27 Nov 2023 11:18:10 -0700 Subject: [PATCH 2/5] Disable log test that floods console log output --- couchbase-lite/src/commonTest/kotlin/kotbase/LogTest.kt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/couchbase-lite/src/commonTest/kotlin/kotbase/LogTest.kt b/couchbase-lite/src/commonTest/kotlin/kotbase/LogTest.kt index 2140cf960..43ced467b 100644 --- a/couchbase-lite/src/commonTest/kotlin/kotbase/LogTest.kt +++ b/couchbase-lite/src/commonTest/kotlin/kotbase/LogTest.kt @@ -429,6 +429,11 @@ class LogTest : BaseDbTest() { assertEquals(newConfig.directory, tempDir2) } + // Disable this test because it causes the console log output to be flooded with + // rotateLog fails to open /Users/runner/work/kotbase/kotbase/couchbase-lite/build/cb-tmp/cbl_test_scratch/log-dir_0OdgfeNqn4K7/cbl_info_1696182797644.cbllog + // https://www.couchbase.com/forums/t/rotatelog-fails-to-open-cbllog/37082 + // should be fixed in 3.2 https://issues.couchbase.com/browse/CBL-4996 + @Ignore @Test fun testEditReadOnlyLogFileConfiguration() { testWithConfiguration(LogLevel.DEBUG, LogFileConfiguration(scratchDirPath!!)) { From 794a5a150c4d9859149dd03aa097450b628490a1 Mon Sep 17 00:00:00 2001 From: Jeff Lockhart Date: Mon, 27 Nov 2023 11:23:54 -0700 Subject: [PATCH 3/5] Keep getting-started sample on Kotlin 1.9.20 pending KSP update --- examples/getting-started/gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/getting-started/gradle/libs.versions.toml b/examples/getting-started/gradle/libs.versions.toml index ffcbc42e6..d2932206d 100644 --- a/examples/getting-started/gradle/libs.versions.toml +++ b/examples/getting-started/gradle/libs.versions.toml @@ -7,9 +7,9 @@ androidx-lifecycle-ktx = "2.6.2" androidx-material = "1.10.0" compose = "1.5.11" couchbase-lite-c = "3.0.12" -kmp-native-coroutines = "1.0.0-ALPHA-20" +kmp-native-coroutines = "1.0.0-ALPHA-21" kotbase = "3.0.12-1.0.0" -kotlin = "1.9.21" +kotlin = "1.9.20" ksp = "1.9.20-1.0.14" [plugins] From 1a2eabe948c95cbdc13e42dbd148a334cffc11a7 Mon Sep 17 00:00:00 2001 From: Jeff Lockhart Date: Tue, 28 Nov 2023 15:04:40 -0700 Subject: [PATCH 4/5] Bump Kotlin badge to 1.9.21 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 07d423202..09634d81d 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![Maven Central](https://img.shields.io/maven-central/v/dev.kotbase/couchbase-lite)]( https://central.sonatype.com/namespace/dev.kotbase) -[![Kotlin](https://img.shields.io/badge/kotlin-1.9.20-blue.svg?logo=kotlin)](http://kotlinlang.org) +[![Kotlin](https://img.shields.io/badge/kotlin-1.9.21-blue.svg?logo=kotlin)](http://kotlinlang.org) [![GitHub License](https://img.shields.io/github/license/jeffdgr8/kotbase)](LICENSE) [![Couchbase Community](https://img.shields.io/badge/couchbase-community-ea2328?logo=couchbase&logoColor=ea2328)]( https://www.couchbase.com/developers/community/) From 1785e0173123ec05200aea5c97812a78a7fe8203 Mon Sep 17 00:00:00 2001 From: Jeff Lockhart Date: Tue, 28 Nov 2023 15:50:35 -0700 Subject: [PATCH 5/5] Update KSP and KMP-NativeCoroutines in getting-started --- examples/getting-started/gradle/libs.versions.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/getting-started/gradle/libs.versions.toml b/examples/getting-started/gradle/libs.versions.toml index d2932206d..aaa9016e6 100644 --- a/examples/getting-started/gradle/libs.versions.toml +++ b/examples/getting-started/gradle/libs.versions.toml @@ -7,10 +7,10 @@ androidx-lifecycle-ktx = "2.6.2" androidx-material = "1.10.0" compose = "1.5.11" couchbase-lite-c = "3.0.12" -kmp-native-coroutines = "1.0.0-ALPHA-21" +kmp-native-coroutines = "1.0.0-ALPHA-22" kotbase = "3.0.12-1.0.0" -kotlin = "1.9.20" -ksp = "1.9.20-1.0.14" +kotlin = "1.9.21" +ksp = "1.9.21-1.0.15" [plugins] android-application = { id = "com.android.application", version.ref = "android-gradle-plugin" }