ソースを参照

Inherit kotlinx-coroutines dependency from ktor

Him188 5 年 前
コミット
870ed59d97

+ 1 - 1
buildSrc/src/main/kotlin/Versions.kt

@@ -14,7 +14,7 @@ object Versions {
 
     object Kotlin {
         const val stdlib = "1.3.71"
-        const val coroutines = "1.3.5"
+        const val coroutines = "1.3.5" // isn't used
         const val atomicFU = "0.14.2"
         const val serialization = "0.20.0"
         const val ktor = "1.3.2"

+ 1 - 2
mirai-core-qqandroid/build.gradle.kts

@@ -8,7 +8,7 @@ plugins {
     id("com.jfrog.bintray") version Versions.Publishing.bintray
 }
 
-description = "QQ protocol library"
+description = "Mirai Protocol implementation for QQ Android"
 
 val isAndroidSDKAvailable: Boolean by project
 
@@ -54,7 +54,6 @@ kotlin {
                 api("org.jetbrains.kotlinx:atomicfu:${Versions.Kotlin.atomicFU}")
                 api(kotlinx("io", Versions.Kotlin.io))
                 api(kotlinx("coroutines-io", Versions.Kotlin.coroutinesIo))
-                api(kotlinx("coroutines-core", Versions.Kotlin.coroutines))
             }
         }
 

+ 2 - 5
mirai-core/build.gradle.kts

@@ -5,11 +5,12 @@ plugins {
     id("kotlinx-atomicfu")
     kotlin("plugin.serialization")
     id("org.jetbrains.dokka")
+    id("signing")
     `maven-publish`
     id("com.jfrog.bintray") version Versions.Publishing.bintray
 }
 
-description = "QQ protocol library"
+description = "Mirai API module"
 
 val isAndroidSDKAvailable: Boolean by project
 
@@ -48,12 +49,10 @@ kotlin {
                 api(kotlin("serialization"))
                 api(kotlin("reflect"))
 
-                api(kotlinx("coroutines-core-common", Versions.Kotlin.coroutines))
                 api(kotlinx("serialization-runtime-common", Versions.Kotlin.serialization))
                 api(kotlinx("serialization-protobuf-common", Versions.Kotlin.serialization))
                 api(kotlinx("io", Versions.Kotlin.io))
                 api(kotlinx("coroutines-io", Versions.Kotlin.coroutinesIo))
-                api(kotlinx("coroutines-core", Versions.Kotlin.coroutines))
 
                 api("org.jetbrains.kotlinx:atomicfu-common:${Versions.Kotlin.atomicFU}")
 
@@ -77,7 +76,6 @@ kotlin {
                     api(kotlinx("io-jvm", Versions.Kotlin.io))
                     api(kotlinx("serialization-runtime", Versions.Kotlin.serialization))
                     api(kotlinx("serialization-protobuf", Versions.Kotlin.serialization))
-                    api(kotlinx("coroutines-android", Versions.Kotlin.coroutines))
                     api(kotlinx("coroutines-io-jvm", Versions.Kotlin.coroutinesIo))
 
                     api(ktor("client-android", Versions.Kotlin.ktor))
@@ -105,7 +103,6 @@ kotlin {
                 api(kotlinx("serialization-runtime", Versions.Kotlin.serialization))
                 api(kotlinx("serialization-protobuf", Versions.Kotlin.serialization))
                 api(kotlinx("coroutines-io-jvm", Versions.Kotlin.coroutinesIo))
-                api(kotlinx("coroutines-core", Versions.Kotlin.coroutines))
 
                 api("org.bouncycastle:bcprov-jdk15on:1.64")
                 runtimeOnly(files("build/classes/kotlin/jvm/main")) // classpath is not properly set by IDE