github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-01-10 02:20:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into kotlin-1.3.70

Browse Source
This commit is contained in:
Him188 2020-03-05 15:49:48 +08:00
commit bfcb8606a2
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mirai-core-qqandroid/build.gradle.kts
View File

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

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

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