From 5db76062964dbe9ec1f3629f43b668cfb5d08c53 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 9 Dec 2024 16:38:17 +0000 Subject: [PATCH 1/2] Update kotlin --- app/build.gradle.kts | 2 +- build.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 312fdfd..10558da 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -56,7 +56,7 @@ android { compose = true } composeOptions { - kotlinCompilerExtensionVersion = "1.5.9" + kotlinCompilerExtensionVersion = "1.5.15" } packaging { resources { diff --git a/build.gradle.kts b/build.gradle.kts index 0f05471..5800309 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -18,5 +18,5 @@ plugins { id("com.android.application") version "8.2.2" apply false id("com.android.library") version "8.2.2" apply false - id("org.jetbrains.kotlin.android") version "1.9.22" apply false + id("org.jetbrains.kotlin.android") version "2.1.0" apply false } From 16f799afe892cc3bfed611f27b3a4ceb0ee4bb31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Alc=C3=A9rreca?= Date: Mon, 9 Dec 2024 13:48:34 +0000 Subject: [PATCH 2/2] Compose compiler plugin (cherry picked from commit ed69a49efba6e588ef014a1b93f6d35b6c147e5d) --- app/build.gradle.kts | 4 +--- build.gradle.kts | 1 + 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 10558da..a79859f 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -17,6 +17,7 @@ plugins { id("com.android.application") id("org.jetbrains.kotlin.android") + id("org.jetbrains.kotlin.plugin.compose") } android { @@ -55,9 +56,6 @@ android { buildFeatures { compose = true } - composeOptions { - kotlinCompilerExtensionVersion = "1.5.15" - } packaging { resources { excludes += "/META-INF/{AL2.0,LGPL2.1}" diff --git a/build.gradle.kts b/build.gradle.kts index 5800309..27eeddc 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -19,4 +19,5 @@ plugins { id("com.android.application") version "8.2.2" apply false id("com.android.library") version "8.2.2" apply false id("org.jetbrains.kotlin.android") version "2.1.0" apply false + id("org.jetbrains.kotlin.plugin.compose") version "2.1.0" apply false }