github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-04-25 21:23:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move service to common resources

Browse Source
This commit is contained in:
Him188 2020-11-22 14:33:18 +08:00
parent b8002d4b4d
commit 64b5251779
3 changed files with 2 additions and 1 deletions
mirai-core-api/src/jvmMain/kotlin
findMiraiInstance.kt
mirai-core/src
commonMain/resources/META-INF/services
net.mamoe.mirai.IMirai
jvmTest/kotlin
ContentEqualsTest.kt

2
mirai-core-api/src/jvmMain/kotlin/findMiraiInstance.kt
View File

@ -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
}

0
mirai-core/src/jvmMain/resources/META-INF/services/net.mamoe.mirai.IMirai → mirai-core/src/commonMain/resources/META-INF/services/net.mamoe.mirai.IMirai
View File

1
mirai-core/src/jvmTest/kotlin/ContentEqualsTest.kt
View File

@ -6,6 +6,7 @@
*
* https://github.com/mamoe/mirai/blob/master/LICENSE
*/
package net.mamoe.mirai.internal
import net.mamoe.mirai.message.data.ConstrainSingle