From 4dacc4642a14cbac4b11dbc0d7eaa1fc3a1634ef Mon Sep 17 00:00:00 2001 From: Tahaak67 Date: Mon, 25 Nov 2024 20:50:30 +0200 Subject: [PATCH] update dependencies --- app/build.gradle.kts | 6 +++--- build.gradle.kts | 1 + composeApp/build.gradle.kts | 1 + composeApp/src/commonMain/kotlin/App.kt | 1 + gradle/libs.versions.toml | 23 ++++++++++++----------- showcase-layout-compose/build.gradle.kts | 1 + 6 files changed, 19 insertions(+), 14 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 0eb267b..98049b2 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,6 +1,8 @@ plugins { alias(libs.plugins.androidApplication) alias(libs.plugins.jetbrainsKotlinAndroid) + alias(libs.plugins.jetbrainsCompose) + alias(libs.plugins.compose.compiler) } android { @@ -36,9 +38,7 @@ android { compose =true buildConfig= true } - composeOptions { - kotlinCompilerExtensionVersion = "1.5.11" - } + packagingOptions { resources { excludes += "/META-INF/{AL2.0,LGPL2.1}" diff --git a/build.gradle.kts b/build.gradle.kts index df65a91..4db520a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -10,6 +10,7 @@ plugins { alias(libs.plugins.androidApplication) apply false alias(libs.plugins.androidLibrary) apply false alias(libs.plugins.jetbrainsCompose) apply false + alias(libs.plugins.compose.compiler) apply false alias(libs.plugins.kotlinMultiplatform) apply false alias(libs.plugins.jetbrainsKotlinAndroid) apply false alias(libs.plugins.nexusPublishing) diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts index 8baee2f..15ee580 100644 --- a/composeApp/build.gradle.kts +++ b/composeApp/build.gradle.kts @@ -6,6 +6,7 @@ plugins { alias(libs.plugins.kotlinMultiplatform) alias(libs.plugins.androidApplication) alias(libs.plugins.jetbrainsCompose) + alias(libs.plugins.compose.compiler) } kotlin { diff --git a/composeApp/src/commonMain/kotlin/App.kt b/composeApp/src/commonMain/kotlin/App.kt index 2384970..ca50237 100644 --- a/composeApp/src/commonMain/kotlin/App.kt +++ b/composeApp/src/commonMain/kotlin/App.kt @@ -133,6 +133,7 @@ fun App(openUrl: (String) -> Boolean, onWebLoadFinish: () -> Unit = {}) { append("lets take you on a quick tour!") } } + MyTheme(useDarkTheme = false) { ShowcaseLayout( isShowcasing = isShowcasing, diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index fd39069..c0f0e90 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,19 +1,19 @@ [versions] -agp = "8.2.0" +agp = "8.2.2" android-compileSdk = "34" android-minSdk = "24" android-targetSdk = "34" -androidx-activityCompose = "1.8.2" -androidx-appcompat = "1.6.1" -androidx-constraintlayout = "2.1.4" -androidx-core-ktx = "1.12.0" -androidx-espresso-core = "3.5.1" -androidx-material = "1.11.0" -androidx-test-junit = "1.1.5" -compose = "1.6.2" -compose-plugin = "1.6.1" +androidx-activityCompose = "1.9.3" +androidx-appcompat = "1.7.0" +androidx-constraintlayout = "2.2.0" +androidx-core-ktx = "1.15.0" +androidx-espresso-core = "3.6.1" +androidx-material = "1.12.0" +androidx-test-junit = "1.2.1" +compose = "1.7.5" +compose-plugin = "1.7.1" junit = "4.13.2" -kotlin = "1.9.23" +kotlin = "2.0.21" nexusPublishing = "1.3.0" [libraries] @@ -36,4 +36,5 @@ androidLibrary = { id = "com.android.library", version.ref = "agp" } jetbrainsCompose = { id = "org.jetbrains.compose", version.ref = "compose-plugin" } kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" } jetbrainsKotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } +compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } nexusPublishing = { id = "io.github.gradle-nexus.publish-plugin", version.ref = "nexusPublishing" } \ No newline at end of file diff --git a/showcase-layout-compose/build.gradle.kts b/showcase-layout-compose/build.gradle.kts index 0cff2e3..810618d 100644 --- a/showcase-layout-compose/build.gradle.kts +++ b/showcase-layout-compose/build.gradle.kts @@ -5,6 +5,7 @@ plugins { alias(libs.plugins.kotlinMultiplatform) alias(libs.plugins.androidLibrary) alias(libs.plugins.jetbrainsCompose) + alias(libs.plugins.compose.compiler) id("convention.publication") }