From 7ddf93988b6bd95c563f5043681ba3275d127dbf Mon Sep 17 00:00:00 2001 From: Him188 Date: Sat, 15 Feb 2020 14:15:35 +0800 Subject: [PATCH] Remove @JvmStatic for JDK1.6 compatibility --- .../src/commonMain/kotlin/net.mamoe.mirai/contact/Group.kt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/Group.kt b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/Group.kt index 8813ecdd7..a3c2a8ff2 100644 --- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/Group.kt +++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/Group.kt @@ -16,7 +16,6 @@ import net.mamoe.mirai.data.MemberInfo import net.mamoe.mirai.event.events.* import net.mamoe.mirai.utils.MiraiExperimentalAPI import kotlin.jvm.JvmName -import kotlin.jvm.JvmStatic /** * 群. 在 QQ Android 中叫做 "Troop" @@ -145,8 +144,7 @@ interface Group : Contact, CoroutineScope { /** * by @kar98k - */ - @JvmStatic + */ // don't @JvmStatic: JDK 1.8 required fun calculateGroupUinByGroupCode(groupCode: Long): Long { var left: Long = groupCode / 1000000L @@ -163,7 +161,6 @@ interface Group : Contact, CoroutineScope { return left * 1000000L + groupCode % 1000000L } - @JvmStatic fun calculateGroupCodeByGroupUin(groupUin: Long): Long { var left: Long = groupUin / 1000000L