From 8416fe965e3fe6f733773425ecc9f230ca06fec9 Mon Sep 17 00:00:00 2001
From: Phuc YNWA <32135551+phucynwa@users.noreply.github.com>
Date: Thu, 30 May 2024 09:13:09 +0700
Subject: [PATCH] Update libraries
---
.idea/codeStyles/Project.xml | 117 ++++++++++++++++++
.idea/deploymentTargetSelector.xml | 10 ++
.idea/kotlinc.xml | 2 +-
...kotlin-compiler-6268615548928301813.salive | 0
build.gradle.kts | 1 +
gradle/libs.versions.toml | 22 ++--
lib/build.gradle.kts | 4 +-
sample/build.gradle.kts | 4 +-
8 files changed, 142 insertions(+), 18 deletions(-)
create mode 100644 .idea/codeStyles/Project.xml
create mode 100644 .idea/deploymentTargetSelector.xml
create mode 100644 .kotlin/sessions/kotlin-compiler-6268615548928301813.salive
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
new file mode 100644
index 0000000..4bec4ea
--- /dev/null
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,117 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ xmlns:android
+
+ ^$
+
+
+
+
+
+
+
+
+ xmlns:.*
+
+ ^$
+
+
+ BY_NAME
+
+
+
+
+
+
+ .*:id
+
+ http://schemas.android.com/apk/res/android
+
+
+
+
+
+
+
+
+ .*:name
+
+ http://schemas.android.com/apk/res/android
+
+
+
+
+
+
+
+
+ name
+
+ ^$
+
+
+
+
+
+
+
+
+ style
+
+ ^$
+
+
+
+
+
+
+
+
+ .*
+
+ ^$
+
+
+ BY_NAME
+
+
+
+
+
+
+ .*
+
+ http://schemas.android.com/apk/res/android
+
+
+ ANDROID_ATTRIBUTE_ORDER
+
+
+
+
+
+
+ .*
+
+ .*
+
+
+ BY_NAME
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
new file mode 100644
index 0000000..9d0d950
--- /dev/null
+++ b/.idea/deploymentTargetSelector.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index fdf8d99..6d0ee1c 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/.kotlin/sessions/kotlin-compiler-6268615548928301813.salive b/.kotlin/sessions/kotlin-compiler-6268615548928301813.salive
new file mode 100644
index 0000000..e69de29
diff --git a/build.gradle.kts b/build.gradle.kts
index b295455..7e8e0ad 100644
--- 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
index a99d89d..a86ebe8 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,17 +1,17 @@
[versions]
-agp = "8.2.0-alpha16"
-geckoview = "116.0.20230811183303"
-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
index 1709d0d..ccdbc5d 100644
--- 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
index 529ded0..7930750 100644
--- 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}"