From 64b5251779d41f6d8e1bb8c9d2fc7b90ed6bd7be Mon Sep 17 00:00:00 2001 From: Him188 Date: Sun, 22 Nov 2020 14:33:18 +0800 Subject: [PATCH] Move service to common resources --- mirai-core-api/src/jvmMain/kotlin/findMiraiInstance.kt | 2 +- .../resources/META-INF/services/net.mamoe.mirai.IMirai | 0 mirai-core/src/jvmTest/kotlin/ContentEqualsTest.kt | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) rename mirai-core/src/{jvmMain => commonMain}/resources/META-INF/services/net.mamoe.mirai.IMirai (100%) diff --git a/mirai-core-api/src/jvmMain/kotlin/findMiraiInstance.kt b/mirai-core-api/src/jvmMain/kotlin/findMiraiInstance.kt index f0716e5b7..a6dae735e 100644 --- a/mirai-core-api/src/jvmMain/kotlin/findMiraiInstance.kt +++ b/mirai-core-api/src/jvmMain/kotlin/findMiraiInstance.kt @@ -14,5 +14,5 @@ import java.util.* @JvmSynthetic internal actual fun findMiraiInstance(): IMirai { return ServiceLoader.load(IMirai::class.java).firstOrNull() - ?: Class.forName("net.mamoe.mirai.internal.MiraiImpl").kotlin.objectInstance as IMirai + ?: Class.forName("net.mamoe.mirai.internal.MiraiImpl\$INSTANCE").kotlin.objectInstance as IMirai } \ No newline at end of file diff --git a/mirai-core/src/jvmMain/resources/META-INF/services/net.mamoe.mirai.IMirai b/mirai-core/src/commonMain/resources/META-INF/services/net.mamoe.mirai.IMirai similarity index 100% rename from mirai-core/src/jvmMain/resources/META-INF/services/net.mamoe.mirai.IMirai rename to mirai-core/src/commonMain/resources/META-INF/services/net.mamoe.mirai.IMirai diff --git a/mirai-core/src/jvmTest/kotlin/ContentEqualsTest.kt b/mirai-core/src/jvmTest/kotlin/ContentEqualsTest.kt index 5c49a21bf..ffa6390a1 100644 --- a/mirai-core/src/jvmTest/kotlin/ContentEqualsTest.kt +++ b/mirai-core/src/jvmTest/kotlin/ContentEqualsTest.kt @@ -6,6 +6,7 @@ * * https://github.com/mamoe/mirai/blob/master/LICENSE */ + package net.mamoe.mirai.internal import net.mamoe.mirai.message.data.ConstrainSingle