From 0f0d26f3308abad542cafad6f0f80d1c9810c793 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Krzemi=C5=84ski?= <3110813+krzema12@users.noreply.github.com> Date: Thu, 17 Oct 2024 09:11:12 +0200 Subject: [PATCH] Move dependencies to Gradle version catalog (#27) --- composeApp/build.gradle.kts | 10 +++++----- gradle/libs.versions.toml | 10 +++++++++- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts index c89d555..219c2c3 100644 --- a/composeApp/build.gradle.kts +++ b/composeApp/build.gradle.kts @@ -6,7 +6,7 @@ plugins { alias(libs.plugins.kotlinMultiplatform) alias(libs.plugins.composeCompiler) alias(libs.plugins.jetbrainsCompose) - kotlin("plugin.serialization") version "2.0.21" + alias(libs.plugins.kotlinxSerialization) } kotlin { @@ -32,7 +32,7 @@ kotlin { sourceSets { val wasmJsMain by getting { dependencies { - implementation("io.ktor:ktor-client-js:3.2.0") + implementation(libs.ktor.client.js) } } @@ -40,7 +40,7 @@ kotlin { dependencies { implementation(compose.desktop.currentOs) implementation(libs.kotlinx.coroutines.swing) - implementation("io.ktor:ktor-client-cio:3.0.0") + implementation(libs.ktor.client.cio) } } @@ -51,8 +51,8 @@ kotlin { implementation(compose.ui) implementation(compose.components.resources) implementation(compose.components.uiToolingPreview) - implementation("io.ktor:ktor-client-core:3.2.0") - implementation("com.charleskorn.kaml:kaml:0.61.0") + implementation(libs.ktor.client.core) + implementation(libs.kaml) } } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0d9bb34..6169eb4 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,6 +4,8 @@ compose-plugin = "1.7.0" junit = "4.13.2" kotlin = "2.0.21" kotlinx-coroutines = "1.9.0" +ktor = "3.0.0" +kaml = "0.61.0" [libraries] kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" } @@ -12,8 +14,14 @@ junit = { group = "junit", name = "junit", version.ref = "junit" } compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose" } compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "compose" } kotlinx-coroutines-swing = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-swing", version.ref = "kotlinx-coroutines" } +ktor-client-core = { group = "io.ktor", name = "ktor-client-core", version.ref = "ktor" } +ktor-client-js = { group = "io.ktor", name = "ktor-client-js", version.ref = "ktor" } +ktor-client-cio = { group = "io.ktor", name = "ktor-client-cio", version.ref = "ktor" } +kaml = { group = "com.charleskorn.kaml", name = "kaml", version.ref = "kaml" } [plugins] jetbrainsCompose = { id = "org.jetbrains.compose", version.ref = "compose-plugin" } composeCompiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } -kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" } \ No newline at end of file +kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" } +kotlinxSerialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } +