github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-02-13 20:02:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update to 2.0-M2 (2.0-M2-dev-14)

Browse Source
This commit is contained in:
Him188 2020-12-28 17:54:32 +08:00
parent 113fc20cf9
commit 7dc5485cea
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/mirai-console/src/command/CommandSender.kt
View File

@ -561,8 +561,6 @@ public open class TempCommandSender internal constructor(
@JvmBlockingBridge
public override suspend fun sendMessage(message: Message): MessageReceipt<Member> {
@Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
@OptIn(net.mamoe.mirai.utils.MemberDeprecatedApi::class)
return user.sendMessage(message) // just throw this error
}
}

2
backend/mirai-console/src/util/ContactUtils.kt
View File

@ -74,7 +74,7 @@ public object ContactUtils {
@JvmStatic
@ConsoleExperimentalApi
public fun Bot.getFriendOrGroupOrNull(id: Long): Contact? {
return this.friends.getOrNull(id) ?: this.groups.getOrNull(id)
return this.friends[id] ?: this.groups[id]
}
/**

6
buildSrc/src/main/kotlin/Versions.kt
View File

@ -12,8 +12,8 @@
import org.gradle.api.attributes.Attribute
object Versions {
const val core = "2.0-M2-dev-4"
const val console = "2.0-M2-dev-4"
const val core = "2.0-M2-dev-14"
const val console = "2.0-M2-dev-14"
const val consoleGraphical = "0.0.7"
const val consoleTerminal = console
@ -26,7 +26,7 @@ object Versions {
const val coroutines = "1.4.0"
const val serialization = "1.0.1"
const val ktor = "1.4.3"
const val ktor = "1.5.0"
const val atomicFU = "0.14.4"
const val androidGradle = "3.6.2"

4
tools/gradle-plugin/src/VersionConstants.kt
View File

@ -10,6 +10,6 @@
package net.mamoe.mirai.console.gradle
internal object VersionConstants {
const val CONSOLE_VERSION = "2.0-M2-dev-4" // value is written here automatically during build
const val CORE_VERSION = "2.0-M2-dev-4" // value is written here automatically during build
const val CONSOLE_VERSION = "2.0-M2-dev-14" // value is written here automatically during build
const val CORE_VERSION = "2.0-M2-dev-14" // value is written here automatically during build
}