Browse Source

Chore: use coroutine-android instead of core

kr328 4 years ago
parent
commit
5a2229596a
5 changed files with 13 additions and 6 deletions
  1. 5 1
      app/build.gradle.kts
  2. 1 1
      common/build.gradle.kts
  3. 1 1
      core/build.gradle.kts
  4. 1 1
      design/build.gradle.kts
  5. 5 2
      service/build.gradle.kts

+ 5 - 1
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")

+ 1 - 1
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 {

+ 1 - 1
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")
 }
 

+ 1 - 1
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")

+ 5 - 2
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")