From dfec570d30ddc76dd73544ea8f701141b35a2bca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 29 May 2025 20:29:51 +0530 Subject: [PATCH] chore(deps): bump org.jetbrains.kotlin.android from 1.9.25 to 2.1.21 (#74) * chore(deps): bump org.jetbrains.kotlin.android from 1.9.25 to 2.1.21 Bumps [org.jetbrains.kotlin.android](https://github.com/JetBrains/kotlin) from 1.9.25 to 2.1.21. - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.9.25...v2.1.21) --- updated-dependencies: - dependency-name: org.jetbrains.kotlin.android dependency-version: 2.1.21 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] * chore(deps): add compose compiler gradle plugin --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Naveen Singh --- app/build.gradle.kts | 5 +---- gradle/libs.versions.toml | 6 ++---- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index f53327aa..c17332ec 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -5,6 +5,7 @@ import java.io.FileInputStream plugins { alias(libs.plugins.android) alias(libs.plugins.kotlinAndroid) + alias(libs.plugins.compose.compiler) alias(libs.plugins.ksp) alias(libs.plugins.detekt) } @@ -80,10 +81,6 @@ android { buildConfig = true } - composeOptions { - kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get() - } - flavorDimensions.add("variants") productFlavors { register("core") diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index fd03fb8d..efd25a88 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] #jetbrains -kotlin = "1.9.25" +kotlin = "2.1.21" #KSP ksp = "2.1.21-2.0.1" #Detekt @@ -12,7 +12,6 @@ androidx-lifecycle = "2.8.7" #Compose composeActivity = "1.9.3" compose = "1.7.8" -composeCompiler = "1.5.15" composeMaterial3 = "1.3.2" #AutoFitTextView autofittextview = "0.2.1" @@ -45,7 +44,6 @@ androidx-room-runtime = { module = "androidx.room:room-runtime", version.ref = " androidx-room-ktx = { module = "androidx.room:room-ktx", version.ref = "room" } androidx-room-compiler = { module = "androidx.room:room-compiler", version.ref = "room" } #Compose -compose-compiler = { module = "androidx.compose.compiler:compiler", version.ref = "composeCompiler" } compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "compose" } compose-material3 = { module = "androidx.compose.material3:material3", version.ref = "composeMaterial3" } compose-material-icons = { module = "androidx.compose.material:material-icons-extended", version.ref = "compose" } @@ -65,7 +63,6 @@ exp4j = { module = "net.objecthunter:exp4j", version.ref = "exp4j" } compose = [ "compose-activity", "compose-animation", - "compose-compiler", "compose-foundation", "compose-material-icons", "compose-material3", @@ -92,4 +89,5 @@ lifecycle = [ android = { id = "com.android.application", version.ref = "gradlePlugins-agp" } ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } +compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }