diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d953e5a4b..5c2c5bd90 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ #Thu Feb 06 14:10:33 CST 2020 -distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-bin.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStorePath=wrapper/dists diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/ContactImpl.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/ContactImpl.kt index d66f093b9..b9d1f308e 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/ContactImpl.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/ContactImpl.kt @@ -77,7 +77,7 @@ internal class QQImpl( } @Deprecated("for binary compatibility", level = DeprecationLevel.HIDDEN) - override suspend fun sendMessage(message: MessageChain): MessageReceipt { + override suspend fun sendMessage(message: MessageChain) { return this.sendMessage(message as Message) } diff --git a/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/contact/Contact.kt b/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/contact/Contact.kt index a0d0aa3f5..7e5d298fb 100644 --- a/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/contact/Contact.kt +++ b/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/contact/Contact.kt @@ -67,6 +67,7 @@ actual abstract class Contact : CoroutineScope, ContactJavaHappyAPI() { @JvmSynthetic actual abstract suspend fun sendMessage(message: Message): MessageReceipt + @JvmName("sendMessageSuspend") @JvmSynthetic @Deprecated("for binary compatibility", level = DeprecationLevel.HIDDEN) actual abstract suspend fun sendMessage(message: MessageChain): MessageReceipt diff --git a/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/contact/Group.kt b/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/contact/Group.kt index 77cdd68dc..95aa54121 100644 --- a/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/contact/Group.kt +++ b/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/contact/Group.kt @@ -182,6 +182,7 @@ actual abstract class Group : Contact(), CoroutineScope { @JvmSynthetic actual abstract override suspend fun sendMessage(message: Message): MessageReceipt + @JvmName("sendMessageSuspend") @Deprecated("for binary compatibility", level = DeprecationLevel.HIDDEN) @JvmSynthetic actual abstract override suspend fun sendMessage(message: MessageChain): MessageReceipt diff --git a/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/contact/Member.kt b/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/contact/Member.kt index 86b77e998..18450d5e4 100644 --- a/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/contact/Member.kt +++ b/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/contact/Member.kt @@ -18,6 +18,7 @@ import net.mamoe.mirai.event.events.MessageSendEvent.FriendMessageSendEvent import net.mamoe.mirai.event.events.MessageSendEvent.GroupMessageSendEvent import net.mamoe.mirai.message.MessageReceipt import net.mamoe.mirai.message.data.Message +import net.mamoe.mirai.message.data.MessageChain import net.mamoe.mirai.utils.MiraiInternalAPI import net.mamoe.mirai.utils.WeakRefProperty @@ -120,6 +121,11 @@ actual abstract class Member : MemberJavaHappyAPI() { @JvmSynthetic actual abstract override suspend fun sendMessage(message: Message): MessageReceipt + @JvmName("sendMessageSuspend") + @JvmSynthetic + @Deprecated("for binary compatibility", level = DeprecationLevel.HIDDEN) + actual abstract override suspend fun sendMessage(message: MessageChain): MessageReceipt + /** * 踢出该成员. * diff --git a/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/contact/QQ.kt b/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/contact/QQ.kt index f5190bfbe..254747ac3 100644 --- a/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/contact/QQ.kt +++ b/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/contact/QQ.kt @@ -91,6 +91,7 @@ actual abstract class QQ : Contact(), CoroutineScope { @JvmSynthetic actual abstract override suspend fun sendMessage(message: Message): MessageReceipt + @JvmName("sendMessageSuspend") @JvmSynthetic @Deprecated("for binary compatibility", level = DeprecationLevel.HIDDEN) actual abstract override suspend fun sendMessage(message: MessageChain): MessageReceipt diff --git a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/Contact.kt b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/Contact.kt index e28588d3a..c0126aad5 100644 --- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/Contact.kt +++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/Contact.kt @@ -71,6 +71,7 @@ expect abstract class Contact() : CoroutineScope, ContactJavaHappyAPI { @JvmSynthetic abstract suspend fun sendMessage(message: Message): MessageReceipt + @JvmName("sendMessageSuspend") @Deprecated("for binary compatibility", level = DeprecationLevel.HIDDEN) @JvmSynthetic abstract suspend fun sendMessage(message: MessageChain): MessageReceipt 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 c3ecc2b51..826f0ff84 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 @@ -183,6 +183,7 @@ expect abstract class Group() : Contact, CoroutineScope { @JvmSynthetic abstract override suspend fun sendMessage(message: Message): MessageReceipt + @JvmName("sendMessageSuspend") @Deprecated("for binary compatibility", level = DeprecationLevel.HIDDEN) @JvmSynthetic abstract override suspend fun sendMessage(message: MessageChain): MessageReceipt diff --git a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/Member.kt b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/Member.kt index d2daab635..c3a7bff39 100644 --- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/Member.kt +++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/Member.kt @@ -16,6 +16,7 @@ import net.mamoe.mirai.JavaHappyAPI import net.mamoe.mirai.event.events.* import net.mamoe.mirai.message.MessageReceipt import net.mamoe.mirai.message.data.Message +import net.mamoe.mirai.message.data.MessageChain import net.mamoe.mirai.utils.MiraiInternalAPI import net.mamoe.mirai.utils.WeakRefProperty import kotlin.jvm.JvmName @@ -147,6 +148,12 @@ expect abstract class Member() : MemberJavaHappyAPI { @JvmSynthetic @JvmName("sendMessageSuspend") abstract override suspend fun sendMessage(message: Message): MessageReceipt + + @JvmName("sendMessageSuspend") + @JvmSynthetic + @Deprecated("for binary compatibility", level = DeprecationLevel.HIDDEN) + actual abstract override suspend fun sendMessage(message: MessageChain): MessageReceipt + } /** diff --git a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/QQ.kt b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/QQ.kt index daad894df..63276b529 100644 --- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/QQ.kt +++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/QQ.kt @@ -101,6 +101,7 @@ expect abstract class QQ() : Contact, CoroutineScope { @JvmName("sendMessageSuspend") abstract override suspend fun sendMessage(message: Message): MessageReceipt + @JvmName("sendMessageSuspend") @JvmSynthetic @Deprecated("for binary compatibility", level = DeprecationLevel.HIDDEN) abstract override suspend fun sendMessage(message: MessageChain): MessageReceipt diff --git a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/contact/Contact.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/contact/Contact.kt index b72a9710d..12db10e5d 100644 --- a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/contact/Contact.kt +++ b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/contact/Contact.kt @@ -66,6 +66,7 @@ actual abstract class Contact : CoroutineScope, ContactJavaHappyAPI() { @JvmSynthetic actual abstract suspend fun sendMessage(message: Message): MessageReceipt + @JvmName("sendMessageSuspend") @JvmSynthetic @Deprecated("for binary compatibility", level = DeprecationLevel.HIDDEN) actual abstract suspend fun sendMessage(message: MessageChain): MessageReceipt diff --git a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/contact/Group.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/contact/Group.kt index 4b8e406d7..72a293123 100644 --- a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/contact/Group.kt +++ b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/contact/Group.kt @@ -183,6 +183,7 @@ actual abstract class Group : Contact(), CoroutineScope { @JvmSynthetic actual abstract override suspend fun sendMessage(message: Message): MessageReceipt + @JvmName("sendMessageSuspend") @Deprecated("for binary compatibility", level = DeprecationLevel.HIDDEN) @JvmSynthetic actual abstract override suspend fun sendMessage(message: MessageChain): MessageReceipt diff --git a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/contact/Member.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/contact/Member.kt index a556de400..7ff3edd6f 100644 --- a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/contact/Member.kt +++ b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/contact/Member.kt @@ -18,6 +18,7 @@ import net.mamoe.mirai.event.events.MessageSendEvent.FriendMessageSendEvent import net.mamoe.mirai.event.events.MessageSendEvent.GroupMessageSendEvent import net.mamoe.mirai.message.MessageReceipt import net.mamoe.mirai.message.data.Message +import net.mamoe.mirai.message.data.MessageChain import net.mamoe.mirai.utils.MiraiInternalAPI import net.mamoe.mirai.utils.WeakRefProperty @@ -132,6 +133,11 @@ actual abstract class Member : MemberJavaHappyAPI() { @JvmSynthetic actual abstract override suspend fun sendMessage(message: Message): MessageReceipt + @JvmName("sendMessageSuspend") + @JvmSynthetic + @Deprecated("for binary compatibility", level = DeprecationLevel.HIDDEN) + actual abstract override suspend fun sendMessage(message: MessageChain): MessageReceipt + /** * 当且仅当 `[other] is [Member] && [other].id == this.id && [other].group == this.group` 时为 true */ diff --git a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/contact/QQ.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/contact/QQ.kt index 11464c5b9..566a9d22d 100644 --- a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/contact/QQ.kt +++ b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/contact/QQ.kt @@ -91,6 +91,7 @@ actual abstract class QQ : Contact(), CoroutineScope { @JvmSynthetic actual abstract override suspend fun sendMessage(message: Message): MessageReceipt + @JvmName("sendMessageSuspend") @JvmSynthetic @Deprecated("for binary compatibility", level = DeprecationLevel.HIDDEN) actual abstract override suspend fun sendMessage(message: MessageChain): MessageReceipt