From 5a2229596abff6e043d744a092f24dcc1b296596 Mon Sep 17 00:00:00 2001 From: kr328 Date: Sun, 13 Jun 2021 12:32:10 +0800 Subject: [PATCH] Chore: use coroutine-android instead of core --- app/build.gradle.kts | 6 +++++- common/build.gradle.kts | 2 +- core/build.gradle.kts | 2 +- design/build.gradle.kts | 2 +- service/build.gradle.kts | 7 +++++-- 5 files changed, 13 insertions(+), 6 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 9ed11a3e..c5b9e058 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -26,6 +26,10 @@ android { resValue("integer", "release_code", "$buildVersionCode") } + packagingOptions { + exclude("DebugProbesKt.bin") + } + buildTypes { named("release") { isMinifyEnabled = true @@ -121,7 +125,7 @@ dependencies { premiumImplementation("com.microsoft.appcenter:appcenter-crashes:$appcenterVersion") implementation(kotlin("stdlib-jdk7")) - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutineVersion") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutineVersion") implementation("androidx.core:core-ktx:$coreVersion") implementation("androidx.activity:activity:$activityVersion") implementation("androidx.appcompat:appcompat:$appcompatVersion") diff --git a/common/build.gradle.kts b/common/build.gradle.kts index 859a6c96..3b8e1e34 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -41,7 +41,7 @@ dependencies { implementation(kotlin("stdlib-jdk7")) implementation("androidx.core:core-ktx:$coreVersion") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutineVersion") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutineVersion") } repositories { diff --git a/core/build.gradle.kts b/core/build.gradle.kts index dd3db954..2b67c885 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -82,7 +82,7 @@ dependencies { implementation(kotlin("stdlib-jdk7")) implementation("androidx.core:core-ktx:$coreVersion") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutineVersion") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutineVersion") implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:$serializationVersion") } diff --git a/design/build.gradle.kts b/design/build.gradle.kts index d9762164..e664a2b4 100644 --- a/design/build.gradle.kts +++ b/design/build.gradle.kts @@ -58,7 +58,7 @@ dependencies { api(project(":service")) implementation(kotlin("stdlib-jdk7")) - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutineVersion") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutineVersion") implementation("androidx.core:core-ktx:$coreVersion") implementation("androidx.appcompat:appcompat:$appcompatVersion") implementation("androidx.activity:activity:$activityVersion") diff --git a/service/build.gradle.kts b/service/build.gradle.kts index 469f23d0..f4ecfe76 100644 --- a/service/build.gradle.kts +++ b/service/build.gradle.kts @@ -57,9 +57,12 @@ dependencies { api(project(":core")) api(project(":common")) + implementation(project(":kaidl:kaidl-runtime")) { + exclude(group = "org.jetbrains.kotlinx", module = "kotlinx-coroutines-core") + } + implementation(kotlin("stdlib-jdk7")) - implementation(project(":kaidl:kaidl-runtime")) - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutineVersion") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutineVersion") implementation("androidx.room:room-runtime:$roomVersion") implementation("androidx.room:room-ktx:$roomVersion") implementation("androidx.core:core-ktx:$coreVersion")