Merge branch 'dev'

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Version 1.x
 
+## `1.2.1`  2020/8/19
+- 修复在 Java 调用 `group.uploadImage` 时编译出错的问题 (#511)
+- 更新 ktor 到 1.4.0
+
 ## `1.2.0`  2020/8/19
 
 ### 新特性

buildSrc/src/main/kotlin/Versions.kt

@@ -9,7 +9,7 @@
 
 object Versions {
     object Mirai {
-        const val version = "1.2.0"
+        const val version = "1.2.1"
     }
 
     object Kotlin {
@@ -18,7 +18,7 @@ object Versions {
         const val coroutines = "1.3.9"
         const val atomicFU = "0.14.4"
         const val serialization = "1.0.0-RC"
-        const val ktor = "1.3.2-1.4.0-rc"
+        const val ktor = "1.4.0"
         const val binaryValidator = "0.2.3"
 
         const val io = "0.1.16"

mirai-core-qqandroid/build.gradle.kts

@@ -64,7 +64,7 @@ kotlin {
                 api(kotlinx("coroutines-core", Versions.Kotlin.coroutines))
                 implementation(kotlinx("serialization-protobuf", Versions.Kotlin.serialization))
                 api("org.jetbrains.kotlinx:atomicfu:${Versions.Kotlin.atomicFU}")
-                implementation(kotlinx("io", Versions.Kotlin.io)) {
+                api(kotlinx("io", Versions.Kotlin.io)) {
                     exclude("org.jetbrains.kotlin", "kotlin-stdlib")
                 }
                 implementation(kotlinx("coroutines-io", Versions.Kotlin.coroutinesIo))
@@ -99,7 +99,7 @@ kotlin {
             dependencies {
                 runtimeOnly(files("build/classes/kotlin/jvm/main")) // classpath is not properly set by IDE
                 implementation("org.bouncycastle:bcprov-jdk15on:1.64")
-                implementation(kotlinx("io-jvm", Versions.Kotlin.io)) {
+                api(kotlinx("io-jvm", Versions.Kotlin.io)) {
                     exclude("org.jetbrains.kotlin", "kotlin-stdlib")
                 }
                 //    api(kotlinx("coroutines-debug", Versions.Kotlin.coroutines))

mirai-core/build.gradle.kts

@@ -65,8 +65,12 @@ kotlin {
 
                 api(kotlinx("serialization-core", Versions.Kotlin.serialization))
                 implementation(kotlinx("serialization-protobuf", Versions.Kotlin.serialization))
-                implementation(kotlinx("io", Versions.Kotlin.io))
-                implementation(kotlinx("coroutines-io", Versions.Kotlin.coroutinesIo))
+                api(kotlinx("io", Versions.Kotlin.io)) {
+                    exclude("org.jetbrains.kotlin", "kotlin-stdlib")
+                }
+                api(kotlinx("coroutines-io", Versions.Kotlin.coroutinesIo)) {
+                    exclude("org.jetbrains.kotlin", "kotlin-stdlib")
+                }
                 api(kotlinx("coroutines-core", Versions.Kotlin.coroutines))
 
                 implementation("org.jetbrains.kotlinx:atomicfu:${Versions.Kotlin.atomicFU}")
@@ -89,8 +93,12 @@ kotlin {
                 dependencies {
                     api(kotlin("reflect"))
 
-                    implementation(kotlinx("io-jvm", Versions.Kotlin.io))
-                    implementation(kotlinx("coroutines-io-jvm", Versions.Kotlin.coroutinesIo))
+                    api(kotlinx("io-jvm", Versions.Kotlin.io)) {
+                        exclude("org.jetbrains.kotlin", "kotlin-stdlib")
+                    }
+                    api(kotlinx("coroutines-io-jvm", Versions.Kotlin.coroutinesIo)) {
+                        exclude("org.jetbrains.kotlin", "kotlin-stdlib")
+                    }
 
                     api(ktor("client-android", Versions.Kotlin.ktor))
                 }
@@ -115,8 +123,12 @@ kotlin {
                 compileOnly("org.slf4j:slf4j-api:" + Versions.Logging.slf4j)
 
                 api(ktor("client-core-jvm", Versions.Kotlin.ktor))
-                implementation(kotlinx("io-jvm", Versions.Kotlin.io))
-                implementation(kotlinx("coroutines-io-jvm", Versions.Kotlin.coroutinesIo))
+                api(kotlinx("io-jvm", Versions.Kotlin.io)) {
+                    exclude("org.jetbrains.kotlin", "kotlin-stdlib")
+                }
+                api(kotlinx("coroutines-io-jvm", Versions.Kotlin.coroutinesIo)) {
+                    exclude("org.jetbrains.kotlin", "kotlin-stdlib")
+                }
 
                 runtimeOnly(files("build/classes/kotlin/jvm/main")) // classpath is not properly set by IDE
             }
@@ -143,7 +155,8 @@ tasks.withType<com.jfrog.bintray.gradle.tasks.BintrayUploadTask> {
             .forEach { publication ->
                 val moduleFile = buildDir.resolve("publications/${publication.name}/module.json")
                 if (moduleFile.exists()) {
-                    publication.artifact(object : org.gradle.api.publish.maven.internal.artifact.FileBasedMavenArtifact(moduleFile) {
+                    publication.artifact(object :
+                        org.gradle.api.publish.maven.internal.artifact.FileBasedMavenArtifact(moduleFile) {
                         override fun getDefaultExtension() = "module"
                     })
                 }