From 1b254f0d22259e3fadc0c1a0b1bb5133d969776f Mon Sep 17 00:00:00 2001 From: Avently <7953703+avently@users.noreply.github.com> Date: Mon, 3 Jun 2024 14:04:08 +0700 Subject: [PATCH] revert Kotlin 2.0 update --- apps/multiplatform/android/build.gradle.kts | 1 - apps/multiplatform/build.gradle.kts | 1 - apps/multiplatform/common/build.gradle.kts | 1 - apps/multiplatform/desktop/build.gradle.kts | 1 - apps/multiplatform/gradle.properties | 2 +- apps/multiplatform/settings.gradle.kts | 1 - 6 files changed, 1 insertion(+), 6 deletions(-) diff --git a/apps/multiplatform/android/build.gradle.kts b/apps/multiplatform/android/build.gradle.kts index 85ad61664c..5c2c786a21 100644 --- a/apps/multiplatform/android/build.gradle.kts +++ b/apps/multiplatform/android/build.gradle.kts @@ -3,7 +3,6 @@ plugins { id("com.android.application") id("org.jetbrains.compose") - id("org.jetbrains.kotlin.plugin.compose") kotlin("android") id("org.jetbrains.kotlin.plugin.serialization") } diff --git a/apps/multiplatform/build.gradle.kts b/apps/multiplatform/build.gradle.kts index 914187f195..a0cd35b3ca 100644 --- a/apps/multiplatform/build.gradle.kts +++ b/apps/multiplatform/build.gradle.kts @@ -80,7 +80,6 @@ plugins { id("com.android.application") apply false id("com.android.library") apply false id("org.jetbrains.compose") apply false - id("org.jetbrains.kotlin.plugin.compose") apply false id("org.jetbrains.kotlin.plugin.serialization") apply false } diff --git a/apps/multiplatform/common/build.gradle.kts b/apps/multiplatform/common/build.gradle.kts index edb2144a31..ac131c9748 100644 --- a/apps/multiplatform/common/build.gradle.kts +++ b/apps/multiplatform/common/build.gradle.kts @@ -1,7 +1,6 @@ plugins { kotlin("multiplatform") id("org.jetbrains.compose") - id("org.jetbrains.kotlin.plugin.compose") id("com.android.library") id("org.jetbrains.kotlin.plugin.serialization") id("dev.icerock.mobile.multiplatform-resources") diff --git a/apps/multiplatform/desktop/build.gradle.kts b/apps/multiplatform/desktop/build.gradle.kts index c4f6575b87..401c2938d5 100644 --- a/apps/multiplatform/desktop/build.gradle.kts +++ b/apps/multiplatform/desktop/build.gradle.kts @@ -4,7 +4,6 @@ import org.jetbrains.kotlin.util.capitalizeDecapitalize.toLowerCaseAsciiOnly plugins { kotlin("multiplatform") id("org.jetbrains.compose") - id("org.jetbrains.kotlin.plugin.compose") id("io.github.tomtzook.gradle-cmake") version "1.2.2" } diff --git a/apps/multiplatform/gradle.properties b/apps/multiplatform/gradle.properties index 8871fc84d0..8b1f9a5be9 100644 --- a/apps/multiplatform/gradle.properties +++ b/apps/multiplatform/gradle.properties @@ -30,6 +30,6 @@ android.version_code=218 desktop.version_name=5.8-beta.5 desktop.version_code=52 -kotlin.version=2.0.0 +kotlin.version=1.9.23 gradle.plugin.version=8.2.0 compose.version=1.6.10 diff --git a/apps/multiplatform/settings.gradle.kts b/apps/multiplatform/settings.gradle.kts index 40446f1958..ba047edf1e 100644 --- a/apps/multiplatform/settings.gradle.kts +++ b/apps/multiplatform/settings.gradle.kts @@ -12,7 +12,6 @@ pluginManagement { id("com.android.application").version(extra["gradle.plugin.version"] as String) id("com.android.library").version(extra["gradle.plugin.version"] as String) id("org.jetbrains.compose").version(extra["compose.version"] as String) - id("org.jetbrains.kotlin.plugin.compose").version(extra["kotlin.version"] as String) id("org.jetbrains.kotlin.plugin.serialization").version(extra["kotlin.version"] as String) } }