From 3d7aaa0179315fbd013c7972934a8432641e195b Mon Sep 17 00:00:00 2001 From: Jeff Lockhart Date: Wed, 13 Dec 2023 11:14:50 -0700 Subject: [PATCH 1/3] Update kotlinx-serialization and kotlinx-coroutines --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c3fce4d78..5a416cb8e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,7 +2,7 @@ couchbase-lite-java = "3.0.15" couchbase-lite-objc = "3.0.15" couchbase-lite-c = "3.0.15" -kotlinx-serialization = "1.6.1" +kotlinx-serialization = "1.6.2" # 1.13.4 breaks QueryExtensionKtTest on Android https://github.com/mockk/mockk/issues/1035 # fixed in 1.13.8, but JVM source compatibility needs to be reverted to 1.8 https://github.com/mockk/mockk/pull/1161 mockk = "1.13.3" @@ -30,7 +30,7 @@ kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test" } kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit" } 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-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version = "0.5.0" } kotlinx-io = { module = "org.jetbrains.kotlinx:kotlinx-io-core", version = "0.3.0" } kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization" } mockk = { module = "io.mockk:mockk", version.ref = "mockk" } From 483cd340b2b2830b539191e1807ed5570cb463d0 Mon Sep 17 00:00:00 2001 From: Jeff Lockhart Date: Wed, 13 Dec 2023 11:14:57 -0700 Subject: [PATCH 2/3] Suppress Android manifest warning --- .../androidApp/src/androidMain/AndroidManifest.xml | 2 +- .../getting-started/androidApp/src/main/AndroidManifest.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/getting-started-compose/androidApp/src/androidMain/AndroidManifest.xml b/examples/getting-started-compose/androidApp/src/androidMain/AndroidManifest.xml index 1e9a03455..806a915e9 100644 --- a/examples/getting-started-compose/androidApp/src/androidMain/AndroidManifest.xml +++ b/examples/getting-started-compose/androidApp/src/androidMain/AndroidManifest.xml @@ -12,7 +12,7 @@ android:supportsRtl="true" android:theme="@style/Theme.AppCompat.Light.NoActionBar" android:enableOnBackInvokedCallback="true" - tools:targetApi="31"> + tools:targetApi="33"> + tools:targetApi="33"> From 62b62c20115bd53772abf3222b722c87ceb0c7f5 Mon Sep 17 00:00:00 2001 From: Jeff Lockhart Date: Wed, 13 Dec 2023 11:22:16 -0700 Subject: [PATCH 3/3] Rearrange docs --- README.md | 10 +++++----- docs/installation.md | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 22fc429c1..3d0e15d4c 100644 --- a/README.md +++ b/README.md @@ -64,6 +64,11 @@ repositories { } ``` +### Native Platforms + +Native platform targets should additionally link to the Couchbase Lite dependency native binary. See [Supported +Platforms](https://kotbase.dev/platforms/) for more details. + ### Linux Targeting JVM running on Linux or native Linux, both require a specific version of the libicu dependency. (You will see @@ -71,11 +76,6 @@ an error such as `libLiteCore.so: libicuuc.so.71: cannot open shared object file the expected version.) If the required version isn't available from your distribution's package manager, you can download it from [GitHub](https://github.com/unicode-org/icu/releases). -### Native Platforms - -Native platform targets should additionally link to the Couchbase Lite dependency native binary. See [Supported -Platforms](https://kotbase.dev/platforms/) for more details. - ## Documentation Kotbase documentation can be found at [kotbase.dev](https://kotbase.dev/), including [getting started examples]( diff --git a/docs/installation.md b/docs/installation.md index b74604687..ef4c3679b 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -50,14 +50,14 @@ Couchbase Maven repository. } ``` +## Native Platforms + +Native platform targets should additionally link to the Couchbase Lite dependency native binary. See [Supported +Platforms](platforms.md) for more details. + ## Linux Targeting JVM running on Linux or native Linux, both require a specific version of the libicu dependency. (You will see an error such as `libLiteCore.so: libicuuc.so.71: cannot open shared object file: No such file or directory` indicating the expected version.) If the required version isn't available from your distribution's package manager, you can download it from [GitHub](https://github.com/unicode-org/icu/releases). - -## Native Platforms - -Native platform targets should additionally link to the Couchbase Lite dependency native binary. See [Supported Platforms]( -platforms.md) for more details.