From d2965c87f5a934def1a5d33ab242ce943601e1c8 Mon Sep 17 00:00:00 2001 From: Him188 Date: Mon, 28 Dec 2020 18:39:54 +0800 Subject: [PATCH] 2.0-M2 --- .../mirai-console/src/internal/MiraiConsoleBuildConstants.kt | 4 ++-- buildSrc/src/main/kotlin/Versions.kt | 4 ++-- docs/ConfiguringProjects.md | 2 +- tools/gradle-plugin/src/VersionConstants.kt | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/backend/mirai-console/src/internal/MiraiConsoleBuildConstants.kt b/backend/mirai-console/src/internal/MiraiConsoleBuildConstants.kt index 36c29efdb..c070ec9d3 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(1609063576) - const val versionConst: String = "2.0-M2-dev-10" + val buildDate: Instant = Instant.ofEpochSecond(1609151969) + const val versionConst: String = "2.0-M2" @JvmStatic val version: SemVersion = SemVersion(versionConst) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 41621fa52..ed1514a46 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -12,8 +12,8 @@ import org.gradle.api.attributes.Attribute object Versions { - const val core = "2.0-M2-dev-14" - const val console = "2.0-M2-dev-14" + const val core = "2.0-M2" + const val console = "2.0-M2" const val consoleGraphical = "0.0.7" const val consoleTerminal = console diff --git a/docs/ConfiguringProjects.md b/docs/ConfiguringProjects.md index e25704f15..4cf40fd82 100644 --- a/docs/ConfiguringProjects.md +++ b/docs/ConfiguringProjects.md @@ -21,7 +21,7 @@ console 由后端和前端一起工作. 使用时必须选择一个前端. | 版本类型 | 版本号 | |:------:|:------------------------------:| | 稳定 | 1.1.0 | -| 预览 | 2.0-M1-1 | +| 预览 | 2.0-M2 | | 开发 | [![Version]][Bintray Download] | ## 配置项目 diff --git a/tools/gradle-plugin/src/VersionConstants.kt b/tools/gradle-plugin/src/VersionConstants.kt index c77bda47f..9c400aa9e 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.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 + const val CONSOLE_VERSION = "2.0-M2" // value is written here automatically during build + const val CORE_VERSION = "2.0-M2" // value is written here automatically during build } \ No newline at end of file