updated kotlin

yamin8000 · Sep 22, 2024 · 95d60c0 · 95d60c0
1 parent dc82d70
commit 95d60c0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 19 deletions.
diff --git 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
@@ -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
@@ -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
 }