From 89178e8028fe5a5bd67ae309de5c77e032ab07da Mon Sep 17 00:00:00 2001 From: doTTTTT Date: Mon, 9 Mar 2026 23:14:03 +0100 Subject: [PATCH] chore: Clean toml --- FloconDesktop/build.gradle.kts | 10 +- FloconDesktop/composeApp/build.gradle.kts | 20 +- FloconDesktop/data/core/build.gradle.kts | 6 +- FloconDesktop/data/local/build.gradle.kts | 6 +- FloconDesktop/data/remote/build.gradle.kts | 26 +-- FloconDesktop/domain/build.gradle.kts | 6 +- FloconDesktop/gradle/libs.versions.toml | 194 +++++++++--------- .../library/designsystem/build.gradle.kts | 6 +- FloconDesktop/navigation/build.gradle.kts | 6 +- 9 files changed, 145 insertions(+), 135 deletions(-) diff --git a/FloconDesktop/build.gradle.kts b/FloconDesktop/build.gradle.kts index b67f3c82..d0a0e520 100644 --- a/FloconDesktop/build.gradle.kts +++ b/FloconDesktop/build.gradle.kts @@ -1,12 +1,12 @@ plugins { // this is necessary to avoid the plugins to be loaded multiple times // in each subproject's classloader - alias(libs.plugins.composeMultiplatform) apply false - alias(libs.plugins.composeCompiler) apply false - alias(libs.plugins.kotlinJvm) apply false - alias(libs.plugins.kotlinMultiplatform) apply false + alias(libs.plugins.compose.multiplatform) apply false + alias(libs.plugins.compose.compiler) apply false + alias(libs.plugins.kotlin.jvm) apply false + alias(libs.plugins.kotlin.multiplatform) apply false alias(libs.plugins.ksp) apply false - alias(libs.plugins.aboutLibraries) apply false + alias(libs.plugins.about.libraries) apply false alias(libs.plugins.android.kotlin.multiplatform.library) apply false alias(libs.plugins.buildconfig) apply false diff --git a/FloconDesktop/composeApp/build.gradle.kts b/FloconDesktop/composeApp/build.gradle.kts index 788347ff..5883760f 100644 --- a/FloconDesktop/composeApp/build.gradle.kts +++ b/FloconDesktop/composeApp/build.gradle.kts @@ -3,13 +3,13 @@ import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi import org.jetbrains.kotlin.gradle.dsl.KotlinVersion plugins { - alias(libs.plugins.kotlinMultiplatform) - alias(libs.plugins.composeMultiplatform) - alias(libs.plugins.composeCompiler) + alias(libs.plugins.kotlin.multiplatform) + alias(libs.plugins.compose.multiplatform) + alias(libs.plugins.compose.compiler) alias(libs.plugins.kotlinx.serialization) alias(libs.plugins.ksp) // Add KSP plugin alias(libs.plugins.room) - alias(libs.plugins.aboutLibraries) + alias(libs.plugins.about.libraries) alias(libs.plugins.buildconfig) } @@ -46,15 +46,15 @@ kotlin { implementation(compose.components.resources) implementation(libs.androidx.lifecycle.viewmodel) - implementation(libs.androidx.lifecycle.runtimeCompose) - implementation(libs.kotlinx.coroutinesCore) + implementation(libs.androidx.lifecycle.runtime.compose) + implementation(libs.kotlinx.coroutines.core) implementation(project.dependencies.platform(libs.koin.bom)) implementation(libs.koin.core) implementation(libs.koin.compose.viewmodel) implementation(libs.koin.compose.viewmodel.navigation) - implementation(libs.kotlinx.serializationJson) - implementation(libs.kotlinx.dateTime) + implementation(libs.kotlinx.serialization.json) + implementation(libs.kotlinx.datetime) implementation(libs.multiplatform.settings) implementation(libs.multiplatform.settings.coroutines) implementation(libs.coil.compose) @@ -88,8 +88,8 @@ kotlin { } desktopMain.dependencies { implementation(compose.desktop.currentOs) - implementation(libs.kotlinx.coroutinesSwing) - implementation(libs.ktor.clientJava) + implementation(libs.kotlinx.coroutines.swing) + implementation(libs.ktor.client.java) // implementation(libs.ui.tooling.preview.desktop) } } diff --git a/FloconDesktop/data/core/build.gradle.kts b/FloconDesktop/data/core/build.gradle.kts index 88f31b1a..3efe7cde 100644 --- a/FloconDesktop/data/core/build.gradle.kts +++ b/FloconDesktop/data/core/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - alias(libs.plugins.kotlinMultiplatform) + alias(libs.plugins.kotlin.multiplatform) alias(libs.plugins.kotlinx.serialization) } @@ -17,8 +17,8 @@ kotlin { sourceSets { commonMain.dependencies { - implementation(libs.kotlinx.coroutinesCore) - implementation(libs.kotlinx.serializationJson) + implementation(libs.kotlinx.coroutines.core) + implementation(libs.kotlinx.serialization.json) implementation(libs.androidx.paging.common) implementation(project.dependencies.platform(libs.koin.bom)) diff --git a/FloconDesktop/data/local/build.gradle.kts b/FloconDesktop/data/local/build.gradle.kts index 0c419d45..2bb71d27 100644 --- a/FloconDesktop/data/local/build.gradle.kts +++ b/FloconDesktop/data/local/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - alias(libs.plugins.kotlinMultiplatform) + alias(libs.plugins.kotlin.multiplatform) alias(libs.plugins.kotlinx.serialization) alias(libs.plugins.room) alias(libs.plugins.ksp) @@ -19,8 +19,8 @@ kotlin { sourceSets { commonMain.dependencies { - implementation(libs.kotlinx.coroutinesCore) - implementation(libs.kotlinx.serializationJson) + implementation(libs.kotlinx.coroutines.core) + implementation(libs.kotlinx.serialization.json) implementation(libs.androidx.paging.common) implementation(project.dependencies.platform(libs.koin.bom)) diff --git a/FloconDesktop/data/remote/build.gradle.kts b/FloconDesktop/data/remote/build.gradle.kts index e411d9d9..fa573443 100644 --- a/FloconDesktop/data/remote/build.gradle.kts +++ b/FloconDesktop/data/remote/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - alias(libs.plugins.kotlinMultiplatform) + alias(libs.plugins.kotlin.multiplatform) alias(libs.plugins.kotlinx.serialization) } @@ -16,8 +16,8 @@ kotlin { sourceSets { commonMain.dependencies { - implementation(libs.kotlinx.coroutinesCore) - implementation(libs.kotlinx.serializationJson) + implementation(libs.kotlinx.coroutines.core) + implementation(libs.kotlinx.serialization.json) implementation(project.dependencies.platform(libs.koin.bom)) implementation(libs.koin.core) @@ -32,17 +32,17 @@ kotlin { } getByName("desktopMain").dependencies { - implementation(libs.ktor.serverCore) - implementation(libs.ktor.serverNetty) - implementation(libs.ktor.serializationKotlinJson) - implementation(libs.ktor.serverContentNegociation) - implementation(libs.ktor.serverWebsocket) - implementation(libs.kotlinx.coroutinesCore) - implementation(libs.kotlinx.serializationJson) + implementation(libs.ktor.server.core) + implementation(libs.ktor.server.netty) + implementation(libs.ktor.serialization.kotlinx.json) + implementation(libs.ktor.server.content.negotiation) + implementation(libs.ktor.server.websockets) + implementation(libs.kotlinx.coroutines.core) + implementation(libs.kotlinx.serialization.json) - implementation(libs.ktor.clientCore) - implementation(libs.ktor.clientCio) - implementation(libs.ktor.clientContentNegociation) + implementation(libs.ktor.client.core) + implementation(libs.ktor.client.cio) + implementation(libs.ktor.client.content.negotiation) } } } diff --git a/FloconDesktop/domain/build.gradle.kts b/FloconDesktop/domain/build.gradle.kts index 2642ee63..6385899b 100644 --- a/FloconDesktop/domain/build.gradle.kts +++ b/FloconDesktop/domain/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - alias(libs.plugins.kotlinMultiplatform) + alias(libs.plugins.kotlin.multiplatform) } kotlin { @@ -16,8 +16,8 @@ kotlin { sourceSets { commonMain.dependencies { - implementation(libs.kotlinx.coroutinesCore) - implementation(libs.kotlinx.dateTime) + implementation(libs.kotlinx.coroutines.core) + implementation(libs.kotlinx.datetime) implementation(libs.androidx.paging.common) implementation(project.dependencies.platform(libs.koin.bom)) diff --git a/FloconDesktop/gradle/libs.versions.toml b/FloconDesktop/gradle/libs.versions.toml index 8d3d6664..c9f089e9 100644 --- a/FloconDesktop/gradle/libs.versions.toml +++ b/FloconDesktop/gradle/libs.versions.toml @@ -1,4 +1,5 @@ [versions] +about-libraries = "12.2.4" agp = "9.0.0" android-compileSdk = "35" android-minSdk = "24" @@ -10,118 +11,127 @@ androidx-core = "1.17.0" androidx-espresso = "3.7.0" androidx-lifecycle = "2.10.0-alpha06" androidx-testExt = "1.3.0" +buildconfig = "5.6.8" coil = "3.4.0" -composeMultiplatform = "1.10.1" +compose-hot-reload = "1.0.0" +compose-multiplatform = "1.10.1" +core = "1.7.0" junit = "4.13.2" kermit = "2.0.8" koin = "4.1.1" kotlin = "2.3.10" kotlinx-coroutines = "1.10.2" -kotlinx-dateTime = "0.7.1" +kotlinx-datetime = "0.7.1" kotlinx-serialization = "1.9.0" +kotlinx-serialization-core = "1.8.1" +ksp = "2.3.6" +ktlint = "14.0.1" ktor = "3.4.1" logback = "1.5.18" -multiplatform-settings = "1.3.0" -sqlite = "2.6.2" -room = "2.8.4" -ksp = "2.3.6" -ktlintGradle = "14.0.1" -aboutLibraries = "12.2.4" -kotlinStdlib = "2.2.0" -runner = "1.7.0" -core = "1.7.0" -other-jsontree = "2.6.0" -uiToolingPreviewDesktop = "1.8.2" -buildconfig = "5.6.8" -paging = "3.3.2" -opencsv = "5.9" - -# TODO Sort -nav3Core = "1.0.0-alpha04+dev3147"#"1.0.0-alpha03" material3-adaptive = "1.0.0-alpha03" -kotlinxSerializationCore = "1.8.1" +multiplatform-settings = "1.3.0" +navigation3 = "1.0.0-alpha04+dev3147" +opencsv = "5.9" +other-jsontree = "2.6.0" +paging = "3.3.2" +room = "2.8.4" +runner = "1.7.0" +sqlite = "2.6.2" +ui-tooling-preview-desktop = "1.8.2" [libraries] -kermit = { module = "co.touchlab:kermit", version.ref = "kermit" } -kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" } -kotlin-testJunit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" } -junit = { module = "junit:junit", version.ref = "junit" } -androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "androidx-core" } -androidx-testExt-junit = { module = "androidx.test.ext:junit", version.ref = "androidx-testExt" } -androidx-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "androidx-espresso" } +# AboutLibraries +aboutlibraries-compose-core = { module = "com.mikepenz:aboutlibraries-compose-core", version.ref = "about-libraries" } +aboutlibraries-compose-m3 = { module = "com.mikepenz:aboutlibraries-compose-m3", version.ref = "about-libraries" } +aboutlibraries-core = { module = "com.mikepenz:aboutlibraries-core", version.ref = "about-libraries" } + +# AndroidX +androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity" } androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" } androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "androidx-constraintlayout" } -androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity" } -androidx-lifecycle-viewmodel = { module = "org.jetbrains.androidx.lifecycle:lifecycle-viewmodel", version.ref = "androidx-lifecycle" } -androidx-lifecycle-runtimeCompose = { module = "org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose", version.ref = "androidx-lifecycle" } +androidx-core = { module = "androidx.test:core", version.ref = "core" } +androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "androidx-core" } +androidx-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "androidx-espresso" } androidx-lifecycle-nav3 = { module = "org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-navigation3", version.ref = "androidx-lifecycle" } -coil-compose = { module = "io.coil-kt.coil3:coil-compose", version.ref = "coil" } -kotlinx-coroutinesCore = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" } -kotlinx-coroutinesSwing = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-swing", version.ref = "kotlinx-coroutines" } -kotlinx-dateTime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinx-dateTime" } -kotlinx-serializationJson = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization" } -logback = { module = "ch.qos.logback:logback-classic", version.ref = "logback" } -ktor-clientJava = { module = "io.ktor:ktor-client-java", version.ref = "ktor" } -ktor-clientCore = { module = "io.ktor:ktor-client-core-jvm", version.ref = "ktor" } -ktor-clientCio = { module = "io.ktor:ktor-client-cio", version.ref = "ktor" } -ktor-serverCore = { module = "io.ktor:ktor-server-core-jvm", version.ref = "ktor" } -ktor-serverNetty = { module = "io.ktor:ktor-server-netty-jvm", version.ref = "ktor" } -ktor-serializationKotlinJson = { module = "io.ktor:ktor-serialization-kotlinx-json", version.ref = "ktor" } -ktor-serverContentNegociation = { module = "io.ktor:ktor-server-content-negotiation", version.ref = "ktor" } -ktor-clientContentNegociation = { module = "io.ktor:ktor-client-content-negotiation", version.ref = "ktor" } -ktor-serverWebsocket = { module = "io.ktor:ktor-server-websockets", version.ref = "ktor" } -ktor-serverTestHost = { module = "io.ktor:ktor-server-test-host-jvm", version.ref = "ktor" } -koin-bom = { module = "io.insert-koin:koin-bom", version.ref = "koin" } -koin-core = { module = "io.insert-koin:koin-core" } -koin-compose-viewmodel = { module = "io.insert-koin:koin-compose-viewmodel" } -koin-compose-viewmodel-navigation = { module = "io.insert-koin:koin-compose-viewmodel-navigation" } -koin-android = { module = "io.insert-koin:koin-android" } -multiplatform-settings = { module = "com.russhwolf:multiplatform-settings", version.ref = "multiplatform-settings" } -multiplatform-settings-coroutines = { module = "com.russhwolf:multiplatform-settings-coroutines", version.ref = "multiplatform-settings" } -coil-network-ktor = { module = "io.coil-kt.coil3:coil-network-ktor3", version.ref = "coil" } -opencsv = { module = "com.opencsv:opencsv", version.ref = "opencsv" } - -androidx-room-runtime = { module = "androidx.room:room-runtime", version.ref = "room" } -androidx-room-paging = { module = "androidx.room:room-paging", version.ref = "room" } -androidx-room-compiler = { module = "androidx.room:room-compiler", version.ref = "room" } -sqlite-bundled = { module = "androidx.sqlite:sqlite-bundled", version.ref = "sqlite" } - -# Core module (required for accessing library data) -aboutlibraries-core = { module = "com.mikepenz:aboutlibraries-core", version.ref = "aboutLibraries" } -# Compose UI modules (choose one or both) -aboutlibraries-compose-core = { module = "com.mikepenz:aboutlibraries-compose-core", version.ref = "aboutLibraries" } # Common compose core -aboutlibraries-compose-m3 = { module = "com.mikepenz:aboutlibraries-compose-m3", version.ref = "aboutLibraries" } -kotlin-stdlib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib", version.ref = "kotlinStdlib" } -androidx-runner = { group = "androidx.test", name = "runner", version.ref = "runner" } -androidx-core = { group = "androidx.test", name = "core", version.ref = "core" } # Material 3 UI - -other-jsontree = { module = "com.sebastianneubauer.jsontree:jsontree", version.ref = "other-jsontree"} -ui-tooling-preview-desktop = { module = "org.jetbrains.compose.ui:ui-tooling-preview-desktop", version.ref = "uiToolingPreviewDesktop" } - -# TODO Sort -#compose-navigation3-runtime = { module = "org.jetbrains.androidx.navigation3:navigation3-runtime", version.ref = "nav3Core" } -compose-navigation3-ui = { module = "org.jetbrains.androidx.navigation3:navigation3-ui", version.ref = "nav3Core" } - -material3-adaptive = { module = "org.jetbrains.compose.material3.adaptive:adaptive-navigation3", version.ref = "material3-adaptive" } - -# Optional add-on libraries -kotlinx-serialization-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core", version.ref = "kotlinxSerializationCore" } - +androidx-lifecycle-runtime-compose = { module = "org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose", version.ref = "androidx-lifecycle" } +androidx-lifecycle-viewmodel = { module = "org.jetbrains.androidx.lifecycle:lifecycle-viewmodel", version.ref = "androidx-lifecycle" } androidx-paging-common = { module = "androidx.paging:paging-common", version.ref = "paging" } androidx-paging-compose = { module = "androidx.paging:paging-compose", version = "3.4.0-alpha04" } +androidx-room-compiler = { module = "androidx.room:room-compiler", version.ref = "room" } +androidx-room-paging = { module = "androidx.room:room-paging", version.ref = "room" } +androidx-room-runtime = { module = "androidx.room:room-runtime", version.ref = "room" } +androidx-runner = { module = "androidx.test:runner", version.ref = "runner" } +androidx-testExt-junit = { module = "androidx.test.ext:junit", version.ref = "androidx-testExt" } + +# Coil +coil-compose = { module = "io.coil-kt.coil3:coil-compose", version.ref = "coil" } +coil-network-ktor = { module = "io.coil-kt.coil3:coil-network-ktor3", version.ref = "coil" } + +# Compose +compose-navigation3-ui = { module = "org.jetbrains.androidx.navigation3:navigation3-ui", version.ref = "navigation3" } +material3-adaptive = { module = "org.jetbrains.compose.material3.adaptive:adaptive-navigation3", version.ref = "material3-adaptive" } +ui-tooling-preview-desktop = { module = "org.jetbrains.compose.ui:ui-tooling-preview-desktop", version.ref = "ui-tooling-preview-desktop" } + +# Junit +junit = { module = "junit:junit", version.ref = "junit" } + +# Kermit +kermit = { module = "co.touchlab:kermit", version.ref = "kermit" } + +# Koin +koin-android = { module = "io.insert-koin:koin-android" } +koin-bom = { module = "io.insert-koin:koin-bom", version.ref = "koin" } +koin-compose-viewmodel = { module = "io.insert-koin:koin-compose-viewmodel" } +koin-compose-viewmodel-navigation = { module = "io.insert-koin:koin-compose-viewmodel-navigation" } +koin-core = { module = "io.insert-koin:koin-core" } + +# Kotlin / Kotlinx +kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" } +kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" } +kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" } +kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" } +kotlinx-coroutines-swing = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-swing", version.ref = "kotlinx-coroutines" } +kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinx-datetime" } +kotlinx-serialization-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core", version.ref = "kotlinx-serialization-core" } +kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization" } + +# Ktor +ktor-client-cio = { module = "io.ktor:ktor-client-cio", version.ref = "ktor" } +ktor-client-content-negotiation = { module = "io.ktor:ktor-client-content-negotiation", version.ref = "ktor" } +ktor-client-core = { module = "io.ktor:ktor-client-core-jvm", version.ref = "ktor" } +ktor-client-java = { module = "io.ktor:ktor-client-java", version.ref = "ktor" } +ktor-serialization-kotlinx-json = { module = "io.ktor:ktor-serialization-kotlinx-json", version.ref = "ktor" } +ktor-server-content-negotiation = { module = "io.ktor:ktor-server-content-negotiation", version.ref = "ktor" } +ktor-server-core = { module = "io.ktor:ktor-server-core-jvm", version.ref = "ktor" } +ktor-server-netty = { module = "io.ktor:ktor-server-netty-jvm", version.ref = "ktor" } +ktor-server-test-host = { module = "io.ktor:ktor-server-test-host-jvm", version.ref = "ktor" } +ktor-server-websockets = { module = "io.ktor:ktor-server-websockets", version.ref = "ktor" } + +# Logback +logback = { module = "ch.qos.logback:logback-classic", version.ref = "logback" } + +# Multiplatform Settings +multiplatform-settings = { module = "com.russhwolf:multiplatform-settings", version.ref = "multiplatform-settings" } +multiplatform-settings-coroutines = { module = "com.russhwolf:multiplatform-settings-coroutines", version.ref = "multiplatform-settings" } + +# Other markdown-renderer = { module = "com.mikepenz:multiplatform-markdown-renderer-m3", version = "0.38.1" } +opencsv = { module = "com.opencsv:opencsv", version.ref = "opencsv" } +other-jsontree = { module = "com.sebastianneubauer.jsontree:jsontree", version.ref = "other-jsontree" } +sqlite-bundled = { module = "androidx.sqlite:sqlite-bundled", version.ref = "sqlite" } [plugins] -composeMultiplatform = { id = "org.jetbrains.compose", version.ref = "composeMultiplatform" } -composeCompiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } -kotlinJvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } -kotlinx-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } -ktor = { id = "io.ktor.plugin", version.ref = "ktor" } -kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" } -ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } -room = { id = "androidx.room", version.ref = "room" } -aboutLibraries = { id = "com.mikepenz.aboutlibraries.plugin", version.ref = "aboutLibraries" } +about-libraries = { id = "com.mikepenz.aboutlibraries.plugin", version.ref = "about-libraries" } android-kotlin-multiplatform-library = { id = "com.android.kotlin.multiplatform.library", version.ref = "agp" } android-lint = { id = "com.android.lint", version.ref = "agp" } - buildconfig = { id = "com.github.gmazzo.buildconfig", version.ref = "buildconfig" } +compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } +compose-hot-reload = { id = "org.jetbrains.compose.hot-reload", version.ref = "compose-hot-reload" } +compose-multiplatform = { id = "org.jetbrains.compose", version.ref = "compose-multiplatform" } +kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } +kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" } +kotlinx-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } +ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } +ktor = { id = "io.ktor.plugin", version.ref = "ktor" } +room = { id = "androidx.room", version.ref = "room" } + diff --git a/FloconDesktop/library/designsystem/build.gradle.kts b/FloconDesktop/library/designsystem/build.gradle.kts index 6f8327ac..09fdfa41 100644 --- a/FloconDesktop/library/designsystem/build.gradle.kts +++ b/FloconDesktop/library/designsystem/build.gradle.kts @@ -1,8 +1,8 @@ plugins { - alias(libs.plugins.kotlinMultiplatform) + alias(libs.plugins.kotlin.multiplatform) - alias(libs.plugins.composeCompiler) - alias(libs.plugins.composeMultiplatform) + alias(libs.plugins.compose.compiler) + alias(libs.plugins.compose.multiplatform) } kotlin { diff --git a/FloconDesktop/navigation/build.gradle.kts b/FloconDesktop/navigation/build.gradle.kts index 2a3533e5..5f1feb6c 100644 --- a/FloconDesktop/navigation/build.gradle.kts +++ b/FloconDesktop/navigation/build.gradle.kts @@ -2,10 +2,10 @@ import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi import org.jetbrains.kotlin.gradle.dsl.KotlinVersion plugins { - alias(libs.plugins.kotlinMultiplatform) + alias(libs.plugins.kotlin.multiplatform) - alias(libs.plugins.composeCompiler) - alias(libs.plugins.composeMultiplatform) + alias(libs.plugins.compose.compiler) + alias(libs.plugins.compose.multiplatform) alias(libs.plugins.kotlinx.serialization) }