From 54eb4387e460b317f7f2b4b8942d1d368d1e63ec Mon Sep 17 00:00:00 2001 From: Him188 Date: Mon, 2 May 2022 10:49:29 +0100 Subject: [PATCH] Make `log4j.Logger.asMiraiLogger` and `useLog4j2` stable --- .../compatibility-validation/android/api/android.api | 2 ++ .../compatibility-validation/jvm/api/jvm.api | 2 ++ .../src/commonMain/kotlin/utils/LoggerAdapters.kt | 10 ++++------ 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/mirai-core-api/compatibility-validation/android/api/android.api b/mirai-core-api/compatibility-validation/android/api/android.api index 1a8bfe572..c2814a3ff 100644 --- a/mirai-core-api/compatibility-validation/android/api/android.api +++ b/mirai-core-api/compatibility-validation/android/api/android.api @@ -6078,7 +6078,9 @@ public final class net/mamoe/mirai/utils/LoggerAdapters { public static final field INSTANCE Lnet/mamoe/mirai/utils/LoggerAdapters; public static final fun asMiraiLogger (Ljava/util/logging/Logger;)Lnet/mamoe/mirai/utils/MiraiLogger; public static final fun asMiraiLogger (Lorg/apache/logging/log4j/Logger;)Lnet/mamoe/mirai/utils/MiraiLogger; + public static final fun asMiraiLogger (Lorg/apache/logging/log4j/Logger;Lorg/apache/logging/log4j/Marker;)Lnet/mamoe/mirai/utils/MiraiLogger; public static final fun asMiraiLogger (Lorg/slf4j/Logger;)Lnet/mamoe/mirai/utils/MiraiLogger; + public static final fun useLog4j2 ()V } public abstract class net/mamoe/mirai/utils/LoginSolver { diff --git a/mirai-core-api/compatibility-validation/jvm/api/jvm.api b/mirai-core-api/compatibility-validation/jvm/api/jvm.api index 5f80d6444..3bdb85c04 100644 --- a/mirai-core-api/compatibility-validation/jvm/api/jvm.api +++ b/mirai-core-api/compatibility-validation/jvm/api/jvm.api @@ -6078,7 +6078,9 @@ public final class net/mamoe/mirai/utils/LoggerAdapters { public static final field INSTANCE Lnet/mamoe/mirai/utils/LoggerAdapters; public static final fun asMiraiLogger (Ljava/util/logging/Logger;)Lnet/mamoe/mirai/utils/MiraiLogger; public static final fun asMiraiLogger (Lorg/apache/logging/log4j/Logger;)Lnet/mamoe/mirai/utils/MiraiLogger; + public static final fun asMiraiLogger (Lorg/apache/logging/log4j/Logger;Lorg/apache/logging/log4j/Marker;)Lnet/mamoe/mirai/utils/MiraiLogger; public static final fun asMiraiLogger (Lorg/slf4j/Logger;)Lnet/mamoe/mirai/utils/MiraiLogger; + public static final fun useLog4j2 ()V } public abstract class net/mamoe/mirai/utils/LoginSolver { diff --git a/mirai-core-api/src/commonMain/kotlin/utils/LoggerAdapters.kt b/mirai-core-api/src/commonMain/kotlin/utils/LoggerAdapters.kt index 750b99b43..8c3c6e7b9 100644 --- a/mirai-core-api/src/commonMain/kotlin/utils/LoggerAdapters.kt +++ b/mirai-core-api/src/commonMain/kotlin/utils/LoggerAdapters.kt @@ -1,10 +1,10 @@ /* - * Copyright 2019-2021 Mamoe Technologies and contributors. + * Copyright 2019-2022 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 */ @file:Suppress("unused") @@ -31,7 +31,6 @@ public object LoggerAdapters { * @since 2.7 */ @JvmStatic - @MiraiExperimentalApi public fun useLog4j2() { DefaultFactoryOverrides.override { requester, identity -> val logger = LogManager.getLogger(requester) @@ -69,7 +68,6 @@ public object LoggerAdapters { * * @since 2.7 */ - @MiraiExperimentalApi @JvmStatic public fun org.apache.logging.log4j.Logger.asMiraiLogger(marker: Marker): MiraiLogger { return Log4jLoggerAdapter(this, marker)