From 2a7f0a3a8fca5bcaaeaac6400cd8cdb72b166d15 Mon Sep 17 00:00:00 2001 From: Him188 Date: Mon, 1 Feb 2021 09:21:46 +0800 Subject: [PATCH] Don't introduce new file BotConfigurationKt but merge into existing Utils (affected: top-level fun BotConfiguration). apiDump --- .../api/binary-compatibility-validator.api | 1 + .../src/commonMain/kotlin/utils/BotConfiguration.kt | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/binary-compatibility-validator/api/binary-compatibility-validator.api b/binary-compatibility-validator/api/binary-compatibility-validator.api index 2aad74a24..f53f76e59 100644 --- a/binary-compatibility-validator/api/binary-compatibility-validator.api +++ b/binary-compatibility-validator/api/binary-compatibility-validator.api @@ -5862,6 +5862,7 @@ public final class net/mamoe/mirai/utils/SwingSolver : net/mamoe/mirai/utils/Log } public final class net/mamoe/mirai/utils/Utils { + public static final synthetic fun BotConfiguration (Lkotlin/jvm/functions/Function1;)Lnet/mamoe/mirai/utils/BotConfiguration; public static final fun debug (Lnet/mamoe/mirai/utils/MiraiLogger;Lkotlin/jvm/functions/Function0;)V public static final fun debug (Lnet/mamoe/mirai/utils/MiraiLogger;Lkotlin/jvm/functions/Function0;Ljava/lang/Throwable;)V public static final fun error (Lnet/mamoe/mirai/utils/MiraiLogger;Lkotlin/jvm/functions/Function0;)V diff --git a/mirai-core-api/src/commonMain/kotlin/utils/BotConfiguration.kt b/mirai-core-api/src/commonMain/kotlin/utils/BotConfiguration.kt index f514cf93d..ac011c3b7 100644 --- a/mirai-core-api/src/commonMain/kotlin/utils/BotConfiguration.kt +++ b/mirai-core-api/src/commonMain/kotlin/utils/BotConfiguration.kt @@ -9,6 +9,10 @@ @file:Suppress("unused", "DEPRECATION_ERROR", "EXPOSED_SUPER_CLASS", "MemberVisibilityCanBePrivate") +@file:JvmMultifileClass +@file:JvmName("Utils") + + package net.mamoe.mirai.utils import kotlinx.coroutines.Job @@ -392,15 +396,15 @@ public open class BotConfiguration { // open for Java * 构建一个 [BotConfiguration]. * * @see BotConfiguration + * @since 2.3 */ +@JvmSynthetic public inline fun BotConfiguration(block: BotConfiguration.() -> Unit): BotConfiguration { return BotConfiguration().apply(block) } internal val deviceInfoStub: (Bot) -> DeviceInfo = { - @Suppress("DEPRECATION") MiraiLogger.TopLevel.warning("未指定设备信息, 已使用随机设备信息. 请查看 BotConfiguration.deviceInfo 以获取更多信息.") - @Suppress("DEPRECATION") MiraiLogger.TopLevel.warning("Device info isn't specified. Please refer to BotConfiguration.deviceInfo for more information") DeviceInfo.random() } \ No newline at end of file