Update libraries

phucynwa · May 30, 2024 · a921b99 · a921b99
2 parents 140c3ea + 8416fe9
commit a921b99
Show file tree

Hide file tree

Showing 8 changed files with 142 additions and 18 deletions.
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/.kotlin/sessions/kotlin-compiler-6268615548928301813.salive b/.kotlin/sessions/kotlin-compiler-6268615548928301813.salive
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -2,4 +2,5 @@ plugins {
     alias(libs.plugins.androidApplication) apply false
     alias(libs.plugins.kotlinAndroid) apply false
     alias(libs.plugins.androidLibrary) apply false
+    alias(libs.plugins.compose.compiler) apply false
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,17 +1,17 @@
 [versions]
-agp = "8.2.0-alpha16"
-geckoview = "117.0.20230821145345"
-kotlin = "1.9.0"
-core-ktx = "1.10.1"
+agp = "8.2.2"
+geckoview = "125.0.20240425211020"
+kotlin = "2.0.0"
+core-ktx = "1.13.1"
 junit5-bom = "5.10.0"
 androidx-test-ext-junit = "1.1.5"
 espresso-core = "3.5.1"
-lifecycle-runtime-ktx = "2.6.1"
-activity-compose = "1.7.2"
-navigation-compose = "2.7.0"
-compose-bom = "2023.08.00"
-appcompat = "1.6.1"
-material = "1.9.0"
+lifecycle-runtime-ktx = "2.8.1"
+activity-compose = "1.9.0"
+navigation-compose = "2.7.7"
+compose-bom = "2024.05.00"
+appcompat = "1.7.0"
+material = "1.12.0"
 
 [libraries]
 core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "core-ktx" }
@@ -40,4 +40,4 @@ material = { group = "com.google.android.material", name = "material", version.r
 androidApplication = { id = "com.android.application", version.ref = "agp" }
 kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 androidLibrary = { id = "com.android.library", version.ref = "agp" }
-
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
     alias(libs.plugins.androidLibrary)
     alias(libs.plugins.kotlinAndroid)
+    alias(libs.plugins.compose.compiler)
 }
 
 android {
@@ -34,9 +35,6 @@ android {
         compose = true
         buildConfig = true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.1"
-    }
 }
 
 dependencies {

diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
     alias(libs.plugins.androidApplication)
     alias(libs.plugins.kotlinAndroid)
+    alias(libs.plugins.compose.compiler)
 }
 
 android {
@@ -39,9 +40,6 @@ android {
     buildFeatures {
         compose = true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.1"
-    }
     packaging {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"