From 961bbfba53abbbffc235383ed2ae5d8c8e7b7a99 Mon Sep 17 00:00:00 2001 From: Him188 Date: Fri, 18 Sep 2020 01:50:41 +0800 Subject: [PATCH] Make dsl markers BINARY to be resolved --- .../console/internal/MiraiConsoleImplementationBridge.kt | 4 ++-- .../mirai/console/plugin/description/VersionRequirement.kt | 4 ++-- .../mamoe/mirai/console/plugin/jvm/JvmPluginDescription.kt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/internal/MiraiConsoleImplementationBridge.kt b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/internal/MiraiConsoleImplementationBridge.kt index a971e6e3a..09d354e12 100644 --- a/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/internal/MiraiConsoleImplementationBridge.kt +++ b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/internal/MiraiConsoleImplementationBridge.kt @@ -221,9 +221,9 @@ internal object MiraiConsoleImplementationBridge : CoroutineScope, MiraiConsoleI } @Suppress("SpellCheckingInspection") - @Retention(AnnotationRetention.SOURCE) + @Retention(AnnotationRetention.BINARY) @DslMarker - private annotation class ILoveOmaeKumikoForever + internal annotation class ILoveOmaeKumikoForever @ILoveOmaeKumikoForever private inline fun phase(block: () -> Unit) { diff --git a/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugin/description/VersionRequirement.kt b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugin/description/VersionRequirement.kt index b8ec88690..e3a3e6680 100644 --- a/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugin/description/VersionRequirement.kt +++ b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugin/description/VersionRequirement.kt @@ -235,8 +235,8 @@ public sealed class VersionRequirement { } @Suppress("SpellCheckingInspection") - @Retention(AnnotationRetention.SOURCE) + @Retention(AnnotationRetention.BINARY) @DslMarker - private annotation class ILoveKafuuChinoForever + internal annotation class ILoveKafuuChinoForever } } \ No newline at end of file diff --git a/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugin/jvm/JvmPluginDescription.kt b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugin/jvm/JvmPluginDescription.kt index a4e865b81..0b61101bc 100644 --- a/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugin/jvm/JvmPluginDescription.kt +++ b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugin/jvm/JvmPluginDescription.kt @@ -226,7 +226,7 @@ constructor( * 标注一个 [JvmPluginDescription] DSL */ @Suppress("SpellCheckingInspection") - @Retention(AnnotationRetention.SOURCE) + @Retention(AnnotationRetention.BINARY) @DslMarker internal annotation class ILoveKuriyamaMiraiForever // https://zh.moegirl.org.cn/zh-cn/%E6%A0%97%E5%B1%B1%E6%9C%AA%E6%9D%A5 }