From 1ec33a30fec498fb04f77dbd7a00f7487d8fc95a Mon Sep 17 00:00:00 2001 From: fankesyooni Date: Thu, 20 Jun 2024 11:48:21 +0800 Subject: [PATCH] chore: bump dependencies & support Kotlin 2.0.0 --- .idea/kotlinc.xml | 2 +- build.gradle.kts | 1 + .../sweet-dependency-config.yaml | 21 +++++++++++-------- samples/demo-android/build.gradle.kts | 1 + samples/demo-jvm/build.gradle.kts | 1 + 5 files changed, 16 insertions(+), 10 deletions(-) diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml index ae3f30a..6d0ee1c 100644 --- a/.idea/kotlinc.xml +++ b/.idea/kotlinc.xml @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index 5535a42..729aea2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,4 +3,5 @@ plugins { autowire(libs.plugins.kotlin.jvm) apply false autowire(libs.plugins.kotlin.android) apply false autowire(libs.plugins.jetbrains.compose) apply false + autowire(libs.plugins.compose.compiler) apply false } \ No newline at end of file diff --git a/gradle/sweet-dependency/sweet-dependency-config.yaml b/gradle/sweet-dependency/sweet-dependency-config.yaml index c1b1cc0..aea5466 100644 --- a/gradle/sweet-dependency/sweet-dependency-config.yaml +++ b/gradle/sweet-dependency/sweet-dependency-config.yaml @@ -11,24 +11,27 @@ repositories: plugins: org.jetbrains.kotlin.jvm: alias: kotlin-jvm - version: 1.9.22 + version: 2.0.0 org.jetbrains.kotlin.android: alias: kotlin-android version-ref: kotlin-jvm org.jetbrains.compose: alias: jetbrains-compose - version: 1.5.12 + version: 1.6.11 + org.jetbrains.kotlin.plugin.compose: + alias: compose-compiler + version-ref: kotlin-jvm com.android.application: alias: android-application - version: 8.2.2 + version: 8.5.0 com.vanniktech.maven.publish: alias: maven-publish - version: 0.27.0 + version: 0.28.0 libraries: androidx.compose: compose-bom: - version: 2024.02.00 + version: 2024.06.00 androidx.compose.foundation: foundation: version: @@ -40,16 +43,16 @@ libraries: version: androidx.activity: activity-compose: - version: 1.8.2 + version: 1.9.0 androidx.core: core-ktx: - version: 1.12.0 + version: 1.13.1 androidx.appcompat: appcompat: - version: 1.6.1 + version: 1.7.0 com.google.android.material: material: - version: 1.11.0 + version: 1.12.0 androidx.test.ext: junit: version: 1.1.5 diff --git a/samples/demo-android/build.gradle.kts b/samples/demo-android/build.gradle.kts index 0bb02d1..3096129 100644 --- a/samples/demo-android/build.gradle.kts +++ b/samples/demo-android/build.gradle.kts @@ -1,6 +1,7 @@ plugins { autowire(libs.plugins.android.application) autowire(libs.plugins.kotlin.android) + autowire(libs.plugins.compose.compiler) } android { diff --git a/samples/demo-jvm/build.gradle.kts b/samples/demo-jvm/build.gradle.kts index 8410f7e..abbf656 100644 --- a/samples/demo-jvm/build.gradle.kts +++ b/samples/demo-jvm/build.gradle.kts @@ -1,6 +1,7 @@ plugins { autowire(libs.plugins.kotlin.jvm) autowire(libs.plugins.jetbrains.compose) + autowire(libs.plugins.compose.compiler) } group = property.project.samples.demo.jvm.groupName