From 95d60c0aad763a2a335683f20c9cff4a99a552ac Mon Sep 17 00:00:00 2001 From: Yamin Siahmargooei Date: Mon, 23 Sep 2024 00:04:56 +0330 Subject: [PATCH] updated kotlin --- Gauge/build.gradle.kts | 15 +-------------- app/build.gradle.kts | 5 +---- build.gradle.kts | 3 ++- 3 files changed, 4 insertions(+), 19 deletions(-) diff --git a/Gauge/build.gradle.kts b/Gauge/build.gradle.kts index f5a1ccb..10bf3c6 100644 --- a/Gauge/build.gradle.kts +++ b/Gauge/build.gradle.kts @@ -26,6 +26,7 @@ plugins { id("com.android.library") id("org.jetbrains.kotlin.android") id("com.vanniktech.maven.publish") + id("org.jetbrains.kotlin.plugin.compose") } android { @@ -37,16 +38,6 @@ android { consumerProguardFiles("consumer-rules.pro") } - buildTypes { - release { - isMinifyEnabled = false - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) - } - } - compileOptions { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 @@ -60,10 +51,6 @@ android { compose = true } - composeOptions { - kotlinCompilerExtensionVersion = "1.5.12" - } - packaging { resources { excludes += "/META-INF/{AL2.0,LGPL2.1}" diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 12fb262..90f8179 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -22,6 +22,7 @@ plugins { id("com.android.application") id("org.jetbrains.kotlin.android") + id("org.jetbrains.kotlin.plugin.compose") } android { @@ -62,10 +63,6 @@ android { compose = true } - composeOptions { - kotlinCompilerExtensionVersion = "1.5.12" - } - packaging { resources { excludes += "/META-INF/{AL2.0,LGPL2.1}" diff --git a/build.gradle.kts b/build.gradle.kts index 0602779..5ee085c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -22,6 +22,7 @@ plugins { id("com.android.application") version "8.6.1" apply false id("com.android.library") version "8.6.1" apply false - id("org.jetbrains.kotlin.android") version "1.9.23" apply false + id("org.jetbrains.kotlin.android") version "2.0.20" apply false id("com.vanniktech.maven.publish") version "0.28.0" + id("org.jetbrains.kotlin.plugin.compose") version "2.0.20" apply false } \ No newline at end of file