Skip to content

Commit 37e9dfe

Browse files
committed
Use version catalogs
1 parent 5e4750e commit 37e9dfe

File tree

4 files changed

+34
-18
lines changed

4 files changed

+34
-18
lines changed

build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ plugins {
66
alias(libs.plugins.composeMultiplatform) apply false
77
alias(libs.plugins.composeCompiler) apply false
88
alias(libs.plugins.kotlinMultiplatform) apply false
9-
id("com.google.devtools.ksp").version("2.2.0-2.0.2").apply(false)
10-
id("com.rickclephas.kmp.nativecoroutines").version("1.0.0-ALPHA-45").apply(false)
9+
alias(libs.plugins.ksp) apply false
10+
alias(libs.plugins.kmpNativeCoroutines) apply false
1111
}

composeApp/build.gradle.kts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import org.gradle.kotlin.dsl.implementation
12
import org.jetbrains.compose.desktop.application.dsl.TargetFormat
23
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
34
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
@@ -22,9 +23,10 @@ kotlin {
2223
androidMain.dependencies {
2324
implementation(compose.preview)
2425
implementation(libs.androidx.activity.compose)
25-
implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2")
26-
implementation("androidx.lifecycle:lifecycle-runtime-compose:2.6.2")
27-
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.6.2")
26+
implementation(libs.androidx.lifecycle.viewmodel)
27+
implementation(libs.androidx.lifecycle.viewmodel.ktx)
28+
implementation(libs.androidx.lifecycle.viewmodel.compose)
29+
implementation(libs.androidx.lifecycle.runtimeCompose)
2830
}
2931
commonMain.dependencies {
3032
implementation(compose.runtime)

gradle/libs.versions.toml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ androidx-testExt = "1.2.1"
1313
composeMultiplatform = "1.8.2"
1414
junit = "4.13.2"
1515
kotlin = "2.2.0"
16+
kotlinxCoroutinesCore = "1.10.2"
17+
kotlinxDatetime = "0.6.2"
18+
ktorVersion = "3.1.3"
19+
lifecycleViewmodelKtx = "2.6.2"
1620

1721
[libraries]
1822
kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
@@ -25,11 +29,23 @@ androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "a
2529
androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "androidx-constraintlayout" }
2630
androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity" }
2731
androidx-lifecycle-viewmodel = { module = "org.jetbrains.androidx.lifecycle:lifecycle-viewmodel", version.ref = "androidx-lifecycle" }
32+
androidx-lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle" }
33+
androidx-lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle" }
2834
androidx-lifecycle-runtimeCompose = { module = "org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose", version.ref = "androidx-lifecycle" }
35+
kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinxCoroutinesCore" }
36+
kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinxDatetime" }
37+
ktor-client-android = { module = "io.ktor:ktor-client-android", version.ref = "ktorVersion" }
38+
ktor-client-content-negotiation = { module = "io.ktor:ktor-client-content-negotiation", version.ref = "ktorVersion" }
39+
ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktorVersion" }
40+
ktor-client-darwin = { module = "io.ktor:ktor-client-darwin", version.ref = "ktorVersion" }
41+
ktor-serialization-kotlinx-json = { module = "io.ktor:ktor-serialization-kotlinx-json", version.ref = "ktorVersion" }
2942

3043
[plugins]
3144
androidApplication = { id = "com.android.application", version.ref = "agp" }
3245
androidLibrary = { id = "com.android.library", version.ref = "agp" }
3346
composeMultiplatform = { id = "org.jetbrains.compose", version.ref = "composeMultiplatform" }
3447
composeCompiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
35-
kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
48+
kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
49+
serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
50+
ksp = { id = "com.google.devtools.ksp", version = "2.2.0-2.0.2" }
51+
kmpNativeCoroutines = { id = "com.rickclephas.kmp.nativecoroutines", version = "1.0.0-ALPHA-45" }

shared/build.gradle.kts

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
44
plugins {
55
alias(libs.plugins.kotlinMultiplatform)
66
alias(libs.plugins.androidLibrary)
7-
kotlin("plugin.serialization") version "2.2.0"
8-
id("com.google.devtools.ksp")
9-
id("com.rickclephas.kmp.nativecoroutines")
7+
alias(libs.plugins.serialization)
8+
alias(libs.plugins.ksp)
9+
alias(libs.plugins.kmpNativeCoroutines)
1010
}
1111

1212
kotlin {
@@ -28,24 +28,22 @@ kotlin {
2828
}
2929
}
3030

31-
val ktorVersion = "3.2.0"
32-
3331
sourceSets {
3432
all {
3533
languageSettings.optIn("kotlin.experimental.ExperimentalObjCName")
3634
}
3735
commonMain.dependencies {
38-
implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.2")
39-
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2")
40-
implementation("io.ktor:ktor-client-core:${ktorVersion}")
41-
implementation("io.ktor:ktor-client-content-negotiation:${ktorVersion}")
42-
implementation("io.ktor:ktor-serialization-kotlinx-json:${ktorVersion}")
36+
implementation(libs.kotlinx.datetime)
37+
implementation(libs.kotlinx.coroutines.core)
38+
implementation(libs.ktor.client.core)
39+
implementation(libs.ktor.client.content.negotiation)
40+
implementation(libs.ktor.serialization.kotlinx.json)
4341
}
4442
androidMain.dependencies {
45-
implementation("io.ktor:ktor-client-android:$ktorVersion")
43+
implementation(libs.ktor.client.android)
4644
}
4745
iosMain.dependencies {
48-
implementation("io.ktor:ktor-client-darwin:$ktorVersion")
46+
implementation(libs.ktor.client.darwin)
4947
}
5048
commonTest.dependencies {
5149
implementation(libs.kotlin.test)

0 commit comments

Comments
 (0)