Merge branch 'master' into kotlin-1.3.70

mirai-core-qqandroid/build.gradle.kts

@@ -105,7 +105,7 @@ kotlin {
             dependencies {
                 runtimeOnly(files("build/classes/kotlin/jvm/main")) // classpath is not properly set by IDE
                 api(kotlinx("serialization-runtime", serializationVersion))
-                api(kotlinx("serialization-protobuf", serializationVersion))
+                //api(kotlinx("serialization-protobuf", serializationVersion))
             }
         }
 

mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/ExternalImage.kt

@@ -15,7 +15,6 @@ import io.ktor.utils.io.ByteReadChannel
 import io.ktor.utils.io.core.ByteReadPacket
 import io.ktor.utils.io.core.Input
 import kotlinx.io.InputStream
-import kotlinx.serialization.InternalSerializationApi
 import net.mamoe.mirai.contact.Contact
 import net.mamoe.mirai.contact.Group
 import net.mamoe.mirai.contact.QQ
@@ -70,7 +69,6 @@ class ExternalImage private constructor(
         filename: String
     ) : this(width, height, md5, imageFormat, input as Any, input.remaining, filename)
 
-    @OptIn(InternalSerializationApi::class)
     constructor(
         width: Int,
         height: Int,