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

Release version 2.5-RC

Browse Source
This commit is contained in:
Him188 2021-03-20 22:31:54 +08:00
parent f0fefc0657
commit 82b48bfa60
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/mirai-console/src/internal/MiraiConsoleBuildConstants.kt
View File

@ -14,8 +14,8 @@ import java.time.Instant
internal object MiraiConsoleBuildConstants { // auto-filled on build (task :mirai-console:fillBuildConstants)
@JvmStatic
val buildDate: Instant = Instant.ofEpochSecond(1616230573)
const val versionConst: String = "2.5-RC-dev-2"
val buildDate: Instant = Instant.ofEpochSecond(1616248445)
const val versionConst: String = "2.5-RC"
@JvmStatic
val version: SemVersion = SemVersion(versionConst)

12
backend/mirai-console/src/internal/util/CommonUtils.kt
View File

@ -1,10 +1,10 @@
/*
* Copyright 2019-2020 Mamoe Technologies and contributors.
* Copyright 2019-2021 Mamoe Technologies and contributors.
*
* 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证.
* Use of this source code is governed by the GNU AFFERO GENERAL PUBLIC LICENSE version 3 license that can be found through the following link.
* 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证.
* Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link.
*
* https://github.com/mamoe/mirai/blob/master/LICENSE
* https://github.com/mamoe/mirai/blob/master/LICENSE
*/
@file:JvmName("CommonUtils") // maintain binary compatibility
@ -41,14 +41,14 @@ internal fun StackFrame.findLoader(): ClassLoader? {
}.getOrNull()
}
@Suppress("INVISIBLE_REFERENCE", "INVISIBLE_MEMBER")
@Suppress("INVISIBLE_REFERENCE", "INVISIBLE_MEMBER", "UnusedParameter")
@kotlin.internal.LowPriorityInOverloadResolution
internal inline fun <T : Any> T?.ifNull(block: () -> T): T {
contract { callsInPlace(block, InvocationKind.AT_MOST_ONCE) }
return this ?: block()
}
@Suppress("DeprecatedCallableAddReplaceWith")
@Suppress("DeprecatedCallableAddReplaceWith", "UnusedParameter")
@Deprecated("Useless ifNull on not null value.")
@JvmName("ifNull1")
internal inline fun <T : Any> T.ifNull(block: () -> T): T = this

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.5-RC-dev-2" // value is written here automatically during build
const val CORE_VERSION = "2.5-RC-dev-2" // value is written here automatically during build
const val CONSOLE_VERSION = "2.5-RC" // value is written here automatically during build
const val CORE_VERSION = "2.5-RC" // value is written here automatically during build
}