diff --git a/android/build.gradle.kts b/android/build.gradle.kts index fd361215..39cb3a00 100644 --- a/android/build.gradle.kts +++ b/android/build.gradle.kts @@ -27,12 +27,12 @@ android { } dependencies { - kapt(libs.dagger.hilt.compiler) kapt(libs.androidx.hilt.compiler) + kapt(libs.dagger.hilt.compiler) + implementation(compose.material3) implementation(projects.api) implementation(projects.common) implementation(projects.database) - implementation(compose.material3) implementation(libs.accompanist.swiperefresh) implementation(libs.accompanist.sysuicontroller) implementation(libs.androidx.activity.compose) @@ -41,15 +41,15 @@ dependencies { implementation(libs.androidx.lifecycle.compose) implementation(libs.androidx.navigation.compose) implementation(libs.androidx.paging.compose) + implementation(libs.androidx.work.runtime.ktx) implementation(libs.coil) implementation(libs.copydown) implementation(libs.dagger.hilt.android) - implementation(libs.material.motion.core) - implementation(libs.material.motion.navigation) - implementation(libs.sqldelight.extensions.coroutines) - implementation(libs.kotlin.coroutines.core) + implementation(libs.kotlinx.coroutines.core) implementation(libs.kotlinx.datetime) implementation(libs.kotlinx.serialization.json) + implementation(libs.material.motion.core) + implementation(libs.material.motion.navigation) implementation(libs.retrofit.kotlinxSerializationConverter) - implementation(libs.androidx.work.runtime.ktx) + implementation(libs.sqldelight.extensions.coroutines) } diff --git a/api/build.gradle.kts b/api/build.gradle.kts index c937faf7..884d5d11 100644 --- a/api/build.gradle.kts +++ b/api/build.gradle.kts @@ -9,9 +9,9 @@ dependencies { api(projects.model) api(libs.retrofit.lib) implementation(libs.kotlinx.serialization.core) - testImplementation(libs.kotlinx.serialization.json) - testImplementation(libs.kotlin.coroutines.core) + testImplementation(libs.kotlinx.coroutines.core) testImplementation(kotlin("test-junit")) + testImplementation(libs.kotlinx.serialization.json) testImplementation(libs.retrofit.kotlinxSerializationConverter) testImplementation(libs.retrofit.mock) } diff --git a/benchmark/build.gradle.kts b/benchmark/build.gradle.kts index 4f4d6726..debe0e2e 100644 --- a/benchmark/build.gradle.kts +++ b/benchmark/build.gradle.kts @@ -27,8 +27,8 @@ dependencies { implementation(libs.androidx.benchmark.macro.junit4) implementation(libs.androidx.profileinstaller) implementation(libs.androidx.test.core) - implementation(libs.androidx.test.ext.junit) implementation(libs.androidx.test.espresso.core) + implementation(libs.androidx.test.ext.junit) implementation(libs.androidx.test.rules) implementation(libs.androidx.test.runner) implementation(libs.androidx.test.uiautomator) diff --git a/common/build.gradle.kts b/common/build.gradle.kts index 2d109016..aadeb618 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -28,14 +28,14 @@ kotlin { jvm("desktop") sourceSets["commonMain"].apply { dependencies { - api(compose.runtime) api(compose.foundation) api(compose.material) api(compose.material3) + api(compose.runtime) + api(libs.napier) api(projects.database) api(projects.model) - api(libs.napier) - implementation(libs.kotlin.coroutines.core) + implementation(libs.kotlinx.coroutines.core) implementation(libs.kotlinx.datetime) implementation(libs.compose.richtext.markdown) implementation(libs.compose.richtext.material3) diff --git a/database/build.gradle.kts b/database/build.gradle.kts index d1eba286..4005d902 100644 --- a/database/build.gradle.kts +++ b/database/build.gradle.kts @@ -17,7 +17,7 @@ kotlin { sourceSets["desktopMain"].apply { dependencies { implementation(libs.sqldelight.jvmDriver) } } sourceSets["desktopTest"].apply { dependencies { - implementation(libs.kotlin.coroutines.core) + implementation(libs.kotlinx.coroutines.core) implementation(kotlin("test-junit")) } } diff --git a/desktop/build.gradle.kts b/desktop/build.gradle.kts index 2e3d757d..2287f28d 100644 --- a/desktop/build.gradle.kts +++ b/desktop/build.gradle.kts @@ -17,17 +17,17 @@ kotlin { jvm { compilations.all { kotlinOptions.jvmTarget = "11" } } sourceSets["jvmMain"].apply { dependencies { + implementation(compose.desktop.currentOs) implementation(projects.api) implementation(projects.common) implementation(libs.aurora.component) implementation(libs.aurora.theming) implementation(libs.aurora.window) - implementation(libs.kotlin.coroutines.core) + implementation(libs.kotlinx.coroutines.core) implementation(libs.kotlinx.serialization.json) implementation(libs.multiplatform.paging) implementation(libs.retrofit.lib) implementation(libs.retrofit.kotlinxSerializationConverter) - implementation(compose.desktop.currentOs) } } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1638a67b..e3e6626b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -55,7 +55,7 @@ dagger-hilt-android = { module = "com.google.dagger:hilt-android", version.ref = dagger-hilt-compiler = { module = "com.google.dagger:hilt-compiler", version.ref = "dagger" } javapoet = "com.squareup:javapoet:1.13.0" kamel-image = "com.alialbaali.kamel:kamel-image:0.3.0" -kotlin-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" } +kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" } kotlinx-datetime = "org.jetbrains.kotlinx:kotlinx-datetime:0.4.0" kotlinx-serialization-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core", version.ref = "serialization" } kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization" }