From 61d4b09f0cf781002ac41322df573e37c7a7ba80 Mon Sep 17 00:00:00 2001 From: Him188 <Him188@mamoe.net> Date: Sat, 18 Mar 2023 19:19:01 +0000 Subject: [PATCH] [build] Update to Kotlin 1.8.10 --- build.gradle.kts | 8 +-- buildSrc/src/main/kotlin/MppPublishing.kt | 19 +++--- buildSrc/src/main/kotlin/ProjectConfigure.kt | 5 +- buildSrc/src/main/kotlin/Versions.kt | 25 ++++---- .../backend/mirai-console/build.gradle.kts | 4 +- .../compatibility-validation/jvm/api/jvm.api | 2 - .../build.gradle.kts | 9 +-- .../mirai-console-terminal/build.gradle.kts | 3 +- .../main/kotlin/MiraiConsoleGradlePlugin.kt | 4 +- mirai-core-api/build.gradle.kts | 4 +- .../android/api/android.api | 62 ------------------- .../compatibility-validation/jvm/api/jvm.api | 62 ------------------- mirai-core-mock/build.gradle.kts | 4 +- .../serverfs/MockServerFileDiskImpl.kt | 4 +- mirai-core-utils/src/jvmMain/kotlin/IO.jvm.kt | 6 +- .../utils/io/serialization/tars/Tars.kt | 10 +-- .../io/serialization/tars/internal/TarsOld.kt | 4 +- .../kotlin/contact/file/AbsoluteFolderTest.kt | 5 +- .../commonTest/kotlin/event/NextEventTest.kt | 4 +- .../notice/processors/BotInvitedJoinTest.kt | 11 ++-- .../notice/processors/FriendNickChangeTest.kt | 7 +-- .../notice/processors/GroupRetrieveTest.kt | 4 +- .../notice/processors/GroupTransferTest.kt | 4 +- .../processors/MemberAdminChangeTest.kt | 5 +- .../notice/processors/MemberJoinTest.kt | 5 +- .../notice/processors/MemberQuitTest.kt | 5 +- .../notice/processors/MessageSyncTest.kt | 4 +- .../kotlin/notice/processors/MessageTest.kt | 5 +- .../kotlin/notice/processors/MuteTest.kt | 5 +- .../event/EventLaunchUndispatchedTest.kt | 5 +- 30 files changed, 75 insertions(+), 229 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index dc5e91751..5f5bd6396 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,5 @@ /* - * Copyright 2019-2022 Mamoe Technologies and contributors. + * Copyright 2019-2023 Mamoe Technologies and contributors. * * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证. * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link. @@ -70,12 +70,6 @@ allprojects { configureKotlinTestSettings() configureKotlinExperimentalUsages() - runCatching { - blockingBridge { - unitCoercion = me.him188.kotlin.jvm.blocking.bridge.compiler.UnitCoercion.COMPATIBILITY - } - } - // useIr() if (isKotlinJvmProject) { diff --git a/buildSrc/src/main/kotlin/MppPublishing.kt b/buildSrc/src/main/kotlin/MppPublishing.kt index ed221be38..1cf7cd3fb 100644 --- a/buildSrc/src/main/kotlin/MppPublishing.kt +++ b/buildSrc/src/main/kotlin/MppPublishing.kt @@ -16,8 +16,8 @@ import org.gradle.jvm.tasks.Jar import org.gradle.kotlin.dsl.get import org.gradle.kotlin.dsl.register -fun logPublishing(message: String) { - println("[Publishing] Configuring $message") +inline fun logPublishing(@Suppress("UNUSED_PARAMETER") message: () -> String) { +// println("[Publishing] Configuring $message") } fun Project.configureMppPublishing() { @@ -42,7 +42,7 @@ fun Project.configureMppPublishing() { afterEvaluate { publishing { - logPublishing("Publications: ${publications.joinToString { it.name }}") + logPublishing { "Publications: ${publications.joinToString { it.name }}" } val (nonJvmPublications, jvmPublications) = publications.filterIsInstance<MavenPublication>() .partition { publication -> tasks.findByName("relocate${publication.name.titlecase()}Dependencies") == null } @@ -93,7 +93,7 @@ private fun Project.configureMultiplatformPublication( publication.artifact(stubJavadoc) publication.setupPom(project) - logPublishing(publication.name + ": moduleName = $moduleName") + logPublishing { publication.name + ": moduleName = $moduleName" } when (moduleName) { "kotlinMultiplatform" -> { publication.artifactId = project.name @@ -103,9 +103,11 @@ private fun Project.configureMultiplatformPublication( // TODO: 2021/1/30 现在添加 JVM 到 root module 会导致 Gradle 依赖无法解决 // https://github.com/mamoe/mirai/issues/932 } + "metadata" -> { // TODO: 2021/1/21 seems no use. none `type` is "metadata" publication.artifactId = "${project.name}-metadata" } + else -> { // "jvm", "native", "js", "common" publication.artifactId = "${project.name}-$moduleName" @@ -123,12 +125,13 @@ val publishPlatformArtifactsInRootModule: Project.(MavenPublication) -> Unit = { // mirai-core\build\libs\mirai-core-2.0.0.jar, classifier=null, ext=jar } - logPublishing("Existing artifacts in kotlinMultiplatform: " + - this.artifacts.joinToString("\n", prefix = "\n") { it.smartToString() } - ) + logPublishing { + "Existing artifacts in kotlinMultiplatform: " + + this.artifacts.joinToString("\n", prefix = "\n") { it.smartToString() } + } platformPublication.artifacts.forEach { - logPublishing("Adding artifact to kotlinMultiplatform: ${it.smartToString()}") + logPublishing { "Adding artifact to kotlinMultiplatform: ${it.smartToString()}" } artifact(it) } diff --git a/buildSrc/src/main/kotlin/ProjectConfigure.kt b/buildSrc/src/main/kotlin/ProjectConfigure.kt index dfa36dd95..bde1f907e 100644 --- a/buildSrc/src/main/kotlin/ProjectConfigure.kt +++ b/buildSrc/src/main/kotlin/ProjectConfigure.kt @@ -1,5 +1,5 @@ /* - * Copyright 2019-2022 Mamoe Technologies and contributors. + * Copyright 2019-2023 Mamoe Technologies and contributors. * * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证. * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link. @@ -23,7 +23,6 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinSingleTargetExtension import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet import org.jetbrains.kotlin.gradle.plugin.KotlinTarget -import org.jetbrains.kotlin.gradle.plugin.LanguageSettingsBuilder import org.jetbrains.kotlin.gradle.targets.jvm.KotlinJvmTarget import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile @@ -250,7 +249,7 @@ val Project.kotlinSourceSets get() = extensions.findByName("kotlin").safeAs<Kotl val Project.kotlinTargets get() = - extensions.findByName("kotlin").safeAs<KotlinSingleTargetExtension>()?.target?.let { listOf(it) } + extensions.findByName("kotlin").safeAs<KotlinSingleTargetExtension<*>>()?.target?.let { listOf(it) } ?: extensions.findByName("kotlin").safeAs<KotlinMultiplatformExtension>()?.targets val Project.isKotlinJvmProject: Boolean get() = extensions.findByName("kotlin") is KotlinJvmProjectExtension diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index d0da34ab7..3e0060f97 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -1,5 +1,5 @@ /* - * Copyright 2019-2022 Mamoe Technologies and contributors. + * Copyright 2019-2023 Mamoe Technologies and contributors. * * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证. * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link. @@ -31,15 +31,15 @@ object Versions { val consoleIntellij get() = "223-$project-172-1" // idea-mirai-kotlin-patch val consoleTerminal get() = project - const val kotlinCompiler = "1.7.10" + const val kotlinCompiler = "1.8.10" const val kotlinStdlib = kotlinCompiler - const val dokka = "1.7.10" + const val dokka = "1.8.10" - const val kotlinCompilerForIdeaPlugin = "1.7.20" + const val kotlinCompilerForIdeaPlugin = "1.8.10" const val coroutines = "1.6.4" - const val atomicFU = "0.18.3" - const val serialization = "1.3.3" + const val atomicFU = "0.20.0" + const val serialization = "1.5.0" /** * 注意, 不要轻易升级 ktor 版本. 阅读 [RelocationNotes], 尤其是间接依赖部分. @@ -50,14 +50,14 @@ object Versions { const val binaryValidator = "0.4.0" - const val blockingBridge = "2.1.0-170.1" - const val dynamicDelegation = "0.3.0-170.1" - const val mavenCentralPublish = "1.0.0-dev-3" + const val blockingBridge = "3.0.0-180.1" + const val dynamicDelegation = "0.4.0-180.1" + const val mavenCentralPublish = "1.0.0" const val androidGradlePlugin = "4.1.1" const val android = "4.1.1.4" - const val shadow = "7.1.3-mirai-modified-SNAPSHOT" + const val shadow = "8.1.0" const val logback = "1.3.4" const val slf4j = "2.0.3" @@ -72,7 +72,7 @@ object Versions { const val junit = "5.7.2" const val yamlkt = "0.12.0" - const val intellijGradlePlugin = "1.11.0" + const val intellijGradlePlugin = "1.13.2" // https://github.com/google/jimfs // Java In Memory File System @@ -103,6 +103,9 @@ val `kotlinx-serialization-json` = kotlinx("serialization-json", Versions.serial val `kotlinx-serialization-protobuf` = kotlinx("serialization-protobuf", Versions.serialization) const val `kotlinx-atomicfu` = "org.jetbrains.kotlinx:atomicfu:${Versions.atomicFU}" +const val `kotlin-jvm-blocking-bridge` = "me.him188:kotlin-jvm-blocking-bridge-runtime:${Versions.blockingBridge}" +const val `kotlin-dynamic-delegation` = "me.him188:kotlin-dynamic-delegation:${Versions.dynamicDelegation}" + /** * @see relocateImplementation */ diff --git a/mirai-console/backend/mirai-console/build.gradle.kts b/mirai-console/backend/mirai-console/build.gradle.kts index 338e698ed..3843f8530 100644 --- a/mirai-console/backend/mirai-console/build.gradle.kts +++ b/mirai-console/backend/mirai-console/build.gradle.kts @@ -1,5 +1,5 @@ /* - * Copyright 2019-2022 Mamoe Technologies and contributors. + * Copyright 2019-2023 Mamoe Technologies and contributors. * * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证. * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link. @@ -62,6 +62,8 @@ dependencies { smartImplementation(`maven-resolver-connector-basic`) smartImplementation(`maven-resolver-transport-http`) smartImplementation(`slf4j-api`) + smartImplementation(`kotlin-jvm-blocking-bridge`) + smartImplementation(`kotlin-dynamic-delegation`) smartApi(`kotlinx-coroutines-jdk8`) testApi(project(":mirai-core")) diff --git a/mirai-console/backend/mirai-console/compatibility-validation/jvm/api/jvm.api b/mirai-console/backend/mirai-console/compatibility-validation/jvm/api/jvm.api index 603748d78..75b870bd4 100644 --- a/mirai-console/backend/mirai-console/compatibility-validation/jvm/api/jvm.api +++ b/mirai-console/backend/mirai-console/compatibility-validation/jvm/api/jvm.api @@ -1860,7 +1860,6 @@ public final class net/mamoe/mirai/console/plugin/ResourceContainer$Companion { public final class net/mamoe/mirai/console/plugin/center/PluginCenter$PluginInfo$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lnet/mamoe/mirai/console/plugin/center/PluginCenter$PluginInfo$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/console/plugin/center/PluginCenter$PluginInfo; @@ -1876,7 +1875,6 @@ public final class net/mamoe/mirai/console/plugin/center/PluginCenter$PluginInfo public final class net/mamoe/mirai/console/plugin/center/PluginCenter$PluginInsight$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lnet/mamoe/mirai/console/plugin/center/PluginCenter$PluginInsight$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/console/plugin/center/PluginCenter$PluginInsight; diff --git a/mirai-console/frontend/mirai-console-frontend-base/build.gradle.kts b/mirai-console/frontend/mirai-console-frontend-base/build.gradle.kts index 7163d8213..7911948ab 100644 --- a/mirai-console/frontend/mirai-console-frontend-base/build.gradle.kts +++ b/mirai-console/frontend/mirai-console-frontend-base/build.gradle.kts @@ -1,10 +1,10 @@ /* - * Copyright 2019-2021 Mamoe Technologies and contributors. + * Copyright 2019-2023 Mamoe Technologies and contributors. * - * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证. - * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link. + * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证. + * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link. * - * https://github.com/mamoe/mirai/blob/master/LICENSE + * https://github.com/mamoe/mirai/blob/dev/LICENSE */ import BinaryCompatibilityConfigurator.configureBinaryValidator @@ -26,6 +26,7 @@ dependencies { compileAndTestRuntime(project(":mirai-console")) compileAndTestRuntime(project(":mirai-core-api")) compileAndTestRuntime(project(":mirai-core-utils")) + compileAndTestRuntime(`kotlin-jvm-blocking-bridge`) compileAndTestRuntime(`kotlin-stdlib-jdk8`) } diff --git a/mirai-console/frontend/mirai-console-terminal/build.gradle.kts b/mirai-console/frontend/mirai-console-terminal/build.gradle.kts index 3c17c8da1..0e87717cd 100644 --- a/mirai-console/frontend/mirai-console-terminal/build.gradle.kts +++ b/mirai-console/frontend/mirai-console-terminal/build.gradle.kts @@ -1,5 +1,5 @@ /* - * Copyright 2019-2022 Mamoe Technologies and contributors. + * Copyright 2019-2023 Mamoe Technologies and contributors. * * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证. * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link. @@ -24,6 +24,7 @@ dependencies { shadowImplementation(jline) shadowImplementation(jansi) shadowImplementation(project(":mirai-console-frontend-base")) + implementation(`kotlin-jvm-blocking-bridge`) testImplementation(project(":mirai-core")) } diff --git a/mirai-console/tools/gradle-plugin/src/main/kotlin/MiraiConsoleGradlePlugin.kt b/mirai-console/tools/gradle-plugin/src/main/kotlin/MiraiConsoleGradlePlugin.kt index 9a3a75fbe..b983f9602 100644 --- a/mirai-console/tools/gradle-plugin/src/main/kotlin/MiraiConsoleGradlePlugin.kt +++ b/mirai-console/tools/gradle-plugin/src/main/kotlin/MiraiConsoleGradlePlugin.kt @@ -1,5 +1,5 @@ /* - * Copyright 2019-2022 Mamoe Technologies and contributors. + * Copyright 2019-2023 Mamoe Technologies and contributors. * * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证. * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link. @@ -282,7 +282,7 @@ internal val Project.kotlinTargets: Collection<KotlinTarget> return when (kotlinExtension) { is KotlinMultiplatformExtension -> kotlinExtension.targets - is KotlinSingleTargetExtension -> listOf(kotlinExtension.target) + is KotlinSingleTargetExtension<*> -> listOf(kotlinExtension.target) else -> error("[MiraiConsole] Internal error: kotlinExtension is neither KotlinMultiplatformExtension nor KotlinSingleTargetExtension") } } diff --git a/mirai-core-api/build.gradle.kts b/mirai-core-api/build.gradle.kts index 7e2d5ac54..df514ebc6 100644 --- a/mirai-core-api/build.gradle.kts +++ b/mirai-core-api/build.gradle.kts @@ -1,5 +1,5 @@ /* - * Copyright 2019-2022 Mamoe Technologies and contributors. + * Copyright 2019-2023 Mamoe Technologies and contributors. * * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证. * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link. @@ -45,6 +45,8 @@ kotlin { implementation(`kotlinx-serialization-protobuf`) implementation(`kotlinx-atomicfu`) relocateCompileOnly(`ktor-io_relocated`) // runtime from mirai-core-utils + implementation(`kotlin-jvm-blocking-bridge`) + implementation(`kotlin-dynamic-delegation`) } } diff --git a/mirai-core-api/compatibility-validation/android/api/android.api b/mirai-core-api/compatibility-validation/android/api/android.api index 2d8d5bbd3..6ce030efc 100644 --- a/mirai-core-api/compatibility-validation/android/api/android.api +++ b/mirai-core-api/compatibility-validation/android/api/android.api @@ -809,7 +809,6 @@ public final class net/mamoe/mirai/contact/announcement/AnnouncementImage { public final class net/mamoe/mirai/contact/announcement/AnnouncementImage$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lnet/mamoe/mirai/contact/announcement/AnnouncementImage$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/contact/announcement/AnnouncementImage; @@ -849,7 +848,6 @@ public final class net/mamoe/mirai/contact/announcement/AnnouncementParameters { public final class net/mamoe/mirai/contact/announcement/AnnouncementParameters$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lnet/mamoe/mirai/contact/announcement/AnnouncementParameters$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/contact/announcement/AnnouncementParameters; @@ -1198,7 +1196,6 @@ public final class net/mamoe/mirai/data/GroupHonorType { public final class net/mamoe/mirai/data/GroupHonorType$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lnet/mamoe/mirai/data/GroupHonorType$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize-NYH6FXw (Lkotlinx/serialization/encoding/Decoder;)I @@ -1308,7 +1305,6 @@ public final class net/mamoe/mirai/data/RequestEventData$BotInvitedJoinGroupRequ public final class net/mamoe/mirai/data/RequestEventData$BotInvitedJoinGroupRequest$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lnet/mamoe/mirai/data/RequestEventData$BotInvitedJoinGroupRequest$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/data/RequestEventData$BotInvitedJoinGroupRequest; @@ -1352,7 +1348,6 @@ public final class net/mamoe/mirai/data/RequestEventData$MemberJoinRequest : net public final class net/mamoe/mirai/data/RequestEventData$MemberJoinRequest$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lnet/mamoe/mirai/data/RequestEventData$MemberJoinRequest$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/data/RequestEventData$MemberJoinRequest; @@ -1383,7 +1378,6 @@ public final class net/mamoe/mirai/data/RequestEventData$NewFriendRequest : net/ public final class net/mamoe/mirai/data/RequestEventData$NewFriendRequest$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lnet/mamoe/mirai/data/RequestEventData$NewFriendRequest$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/data/RequestEventData$NewFriendRequest; @@ -3197,7 +3191,6 @@ public final class net/mamoe/mirai/message/data/At : net/mamoe/mirai/message/cod public final class net/mamoe/mirai/message/data/At$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lnet/mamoe/mirai/message/data/At$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/message/data/At; @@ -3320,7 +3313,6 @@ public final class net/mamoe/mirai/message/data/Dice : net/mamoe/mirai/message/c public final class net/mamoe/mirai/message/data/Dice$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lnet/mamoe/mirai/message/data/Dice$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/message/data/Dice; @@ -3882,7 +3874,6 @@ public final class net/mamoe/mirai/message/data/Face : net/mamoe/mirai/message/c public final class net/mamoe/mirai/message/data/Face$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lnet/mamoe/mirai/message/data/Face$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/message/data/Face; @@ -3951,7 +3942,6 @@ public final class net/mamoe/mirai/message/data/FlashImage : net/mamoe/mirai/mes public final class net/mamoe/mirai/message/data/FlashImage$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lnet/mamoe/mirai/message/data/FlashImage$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/message/data/FlashImage; @@ -4001,7 +3991,6 @@ public final class net/mamoe/mirai/message/data/ForwardMessage : net/mamoe/mirai public final class net/mamoe/mirai/message/data/ForwardMessage$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lnet/mamoe/mirai/message/data/ForwardMessage$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/message/data/ForwardMessage; @@ -4050,7 +4039,6 @@ public final class net/mamoe/mirai/message/data/ForwardMessage$Node : net/mamoe/ public final class net/mamoe/mirai/message/data/ForwardMessage$Node$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lnet/mamoe/mirai/message/data/ForwardMessage$Node$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/message/data/ForwardMessage$Node; @@ -4293,18 +4281,6 @@ public final class net/mamoe/mirai/message/data/ImageType : java/lang/Enum { public static fun values ()[Lnet/mamoe/mirai/message/data/ImageType; } -public final class net/mamoe/mirai/message/data/ImageType$$serializer : kotlinx/serialization/internal/GeneratedSerializer { - public static final field INSTANCE Lnet/mamoe/mirai/message/data/ImageType$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; - public fun childSerializers ()[Lkotlinx/serialization/KSerializer; - public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; - public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/message/data/ImageType; - public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; - public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V - public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lnet/mamoe/mirai/message/data/ImageType;)V - public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer; -} - public final class net/mamoe/mirai/message/data/ImageType$Companion { public final fun match (Ljava/lang/String;)Lnet/mamoe/mirai/message/data/ImageType; public final fun matchOrNull (Ljava/lang/String;)Lnet/mamoe/mirai/message/data/ImageType; @@ -4328,7 +4304,6 @@ public final class net/mamoe/mirai/message/data/LightApp : net/mamoe/mirai/messa public final class net/mamoe/mirai/message/data/LightApp$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lnet/mamoe/mirai/message/data/LightApp$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/message/data/LightApp; @@ -4503,7 +4478,6 @@ public abstract interface class net/mamoe/mirai/message/data/MessageMetadata : n public final class net/mamoe/mirai/message/data/MessageOrigin$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lnet/mamoe/mirai/message/data/MessageOrigin$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/message/data/MessageOrigin; @@ -4526,18 +4500,6 @@ public final class net/mamoe/mirai/message/data/MessageOriginKind : java/lang/En public static fun values ()[Lnet/mamoe/mirai/message/data/MessageOriginKind; } -public final class net/mamoe/mirai/message/data/MessageOriginKind$$serializer : kotlinx/serialization/internal/GeneratedSerializer { - public static final field INSTANCE Lnet/mamoe/mirai/message/data/MessageOriginKind$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; - public fun childSerializers ()[Lkotlinx/serialization/KSerializer; - public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; - public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/message/data/MessageOriginKind; - public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; - public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V - public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lnet/mamoe/mirai/message/data/MessageOriginKind;)V - public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer; -} - public final class net/mamoe/mirai/message/data/MessageOriginKind$Companion { public final fun serializer ()Lkotlinx/serialization/KSerializer; } @@ -4647,18 +4609,6 @@ public final class net/mamoe/mirai/message/data/MessageSourceKind : java/lang/En public static fun values ()[Lnet/mamoe/mirai/message/data/MessageSourceKind; } -public final class net/mamoe/mirai/message/data/MessageSourceKind$$serializer : kotlinx/serialization/internal/GeneratedSerializer { - public static final field INSTANCE Lnet/mamoe/mirai/message/data/MessageSourceKind$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; - public fun childSerializers ()[Lkotlinx/serialization/KSerializer; - public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; - public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/message/data/MessageSourceKind; - public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; - public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V - public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lnet/mamoe/mirai/message/data/MessageSourceKind;)V - public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer; -} - public final class net/mamoe/mirai/message/data/MessageSourceKind$Companion { public final fun serializer ()Lkotlinx/serialization/KSerializer; } @@ -4766,7 +4716,6 @@ public final class net/mamoe/mirai/message/data/MusicShare : net/mamoe/mirai/mes public final class net/mamoe/mirai/message/data/MusicShare$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lnet/mamoe/mirai/message/data/MusicShare$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/message/data/MusicShare; @@ -4986,7 +4935,6 @@ public final class net/mamoe/mirai/message/data/PlainText : net/mamoe/mirai/mess public final class net/mamoe/mirai/message/data/PlainText$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lnet/mamoe/mirai/message/data/PlainText$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/message/data/PlainText; @@ -5039,7 +4987,6 @@ public final class net/mamoe/mirai/message/data/PokeMessage : net/mamoe/mirai/me public final class net/mamoe/mirai/message/data/PokeMessage$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lnet/mamoe/mirai/message/data/PokeMessage$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/message/data/PokeMessage; @@ -5076,7 +5023,6 @@ public final class net/mamoe/mirai/message/data/QuoteReply : net/mamoe/mirai/mes public final class net/mamoe/mirai/message/data/QuoteReply$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lnet/mamoe/mirai/message/data/QuoteReply$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/message/data/QuoteReply; @@ -5107,7 +5053,6 @@ public final class net/mamoe/mirai/message/data/RawForwardMessage { public final class net/mamoe/mirai/message/data/RawForwardMessage$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lnet/mamoe/mirai/message/data/RawForwardMessage$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/message/data/RawForwardMessage; @@ -5155,7 +5100,6 @@ public final class net/mamoe/mirai/message/data/RichMessageOrigin : net/mamoe/mi public final class net/mamoe/mirai/message/data/RichMessageOrigin$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lnet/mamoe/mirai/message/data/RichMessageOrigin$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/message/data/RichMessageOrigin; @@ -5214,7 +5158,6 @@ public final class net/mamoe/mirai/message/data/ShowImageFlag : net/mamoe/mirai/ public final class net/mamoe/mirai/message/data/SimpleServiceMessage$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lnet/mamoe/mirai/message/data/SimpleServiceMessage$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/message/data/SimpleServiceMessage; @@ -5295,7 +5238,6 @@ public final class net/mamoe/mirai/message/data/VipFace : net/mamoe/mirai/messag public final class net/mamoe/mirai/message/data/VipFace$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lnet/mamoe/mirai/message/data/VipFace$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/message/data/VipFace; @@ -5327,7 +5269,6 @@ public final class net/mamoe/mirai/message/data/VipFace$Kind { public final class net/mamoe/mirai/message/data/VipFace$Kind$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lnet/mamoe/mirai/message/data/VipFace$Kind$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/message/data/VipFace$Kind; @@ -5362,7 +5303,6 @@ public class net/mamoe/mirai/message/data/Voice : net/mamoe/mirai/message/data/P public final class net/mamoe/mirai/message/data/Voice$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lnet/mamoe/mirai/message/data/Voice$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/message/data/Voice; @@ -5636,7 +5576,6 @@ public final class net/mamoe/mirai/utils/DeviceInfo { public final class net/mamoe/mirai/utils/DeviceInfo$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lnet/mamoe/mirai/utils/DeviceInfo$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/utils/DeviceInfo; @@ -5672,7 +5611,6 @@ public final class net/mamoe/mirai/utils/DeviceInfo$Version { public final class net/mamoe/mirai/utils/DeviceInfo$Version$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lnet/mamoe/mirai/utils/DeviceInfo$Version$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/utils/DeviceInfo$Version; diff --git a/mirai-core-api/compatibility-validation/jvm/api/jvm.api b/mirai-core-api/compatibility-validation/jvm/api/jvm.api index a19cb5a71..02bbd4f55 100644 --- a/mirai-core-api/compatibility-validation/jvm/api/jvm.api +++ b/mirai-core-api/compatibility-validation/jvm/api/jvm.api @@ -809,7 +809,6 @@ public final class net/mamoe/mirai/contact/announcement/AnnouncementImage { public final class net/mamoe/mirai/contact/announcement/AnnouncementImage$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lnet/mamoe/mirai/contact/announcement/AnnouncementImage$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/contact/announcement/AnnouncementImage; @@ -849,7 +848,6 @@ public final class net/mamoe/mirai/contact/announcement/AnnouncementParameters { public final class net/mamoe/mirai/contact/announcement/AnnouncementParameters$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lnet/mamoe/mirai/contact/announcement/AnnouncementParameters$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/contact/announcement/AnnouncementParameters; @@ -1198,7 +1196,6 @@ public final class net/mamoe/mirai/data/GroupHonorType { public final class net/mamoe/mirai/data/GroupHonorType$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lnet/mamoe/mirai/data/GroupHonorType$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize-NYH6FXw (Lkotlinx/serialization/encoding/Decoder;)I @@ -1308,7 +1305,6 @@ public final class net/mamoe/mirai/data/RequestEventData$BotInvitedJoinGroupRequ public final class net/mamoe/mirai/data/RequestEventData$BotInvitedJoinGroupRequest$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lnet/mamoe/mirai/data/RequestEventData$BotInvitedJoinGroupRequest$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/data/RequestEventData$BotInvitedJoinGroupRequest; @@ -1352,7 +1348,6 @@ public final class net/mamoe/mirai/data/RequestEventData$MemberJoinRequest : net public final class net/mamoe/mirai/data/RequestEventData$MemberJoinRequest$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lnet/mamoe/mirai/data/RequestEventData$MemberJoinRequest$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/data/RequestEventData$MemberJoinRequest; @@ -1383,7 +1378,6 @@ public final class net/mamoe/mirai/data/RequestEventData$NewFriendRequest : net/ public final class net/mamoe/mirai/data/RequestEventData$NewFriendRequest$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lnet/mamoe/mirai/data/RequestEventData$NewFriendRequest$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/data/RequestEventData$NewFriendRequest; @@ -3197,7 +3191,6 @@ public final class net/mamoe/mirai/message/data/At : net/mamoe/mirai/message/cod public final class net/mamoe/mirai/message/data/At$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lnet/mamoe/mirai/message/data/At$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/message/data/At; @@ -3320,7 +3313,6 @@ public final class net/mamoe/mirai/message/data/Dice : net/mamoe/mirai/message/c public final class net/mamoe/mirai/message/data/Dice$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lnet/mamoe/mirai/message/data/Dice$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/message/data/Dice; @@ -3882,7 +3874,6 @@ public final class net/mamoe/mirai/message/data/Face : net/mamoe/mirai/message/c public final class net/mamoe/mirai/message/data/Face$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lnet/mamoe/mirai/message/data/Face$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/message/data/Face; @@ -3951,7 +3942,6 @@ public final class net/mamoe/mirai/message/data/FlashImage : net/mamoe/mirai/mes public final class net/mamoe/mirai/message/data/FlashImage$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lnet/mamoe/mirai/message/data/FlashImage$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/message/data/FlashImage; @@ -4001,7 +3991,6 @@ public final class net/mamoe/mirai/message/data/ForwardMessage : net/mamoe/mirai public final class net/mamoe/mirai/message/data/ForwardMessage$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lnet/mamoe/mirai/message/data/ForwardMessage$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/message/data/ForwardMessage; @@ -4050,7 +4039,6 @@ public final class net/mamoe/mirai/message/data/ForwardMessage$Node : net/mamoe/ public final class net/mamoe/mirai/message/data/ForwardMessage$Node$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lnet/mamoe/mirai/message/data/ForwardMessage$Node$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/message/data/ForwardMessage$Node; @@ -4293,18 +4281,6 @@ public final class net/mamoe/mirai/message/data/ImageType : java/lang/Enum { public static fun values ()[Lnet/mamoe/mirai/message/data/ImageType; } -public final class net/mamoe/mirai/message/data/ImageType$$serializer : kotlinx/serialization/internal/GeneratedSerializer { - public static final field INSTANCE Lnet/mamoe/mirai/message/data/ImageType$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; - public fun childSerializers ()[Lkotlinx/serialization/KSerializer; - public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; - public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/message/data/ImageType; - public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; - public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V - public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lnet/mamoe/mirai/message/data/ImageType;)V - public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer; -} - public final class net/mamoe/mirai/message/data/ImageType$Companion { public final fun match (Ljava/lang/String;)Lnet/mamoe/mirai/message/data/ImageType; public final fun matchOrNull (Ljava/lang/String;)Lnet/mamoe/mirai/message/data/ImageType; @@ -4328,7 +4304,6 @@ public final class net/mamoe/mirai/message/data/LightApp : net/mamoe/mirai/messa public final class net/mamoe/mirai/message/data/LightApp$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lnet/mamoe/mirai/message/data/LightApp$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/message/data/LightApp; @@ -4503,7 +4478,6 @@ public abstract interface class net/mamoe/mirai/message/data/MessageMetadata : n public final class net/mamoe/mirai/message/data/MessageOrigin$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lnet/mamoe/mirai/message/data/MessageOrigin$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/message/data/MessageOrigin; @@ -4526,18 +4500,6 @@ public final class net/mamoe/mirai/message/data/MessageOriginKind : java/lang/En public static fun values ()[Lnet/mamoe/mirai/message/data/MessageOriginKind; } -public final class net/mamoe/mirai/message/data/MessageOriginKind$$serializer : kotlinx/serialization/internal/GeneratedSerializer { - public static final field INSTANCE Lnet/mamoe/mirai/message/data/MessageOriginKind$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; - public fun childSerializers ()[Lkotlinx/serialization/KSerializer; - public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; - public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/message/data/MessageOriginKind; - public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; - public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V - public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lnet/mamoe/mirai/message/data/MessageOriginKind;)V - public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer; -} - public final class net/mamoe/mirai/message/data/MessageOriginKind$Companion { public final fun serializer ()Lkotlinx/serialization/KSerializer; } @@ -4647,18 +4609,6 @@ public final class net/mamoe/mirai/message/data/MessageSourceKind : java/lang/En public static fun values ()[Lnet/mamoe/mirai/message/data/MessageSourceKind; } -public final class net/mamoe/mirai/message/data/MessageSourceKind$$serializer : kotlinx/serialization/internal/GeneratedSerializer { - public static final field INSTANCE Lnet/mamoe/mirai/message/data/MessageSourceKind$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; - public fun childSerializers ()[Lkotlinx/serialization/KSerializer; - public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; - public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/message/data/MessageSourceKind; - public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; - public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V - public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lnet/mamoe/mirai/message/data/MessageSourceKind;)V - public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer; -} - public final class net/mamoe/mirai/message/data/MessageSourceKind$Companion { public final fun serializer ()Lkotlinx/serialization/KSerializer; } @@ -4766,7 +4716,6 @@ public final class net/mamoe/mirai/message/data/MusicShare : net/mamoe/mirai/mes public final class net/mamoe/mirai/message/data/MusicShare$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lnet/mamoe/mirai/message/data/MusicShare$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/message/data/MusicShare; @@ -4986,7 +4935,6 @@ public final class net/mamoe/mirai/message/data/PlainText : net/mamoe/mirai/mess public final class net/mamoe/mirai/message/data/PlainText$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lnet/mamoe/mirai/message/data/PlainText$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/message/data/PlainText; @@ -5039,7 +4987,6 @@ public final class net/mamoe/mirai/message/data/PokeMessage : net/mamoe/mirai/me public final class net/mamoe/mirai/message/data/PokeMessage$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lnet/mamoe/mirai/message/data/PokeMessage$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/message/data/PokeMessage; @@ -5076,7 +5023,6 @@ public final class net/mamoe/mirai/message/data/QuoteReply : net/mamoe/mirai/mes public final class net/mamoe/mirai/message/data/QuoteReply$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lnet/mamoe/mirai/message/data/QuoteReply$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/message/data/QuoteReply; @@ -5107,7 +5053,6 @@ public final class net/mamoe/mirai/message/data/RawForwardMessage { public final class net/mamoe/mirai/message/data/RawForwardMessage$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lnet/mamoe/mirai/message/data/RawForwardMessage$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/message/data/RawForwardMessage; @@ -5155,7 +5100,6 @@ public final class net/mamoe/mirai/message/data/RichMessageOrigin : net/mamoe/mi public final class net/mamoe/mirai/message/data/RichMessageOrigin$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lnet/mamoe/mirai/message/data/RichMessageOrigin$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/message/data/RichMessageOrigin; @@ -5214,7 +5158,6 @@ public final class net/mamoe/mirai/message/data/ShowImageFlag : net/mamoe/mirai/ public final class net/mamoe/mirai/message/data/SimpleServiceMessage$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lnet/mamoe/mirai/message/data/SimpleServiceMessage$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/message/data/SimpleServiceMessage; @@ -5295,7 +5238,6 @@ public final class net/mamoe/mirai/message/data/VipFace : net/mamoe/mirai/messag public final class net/mamoe/mirai/message/data/VipFace$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lnet/mamoe/mirai/message/data/VipFace$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/message/data/VipFace; @@ -5327,7 +5269,6 @@ public final class net/mamoe/mirai/message/data/VipFace$Kind { public final class net/mamoe/mirai/message/data/VipFace$Kind$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lnet/mamoe/mirai/message/data/VipFace$Kind$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/message/data/VipFace$Kind; @@ -5362,7 +5303,6 @@ public class net/mamoe/mirai/message/data/Voice : net/mamoe/mirai/message/data/P public final class net/mamoe/mirai/message/data/Voice$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lnet/mamoe/mirai/message/data/Voice$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/message/data/Voice; @@ -5636,7 +5576,6 @@ public final class net/mamoe/mirai/utils/DeviceInfo { public final class net/mamoe/mirai/utils/DeviceInfo$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lnet/mamoe/mirai/utils/DeviceInfo$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/utils/DeviceInfo; @@ -5672,7 +5611,6 @@ public final class net/mamoe/mirai/utils/DeviceInfo$Version { public final class net/mamoe/mirai/utils/DeviceInfo$Version$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lnet/mamoe/mirai/utils/DeviceInfo$Version$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/utils/DeviceInfo$Version; diff --git a/mirai-core-mock/build.gradle.kts b/mirai-core-mock/build.gradle.kts index bf77fd8c1..0bc42bc87 100644 --- a/mirai-core-mock/build.gradle.kts +++ b/mirai-core-mock/build.gradle.kts @@ -1,5 +1,5 @@ /* - * Copyright 2019-2022 Mamoe Technologies and contributors. + * Copyright 2019-2023 Mamoe Technologies and contributors. * * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证. * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link. @@ -30,7 +30,7 @@ dependencies { implementation(`ktor-server-core`) implementation(`ktor-server-netty`) implementation(`java-in-memory-file-system`) - + implementation(`kotlin-jvm-blocking-bridge`) } tasks.register("buildRuntimeClasspath") { // this task is used for mirai-mock-framework (external) diff --git a/mirai-core-mock/src/internal/serverfs/MockServerFileDiskImpl.kt b/mirai-core-mock/src/internal/serverfs/MockServerFileDiskImpl.kt index 6b218b1f5..d66545e6a 100644 --- a/mirai-core-mock/src/internal/serverfs/MockServerFileDiskImpl.kt +++ b/mirai-core-mock/src/internal/serverfs/MockServerFileDiskImpl.kt @@ -1,5 +1,5 @@ /* - * Copyright 2019-2022 Mamoe Technologies and contributors. + * Copyright 2019-2023 Mamoe Technologies and contributors. * * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证. * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link. @@ -249,7 +249,7 @@ internal class MockServerFileImpl( system.resolvePath(details.resolve("parent").readText()) .resolve(id.substring(1)) .deleteIfExists() - details.deleteRecursively() + details.deleteRecursivelyMirai() return true } diff --git a/mirai-core-utils/src/jvmMain/kotlin/IO.jvm.kt b/mirai-core-utils/src/jvmMain/kotlin/IO.jvm.kt index 6a51d4b9e..6fb497f53 100644 --- a/mirai-core-utils/src/jvmMain/kotlin/IO.jvm.kt +++ b/mirai-core-utils/src/jvmMain/kotlin/IO.jvm.kt @@ -1,5 +1,5 @@ /* - * Copyright 2019-2021 Mamoe Technologies and contributors. + * Copyright 2019-2023 Mamoe Technologies and contributors. * * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证. * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link. @@ -39,10 +39,10 @@ public fun Path.mkParentDirs() { current.mkdir() } -public fun Path.deleteRecursively(): Boolean { +public fun Path.deleteRecursivelyMirai(): Boolean { // Kotlin added `Path.deleteRecursively()` in 1.8.0 but was experimental if (isFile) return deleteIfExists() if (isDirectory()) { - listDirectoryEntries().forEach { it.deleteRecursively() } + listDirectoryEntries().forEach { it.deleteRecursivelyMirai() } return deleteIfExists() } return false diff --git a/mirai-core/src/commonMain/kotlin/utils/io/serialization/tars/Tars.kt b/mirai-core/src/commonMain/kotlin/utils/io/serialization/tars/Tars.kt index 2f50f4ddd..999b1c751 100644 --- a/mirai-core/src/commonMain/kotlin/utils/io/serialization/tars/Tars.kt +++ b/mirai-core/src/commonMain/kotlin/utils/io/serialization/tars/Tars.kt @@ -1,5 +1,5 @@ /* - * Copyright 2019-2022 Mamoe Technologies and contributors. + * Copyright 2019-2023 Mamoe Technologies and contributors. * * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证. * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link. @@ -13,7 +13,10 @@ package net.mamoe.mirai.internal.utils.io.serialization.tars import io.ktor.utils.io.charsets.* import io.ktor.utils.io.core.* -import kotlinx.serialization.* +import kotlinx.serialization.BinaryFormat +import kotlinx.serialization.DeserializationStrategy +import kotlinx.serialization.SerialFormat +import kotlinx.serialization.SerializationStrategy import kotlinx.serialization.modules.EmptySerializersModule import kotlinx.serialization.modules.SerializersModule import net.mamoe.mirai.internal.utils.io.serialization.tars.internal.DebugLogger @@ -26,9 +29,8 @@ import kotlin.jvm.JvmStatic /** * The main entry point to work with Tars serialization. */ -@OptIn(ExperimentalSerializationApi::class) internal class Tars( - override val serializersModule: SerializersModule = EmptySerializersModule, + override val serializersModule: SerializersModule = EmptySerializersModule(), val charset: Charset = Charsets.UTF_8, ) : SerialFormat, BinaryFormat { private val old = TarsOld(charset) diff --git a/mirai-core/src/commonMain/kotlin/utils/io/serialization/tars/internal/TarsOld.kt b/mirai-core/src/commonMain/kotlin/utils/io/serialization/tars/internal/TarsOld.kt index ed14bb84a..13241e1f5 100644 --- a/mirai-core/src/commonMain/kotlin/utils/io/serialization/tars/internal/TarsOld.kt +++ b/mirai-core/src/commonMain/kotlin/utils/io/serialization/tars/internal/TarsOld.kt @@ -1,5 +1,5 @@ /* - * Copyright 2019-2022 Mamoe Technologies and contributors. + * Copyright 2019-2023 Mamoe Technologies and contributors. * * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证. * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link. @@ -56,7 +56,7 @@ internal fun getSerialId(desc: SerialDescriptor, index: Int): Int? = desc.findAn @OptIn(InternalSerializationApi::class, ExperimentalSerializationApi::class) internal class TarsOld internal constructor( private val charset: Charset, - override val serializersModule: SerializersModule = EmptySerializersModule, + override val serializersModule: SerializersModule = EmptySerializersModule(), ) : SerialFormat, BinaryFormat { diff --git a/mirai-core/src/commonTest/kotlin/contact/file/AbsoluteFolderTest.kt b/mirai-core/src/commonTest/kotlin/contact/file/AbsoluteFolderTest.kt index 86dd7b1a9..01d48df65 100644 --- a/mirai-core/src/commonTest/kotlin/contact/file/AbsoluteFolderTest.kt +++ b/mirai-core/src/commonTest/kotlin/contact/file/AbsoluteFolderTest.kt @@ -1,5 +1,5 @@ /* - * Copyright 2019-2022 Mamoe Technologies and contributors. + * Copyright 2019-2023 Mamoe Technologies and contributors. * * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证. * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link. @@ -7,11 +7,8 @@ * https://github.com/mamoe/mirai/blob/dev/LICENSE */ -@file:JvmBlockingBridge - package net.mamoe.mirai.internal.contact.file -import me.him188.kotlin.jvm.blocking.bridge.JvmBlockingBridge import net.mamoe.mirai.internal.MockBot import net.mamoe.mirai.internal.network.notice.BotAware import net.mamoe.mirai.internal.network.protocol.data.proto.GroupFileCommon diff --git a/mirai-core/src/commonTest/kotlin/event/NextEventTest.kt b/mirai-core/src/commonTest/kotlin/event/NextEventTest.kt index 49b99317b..356c14eec 100644 --- a/mirai-core/src/commonTest/kotlin/event/NextEventTest.kt +++ b/mirai-core/src/commonTest/kotlin/event/NextEventTest.kt @@ -1,5 +1,5 @@ /* - * Copyright 2019-2022 Mamoe Technologies and contributors. + * Copyright 2019-2023 Mamoe Technologies and contributors. * * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证. * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link. @@ -12,12 +12,10 @@ package net.mamoe.mirai.internal.event import kotlinx.coroutines.* -import me.him188.kotlin.jvm.blocking.bridge.JvmBlockingBridge import net.mamoe.mirai.event.* import net.mamoe.mirai.internal.test.runBlockingUnit import kotlin.test.* -@JvmBlockingBridge internal class NextEventTest : AbstractEventTest() { data class TE( val x: Int diff --git a/mirai-core/src/commonTest/kotlin/notice/processors/BotInvitedJoinTest.kt b/mirai-core/src/commonTest/kotlin/notice/processors/BotInvitedJoinTest.kt index 77c4f6ff0..230702e2b 100644 --- a/mirai-core/src/commonTest/kotlin/notice/processors/BotInvitedJoinTest.kt +++ b/mirai-core/src/commonTest/kotlin/notice/processors/BotInvitedJoinTest.kt @@ -1,5 +1,5 @@ /* - * Copyright 2019-2022 Mamoe Technologies and contributors. + * Copyright 2019-2023 Mamoe Technologies and contributors. * * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证. * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link. @@ -7,11 +7,8 @@ * https://github.com/mamoe/mirai/blob/dev/LICENSE */ -@file:JvmBlockingBridge - package net.mamoe.mirai.internal.notice.processors -import me.him188.kotlin.jvm.blocking.bridge.JvmBlockingBridge import net.mamoe.mirai.contact.MemberPermission import net.mamoe.mirai.event.events.BotInvitedJoinGroupRequestEvent import net.mamoe.mirai.event.events.BotJoinGroupEvent @@ -26,7 +23,7 @@ import kotlin.test.assertIs internal class BotInvitedJoinTest : AbstractNoticeProcessorTest() { @Test - fun `invited join`() = runBlockingUnit { + fun `invited join`() = runBlockingUnit { suspend fun runTest() = use { Structmsg.StructMsg( @@ -103,7 +100,7 @@ internal class BotInvitedJoinTest : AbstractNoticeProcessorTest() { } @Test - fun `invited join accepted`() = runBlockingUnit { + fun `invited join accepted`() = runBlockingUnit { // https://github.com/mamoe/mirai/issues/1213 suspend fun runTest() = use( createContext = { attributes -> @@ -154,7 +151,7 @@ internal class BotInvitedJoinTest : AbstractNoticeProcessorTest() { @Test - fun `invitation accepted`() = runBlockingUnit { + fun `invitation accepted`() = runBlockingUnit { suspend fun runTest() = use(createContext = { attributes -> object : NoticeProcessorPipelineImpl.ContextImpl(attributes) { diff --git a/mirai-core/src/commonTest/kotlin/notice/processors/FriendNickChangeTest.kt b/mirai-core/src/commonTest/kotlin/notice/processors/FriendNickChangeTest.kt index 443b9349d..502e1a1fb 100644 --- a/mirai-core/src/commonTest/kotlin/notice/processors/FriendNickChangeTest.kt +++ b/mirai-core/src/commonTest/kotlin/notice/processors/FriendNickChangeTest.kt @@ -1,5 +1,5 @@ /* - * Copyright 2019-2022 Mamoe Technologies and contributors. + * Copyright 2019-2023 Mamoe Technologies and contributors. * * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证. * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link. @@ -7,11 +7,8 @@ * https://github.com/mamoe/mirai/blob/dev/LICENSE */ -@file:JvmBlockingBridge - package net.mamoe.mirai.internal.notice.processors -import me.him188.kotlin.jvm.blocking.bridge.JvmBlockingBridge import net.mamoe.mirai.event.events.FriendNickChangedEvent import net.mamoe.mirai.internal.network.protocol.data.jce.MsgInfo import net.mamoe.mirai.internal.network.protocol.data.jce.MsgType0x210 @@ -27,7 +24,7 @@ import kotlin.test.assertIs internal class FriendNickChangeTest : AbstractNoticeProcessorTest() { @Test - fun `nick changed`() = runBlockingUnit { + fun `nick changed`() = runBlockingUnit { // FriendNickChangedEvent 内容异常 https://github.com/mamoe/mirai/issues/1356 suspend fun runTest() = use { diff --git a/mirai-core/src/commonTest/kotlin/notice/processors/GroupRetrieveTest.kt b/mirai-core/src/commonTest/kotlin/notice/processors/GroupRetrieveTest.kt index 6e26889e3..ead655728 100644 --- a/mirai-core/src/commonTest/kotlin/notice/processors/GroupRetrieveTest.kt +++ b/mirai-core/src/commonTest/kotlin/notice/processors/GroupRetrieveTest.kt @@ -1,16 +1,14 @@ /* - * Copyright 2019-2022 Mamoe Technologies and contributors. + * Copyright 2019-2023 Mamoe Technologies and contributors. * * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证. * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link. * * https://github.com/mamoe/mirai/blob/dev/LICENSE */ -@file:JvmBlockingBridge package net.mamoe.mirai.internal.notice.processors -import me.him188.kotlin.jvm.blocking.bridge.JvmBlockingBridge import net.mamoe.mirai.contact.MemberPermission import net.mamoe.mirai.event.events.BotGroupPermissionChangeEvent import net.mamoe.mirai.event.events.MemberPermissionChangeEvent diff --git a/mirai-core/src/commonTest/kotlin/notice/processors/GroupTransferTest.kt b/mirai-core/src/commonTest/kotlin/notice/processors/GroupTransferTest.kt index 3985fc3b1..8d9c3d393 100644 --- a/mirai-core/src/commonTest/kotlin/notice/processors/GroupTransferTest.kt +++ b/mirai-core/src/commonTest/kotlin/notice/processors/GroupTransferTest.kt @@ -1,16 +1,14 @@ /* - * Copyright 2019-2022 Mamoe Technologies and contributors. + * Copyright 2019-2023 Mamoe Technologies and contributors. * * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证. * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link. * * https://github.com/mamoe/mirai/blob/dev/LICENSE */ -@file:JvmBlockingBridge package net.mamoe.mirai.internal.notice.processors -import me.him188.kotlin.jvm.blocking.bridge.JvmBlockingBridge import net.mamoe.mirai.contact.MemberPermission import net.mamoe.mirai.event.events.BotGroupPermissionChangeEvent import net.mamoe.mirai.event.events.MemberPermissionChangeEvent diff --git a/mirai-core/src/commonTest/kotlin/notice/processors/MemberAdminChangeTest.kt b/mirai-core/src/commonTest/kotlin/notice/processors/MemberAdminChangeTest.kt index efedb9076..4bf73028b 100644 --- a/mirai-core/src/commonTest/kotlin/notice/processors/MemberAdminChangeTest.kt +++ b/mirai-core/src/commonTest/kotlin/notice/processors/MemberAdminChangeTest.kt @@ -1,5 +1,5 @@ /* - * Copyright 2019-2022 Mamoe Technologies and contributors. + * Copyright 2019-2023 Mamoe Technologies and contributors. * * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证. * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link. @@ -7,11 +7,8 @@ * https://github.com/mamoe/mirai/blob/dev/LICENSE */ -@file:JvmBlockingBridge - package net.mamoe.mirai.internal.notice.processors -import me.him188.kotlin.jvm.blocking.bridge.JvmBlockingBridge import net.mamoe.mirai.contact.MemberPermission import net.mamoe.mirai.event.events.BotGroupPermissionChangeEvent import net.mamoe.mirai.event.events.MemberPermissionChangeEvent diff --git a/mirai-core/src/commonTest/kotlin/notice/processors/MemberJoinTest.kt b/mirai-core/src/commonTest/kotlin/notice/processors/MemberJoinTest.kt index 2aef0604b..f78fa2ed0 100644 --- a/mirai-core/src/commonTest/kotlin/notice/processors/MemberJoinTest.kt +++ b/mirai-core/src/commonTest/kotlin/notice/processors/MemberJoinTest.kt @@ -1,5 +1,5 @@ /* - * Copyright 2019-2022 Mamoe Technologies and contributors. + * Copyright 2019-2023 Mamoe Technologies and contributors. * * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证. * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link. @@ -7,11 +7,8 @@ * https://github.com/mamoe/mirai/blob/dev/LICENSE */ -@file:JvmBlockingBridge - package net.mamoe.mirai.internal.notice.processors -import me.him188.kotlin.jvm.blocking.bridge.JvmBlockingBridge import net.mamoe.mirai.contact.MemberPermission import net.mamoe.mirai.event.events.MemberJoinEvent import net.mamoe.mirai.event.events.MemberJoinRequestEvent diff --git a/mirai-core/src/commonTest/kotlin/notice/processors/MemberQuitTest.kt b/mirai-core/src/commonTest/kotlin/notice/processors/MemberQuitTest.kt index 80560af31..fe90cf289 100644 --- a/mirai-core/src/commonTest/kotlin/notice/processors/MemberQuitTest.kt +++ b/mirai-core/src/commonTest/kotlin/notice/processors/MemberQuitTest.kt @@ -1,5 +1,5 @@ /* - * Copyright 2019-2022 Mamoe Technologies and contributors. + * Copyright 2019-2023 Mamoe Technologies and contributors. * * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证. * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link. @@ -7,11 +7,8 @@ * https://github.com/mamoe/mirai/blob/dev/LICENSE */ -@file:JvmBlockingBridge - package net.mamoe.mirai.internal.notice.processors -import me.him188.kotlin.jvm.blocking.bridge.JvmBlockingBridge import net.mamoe.mirai.contact.MemberPermission import net.mamoe.mirai.event.events.MemberLeaveEvent import net.mamoe.mirai.internal.network.protocol.data.proto.OnlinePushTrans diff --git a/mirai-core/src/commonTest/kotlin/notice/processors/MessageSyncTest.kt b/mirai-core/src/commonTest/kotlin/notice/processors/MessageSyncTest.kt index 6edb6d498..f1ac7f181 100644 --- a/mirai-core/src/commonTest/kotlin/notice/processors/MessageSyncTest.kt +++ b/mirai-core/src/commonTest/kotlin/notice/processors/MessageSyncTest.kt @@ -1,5 +1,5 @@ /* - * Copyright 2019-2022 Mamoe Technologies and contributors. + * Copyright 2019-2023 Mamoe Technologies and contributors. * * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证. * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link. @@ -10,7 +10,6 @@ package net.mamoe.mirai.internal.notice.processors import io.ktor.utils.io.core.* -import me.him188.kotlin.jvm.blocking.bridge.JvmBlockingBridge import net.mamoe.mirai.contact.MemberPermission import net.mamoe.mirai.event.events.FriendMessageSyncEvent import net.mamoe.mirai.event.events.GroupMessageSyncEvent @@ -24,7 +23,6 @@ import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertIs -@JvmBlockingBridge internal class MessageSyncTest : AbstractNoticeProcessorTest() { @Test diff --git a/mirai-core/src/commonTest/kotlin/notice/processors/MessageTest.kt b/mirai-core/src/commonTest/kotlin/notice/processors/MessageTest.kt index 2f3899601..7be7350e8 100644 --- a/mirai-core/src/commonTest/kotlin/notice/processors/MessageTest.kt +++ b/mirai-core/src/commonTest/kotlin/notice/processors/MessageTest.kt @@ -1,5 +1,5 @@ /* - * Copyright 2019-2022 Mamoe Technologies and contributors. + * Copyright 2019-2023 Mamoe Technologies and contributors. * * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证. * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link. @@ -7,12 +7,9 @@ * https://github.com/mamoe/mirai/blob/dev/LICENSE */ -@file:JvmBlockingBridge - package net.mamoe.mirai.internal.notice.processors import io.ktor.utils.io.core.* -import me.him188.kotlin.jvm.blocking.bridge.JvmBlockingBridge import net.mamoe.mirai.contact.MemberPermission import net.mamoe.mirai.event.events.FriendMessageEvent import net.mamoe.mirai.event.events.GroupMessageEvent diff --git a/mirai-core/src/commonTest/kotlin/notice/processors/MuteTest.kt b/mirai-core/src/commonTest/kotlin/notice/processors/MuteTest.kt index 2149bb35d..183317989 100644 --- a/mirai-core/src/commonTest/kotlin/notice/processors/MuteTest.kt +++ b/mirai-core/src/commonTest/kotlin/notice/processors/MuteTest.kt @@ -1,5 +1,5 @@ /* - * Copyright 2019-2022 Mamoe Technologies and contributors. + * Copyright 2019-2023 Mamoe Technologies and contributors. * * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证. * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link. @@ -7,11 +7,8 @@ * https://github.com/mamoe/mirai/blob/dev/LICENSE */ -@file:JvmBlockingBridge - package net.mamoe.mirai.internal.notice.processors -import me.him188.kotlin.jvm.blocking.bridge.JvmBlockingBridge import net.mamoe.mirai.contact.MemberPermission import net.mamoe.mirai.event.events.BotMuteEvent import net.mamoe.mirai.event.events.BotUnmuteEvent diff --git a/mirai-core/src/jvmBaseTest/kotlin/event/EventLaunchUndispatchedTest.kt b/mirai-core/src/jvmBaseTest/kotlin/event/EventLaunchUndispatchedTest.kt index 5cd3614d7..8502bab5f 100644 --- a/mirai-core/src/jvmBaseTest/kotlin/event/EventLaunchUndispatchedTest.kt +++ b/mirai-core/src/jvmBaseTest/kotlin/event/EventLaunchUndispatchedTest.kt @@ -1,5 +1,5 @@ /* - * Copyright 2019-2022 Mamoe Technologies and contributors. + * Copyright 2019-2023 Mamoe Technologies and contributors. * * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证. * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link. @@ -7,12 +7,9 @@ * https://github.com/mamoe/mirai/blob/dev/LICENSE */ -@file:JvmBlockingBridge - package net.mamoe.mirai.internal.event import kotlinx.coroutines.* -import me.him188.kotlin.jvm.blocking.bridge.JvmBlockingBridge import net.mamoe.mirai.event.AbstractEvent import net.mamoe.mirai.event.EventPriority import net.mamoe.mirai.event.broadcast