From 82b48bfa608ce717eed4f4ab0407bcb23ebe9b06 Mon Sep 17 00:00:00 2001 From: Him188 Date: Sat, 20 Mar 2021 22:31:54 +0800 Subject: [PATCH] Release version 2.5-RC --- .../src/internal/MiraiConsoleBuildConstants.kt | 4 ++-- .../mirai-console/src/internal/util/CommonUtils.kt | 12 ++++++------ tools/gradle-plugin/src/VersionConstants.kt | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/backend/mirai-console/src/internal/MiraiConsoleBuildConstants.kt b/backend/mirai-console/src/internal/MiraiConsoleBuildConstants.kt index c843640ae..7ec7d5a52 100644 --- a/backend/mirai-console/src/internal/MiraiConsoleBuildConstants.kt +++ b/backend/mirai-console/src/internal/MiraiConsoleBuildConstants.kt @@ -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) diff --git a/backend/mirai-console/src/internal/util/CommonUtils.kt b/backend/mirai-console/src/internal/util/CommonUtils.kt index 46411e7dd..74d031a62 100644 --- a/backend/mirai-console/src/internal/util/CommonUtils.kt +++ b/backend/mirai-console/src/internal/util/CommonUtils.kt @@ -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?.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.ifNull(block: () -> T): T = this diff --git a/tools/gradle-plugin/src/VersionConstants.kt b/tools/gradle-plugin/src/VersionConstants.kt index 177897c77..a3388af94 100644 --- a/tools/gradle-plugin/src/VersionConstants.kt +++ b/tools/gradle-plugin/src/VersionConstants.kt @@ -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 } \ No newline at end of file