Commit 7e3ede0d authored by ryoii's avatar ryoii

Merge remote-tracking branch 'origin'

parents 241cf2d5 dc50787b
buildscript { buildscript {
repositories { repositories {
mavenLocal() mavenLocal()
maven { url "https://mirrors.huaweicloud.com/repository/maven" }
jcenter() jcenter()
mavenCentral() mavenCentral()
google() google()
...@@ -9,7 +10,6 @@ buildscript { ...@@ -9,7 +10,6 @@ buildscript {
} }
dependencies { dependencies {
// Do try to waste your time.
classpath 'com.android.tools.build:gradle:3.5.3' classpath 'com.android.tools.build:gradle:3.5.3'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
classpath("com.github.jengelman.gradle.plugins:shadow:5.2.0") classpath("com.github.jengelman.gradle.plugins:shadow:5.2.0")
...@@ -32,14 +32,10 @@ allprojects { ...@@ -32,14 +32,10 @@ allprojects {
group = "net.mamoe" group = "net.mamoe"
version = getProperty("mirai_version") version = getProperty("mirai_version")
// tasks.withType(KotlinCompile).all { task ->
// task.kotlinOptions{
// jvmTarget = '1.6'
// }
// }
repositories { repositories {
mavenLocal() mavenLocal()
maven { url "https://mirrors.huaweicloud.com/repository/maven" }
jcenter() jcenter()
mavenCentral() mavenCentral()
google() google()
......
...@@ -23,7 +23,6 @@ import net.mamoe.mirai.event.events.MessageSendEvent.GroupMessageSendEvent ...@@ -23,7 +23,6 @@ import net.mamoe.mirai.event.events.MessageSendEvent.GroupMessageSendEvent
import net.mamoe.mirai.message.MessageReceipt import net.mamoe.mirai.message.MessageReceipt
import net.mamoe.mirai.message.data.MessageChain import net.mamoe.mirai.message.data.MessageChain
import net.mamoe.mirai.message.data.MessageSource import net.mamoe.mirai.message.data.MessageSource
import net.mamoe.mirai.message.data.quote
import net.mamoe.mirai.utils.MiraiExperimentalAPI import net.mamoe.mirai.utils.MiraiExperimentalAPI
import kotlin.coroutines.CoroutineContext import kotlin.coroutines.CoroutineContext
import kotlin.coroutines.EmptyCoroutineContext import kotlin.coroutines.EmptyCoroutineContext
...@@ -173,7 +172,7 @@ interface Group : Contact, CoroutineScope { ...@@ -173,7 +172,7 @@ interface Group : Contact, CoroutineScope {
fun Member(memberInfo: MemberInfo): Member fun Member(memberInfo: MemberInfo): Member
/** /**
* 向这个对象发送消息. 发送成功后 [message] 中会添加 [MessageSource], 此后可以 [引用回复][quote] 或 [撤回][recall] 这条消息. * 向这个对象发送消息.
* *
* @see FriendMessageSendEvent 发送好友信息事件, cancellable * @see FriendMessageSendEvent 发送好友信息事件, cancellable
* @see GroupMessageSendEvent 发送群消息事件. cancellable * @see GroupMessageSendEvent 发送群消息事件. cancellable
......
...@@ -21,7 +21,6 @@ import net.mamoe.mirai.event.events.MessageSendEvent.FriendMessageSendEvent ...@@ -21,7 +21,6 @@ import net.mamoe.mirai.event.events.MessageSendEvent.FriendMessageSendEvent
import net.mamoe.mirai.event.events.MessageSendEvent.GroupMessageSendEvent import net.mamoe.mirai.event.events.MessageSendEvent.GroupMessageSendEvent
import net.mamoe.mirai.message.MessageReceipt import net.mamoe.mirai.message.MessageReceipt
import net.mamoe.mirai.message.data.MessageChain import net.mamoe.mirai.message.data.MessageChain
import net.mamoe.mirai.message.data.MessageSource
import net.mamoe.mirai.utils.MiraiExperimentalAPI import net.mamoe.mirai.utils.MiraiExperimentalAPI
/** /**
...@@ -76,7 +75,7 @@ interface QQ : Contact, CoroutineScope { ...@@ -76,7 +75,7 @@ interface QQ : Contact, CoroutineScope {
suspend fun queryRemark(): FriendNameRemark suspend fun queryRemark(): FriendNameRemark
/** /**
* 向这个对象发送消息. 发送成功后 [message] 中会添加 [MessageSource], 此后可以 [撤回][recall] 这条消息. * 向这个对象发送消息.
* *
* @see FriendMessageSendEvent 发送好友信息事件, cancellable * @see FriendMessageSendEvent 发送好友信息事件, cancellable
* @see GroupMessageSendEvent 发送群消息事件. cancellable * @see GroupMessageSendEvent 发送群消息事件. cancellable
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment