diff --git a/catalog/build.gradle.kts b/catalog/build.gradle.kts index c58f4f9..3e74167 100644 --- a/catalog/build.gradle.kts +++ b/catalog/build.gradle.kts @@ -12,13 +12,12 @@ plugins { } compose { - kotlinCompilerPlugin = dependencies.compiler.forKotlin("1.9.21") - kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=1.9.22") + kotlinCompilerPlugin = dependencies.compiler.forKotlin("1.9.22") } @OptIn(org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi::class) kotlin { - targetHierarchy.default() + applyDefaultHierarchyTemplate() jvm("desktop") @@ -107,7 +106,7 @@ android { } buildFeatures.compose = true - composeOptions.kotlinCompilerExtensionVersion = "1.5.2" + composeOptions.kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get() packaging { resources { diff --git a/design/build.gradle.kts b/design/build.gradle.kts index b4836a0..7ddbe50 100644 --- a/design/build.gradle.kts +++ b/design/build.gradle.kts @@ -11,13 +11,12 @@ plugins { } compose { - kotlinCompilerPlugin = dependencies.compiler.forKotlin("1.9.21") - kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=1.9.22") + kotlinCompilerPlugin = dependencies.compiler.forKotlin("1.9.22") } @OptIn(org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi::class) kotlin { - targetHierarchy.default() + applyDefaultHierarchyTemplate() jvm("desktop") diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 58192b6..775bba4 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,23 +1,22 @@ [versions] activity-compose = "1.8.2" -agp = "8.2.1" -androidx-material = "1.5.4" +agp = "8.3.0" +androidx-material = "1.6.2" coil-compose = "2.4.0" -foundation = "1.5.4" +foundation = "1.6.2" kotlin = "1.9.22" core-ktx = "1.12.0" junit = "4.13.2" androidx-test-ext-junit = "1.1.5" espresso-core = "3.5.1" appcompat = "1.6.1" -kotlinx-serialization = "1.6.0" -ktor = "2.3.7" +kotlinx-serialization = "1.6.3" +ktor = "2.3.8" material = "1.11.0" -compose = "1.5.4" lifecycle-runtime-ktx = "2.7.0" -compose-bom = "2023.10.01" -compose-compiler = "1.5.8" -compose-jb = "1.5.11" +compose-bom = "2024.02.01" +compose-compiler = "1.5.10" +compose-jb = "1.6.0" spotless = "6.14.0" [libraries] @@ -29,13 +28,13 @@ gradle-spotless = { group = "com.diffplug.spotless", name = "spotless-plugin-gra androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activity-compose" } androidx-compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "foundation" } androidx-compose-material = { module = "androidx.compose.material:material", version.ref = "androidx-material" } -androidx-compose-ui = { module = "androidx.compose.ui:ui", version.ref = "compose" } -androidx-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose" } -androidx-compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "compose" } +androidx-compose-ui = { module = "androidx.compose.ui:ui" } +androidx-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling" } +androidx-compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" } androidx-test-ext-junit = { group = "androidx.test.ext", name = "junit", version.ref = "androidx-test-ext-junit" } androidx-compose-compiler = { module = "androidx.compose.compiler:compiler", version.ref = "compose-compiler" } -androidx-navigation-compose = "androidx.navigation:navigation-compose:2.7.6" +androidx-navigation-compose = "androidx.navigation:navigation-compose:2.7.7" ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" } ktor-client-js = { module = "io.ktor:ktor-client-js", version.ref = "ktor" } diff --git a/sdui/build.gradle.kts b/sdui/build.gradle.kts index 1a09981..046e98a 100644 --- a/sdui/build.gradle.kts +++ b/sdui/build.gradle.kts @@ -12,13 +12,12 @@ plugins { } compose { - kotlinCompilerPlugin = dependencies.compiler.forKotlin("1.9.21") - kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=1.9.22") + kotlinCompilerPlugin = dependencies.compiler.forKotlin("1.9.22") } @OptIn(org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi::class) kotlin { - targetHierarchy.default() + applyDefaultHierarchyTemplate() jvm("desktop")