From 0a64654a4f6ba0083b48c290db67c62e123801f0 Mon Sep 17 00:00:00 2001 From: Him188 Date: Sun, 8 Mar 2020 00:49:24 +0800 Subject: [PATCH] Use `kotlinx.io` --- .../mamoe/mirai/qqandroid/io/serialization/IOFormat.kt | 4 ++-- .../mirai/qqandroid/io/serialization/jce/JceInput.kt | 2 +- .../mirai/qqandroid/io/serialization/jce/JceNew.kt | 4 ++-- .../mirai/qqandroid/io/serialization/jce/common.kt | 2 +- .../JceInputTest.kt | 10 ++++++---- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/io/serialization/IOFormat.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/io/serialization/IOFormat.kt index 8f3f2a359..b9c4babcb 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/io/serialization/IOFormat.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/io/serialization/IOFormat.kt @@ -1,7 +1,7 @@ package net.mamoe.mirai.qqandroid.io.serialization -import io.ktor.utils.io.core.Input -import io.ktor.utils.io.core.Output +import kotlinx.io.core.Input +import kotlinx.io.core.Output import kotlinx.serialization.DeserializationStrategy import kotlinx.serialization.SerialFormat import kotlinx.serialization.SerializationStrategy diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/io/serialization/jce/JceInput.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/io/serialization/jce/JceInput.kt index 637551dac..8c1441b9c 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/io/serialization/jce/JceInput.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/io/serialization/jce/JceInput.kt @@ -9,7 +9,7 @@ package net.mamoe.mirai.qqandroid.io.serialization.jce -import io.ktor.utils.io.core.* +import kotlinx.io.core.* import net.mamoe.mirai.qqandroid.io.serialization.Jce import net.mamoe.mirai.qqandroid.io.serialization.JceCharset import net.mamoe.mirai.utils.io.readString diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/io/serialization/jce/JceNew.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/io/serialization/jce/JceNew.kt index 410b23c3b..2dd55063b 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/io/serialization/jce/JceNew.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/io/serialization/jce/JceNew.kt @@ -9,8 +9,8 @@ package net.mamoe.mirai.qqandroid.io.serialization.jce -import io.ktor.utils.io.core.Input -import io.ktor.utils.io.core.Output +import kotlinx.io.core.Input +import kotlinx.io.core.Output import kotlinx.serialization.DeserializationStrategy import kotlinx.serialization.SerialFormat import kotlinx.serialization.SerializationStrategy diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/io/serialization/jce/common.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/io/serialization/jce/common.kt index a1f39126d..84c7a7021 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/io/serialization/jce/common.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/io/serialization/jce/common.kt @@ -9,7 +9,7 @@ package net.mamoe.mirai.qqandroid.io.serialization.jce -import io.ktor.utils.io.core.Output +import kotlinx.io.core.Output import kotlinx.serialization.SerialInfo import net.mamoe.mirai.qqandroid.io.serialization.Jce diff --git a/mirai-core-qqandroid/src/commonTest/kotlin/net.mamoe.mirai.qqandroid.io.serialization/JceInputTest.kt b/mirai-core-qqandroid/src/commonTest/kotlin/net.mamoe.mirai.qqandroid.io.serialization/JceInputTest.kt index 21e5bcd7a..0ced6500e 100644 --- a/mirai-core-qqandroid/src/commonTest/kotlin/net.mamoe.mirai.qqandroid.io.serialization/JceInputTest.kt +++ b/mirai-core-qqandroid/src/commonTest/kotlin/net.mamoe.mirai.qqandroid.io.serialization/JceInputTest.kt @@ -2,7 +2,9 @@ package net.mamoe.mirai.qqandroid.io.serialization -import io.ktor.utils.io.core.* +import kotlinx.io.core.EOFException +import kotlinx.io.core.buildPacket +import kotlinx.io.core.writeFully import kotlinx.serialization.MissingFieldException import kotlinx.serialization.Serializable import net.mamoe.mirai.qqandroid.io.serialization.jce.JceId @@ -63,13 +65,13 @@ internal class JceInputTest { writeJceHead(BYTE, 0) writeByte(2) - listOf(listOf(1, 2, 3, 4), listOf(1, 2, 3, 4)).forEach { + listOf(listOf(1, 2, 3, 4), listOf(1, 2, 3, 4)).forEach { child -> writeJceHead(LIST, 0) writeJceHead(BYTE, 0) - writeByte(it.size.toByte()) + writeByte(child.size.toByte()) - it.forEach { + child.forEach { writeJceHead(INT, 0) writeInt(it) }