From 2d7678aa55b72262df8c1ce2a7fc6be98e11b026 Mon Sep 17 00:00:00 2001 From: Geoff Powell Date: Mon, 18 Dec 2023 06:45:39 -0500 Subject: [PATCH 1/2] Compose multiplatform (#43) * Update dependency org.jetbrains.kotlin.android to v2.0.0-Beta2 * Fix compose multi platform --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- build.gradle.kts | 8 -------- gradle/libs.versions.toml | 7 +++---- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 99b5f8d..3c16558 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -21,11 +21,3 @@ plugins { alias(libs.plugins.ksp) apply false alias(libs.plugins.sqldelight) apply false } - -allprojects { - afterEvaluate { - extensions.findByType()?.apply { - kotlinCompilerPlugin.set(libs.versions.compose.kotlin.compiler.get()) - } - } -} \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2e35951..48f2b82 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,13 +1,12 @@ [versions] kotlin = "2.0.0-Beta1" agp = "8.2.0" -compose = "1.5.11" -androidx-compose = "1.5.4" -ktor = "3.2.0" +compose = "1.6.0-alpha01" +ktor = "2.3.7" koin = "3.5.0" voyager = "1.0.0" sqldelight = "2.0.0" -compose-kotlin-compiler = "1.5.4-dev1-kt2.0.0-Beta1" +androidx-compose = "1.5.4" android-compileSdk = "34" android-targetSdk = "34" android-minSdk = "24" From e737ed8cce5aad0b970ba1ba8538785f1c74c220 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 18 Dec 2023 18:35:55 +0000 Subject: [PATCH 2/2] Update sqldelight to v2.0.1 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 48f2b82..911975d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,7 +5,7 @@ compose = "1.6.0-alpha01" ktor = "2.3.7" koin = "3.5.0" voyager = "1.0.0" -sqldelight = "2.0.0" +sqldelight = "2.0.1" androidx-compose = "1.5.4" android-compileSdk = "34" android-targetSdk = "34"