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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Him188 2020-10-02 13:13:37 +08:00
commit 6e16ee3d13
4 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/mirai-console/build.gradle.kts
View File

@ -100,8 +100,8 @@ tasks {
})"""
}
.replace(
Regex("""val version: SemVersion = SemVersion.parse\(".*"\)""")
) { """val version: SemVersion = SemVersion.parse("${project.version}")""" }
Regex("""const val versionConst:\s+String\s+=\s+".*"""")
) { """const val versionConst: String = "${project.version}"""" }
)
}
}

5
backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/internal/MiraiConsoleBuildConstants.kt
View File

@ -14,8 +14,9 @@ import java.time.Instant
internal object MiraiConsoleBuildConstants { // auto-filled on build (task :mirai-console:fillBuildConstants)
@JvmStatic
val buildDate: Instant = Instant.ofEpochSecond(1600663022)
val buildDate: Instant = Instant.ofEpochSecond(1601134282)
const val versionConst: String = "1.0-RC-dev-29"
@JvmStatic
val version: SemVersion = SemVersion("1.0-RC-dev-28")
val version: SemVersion = SemVersion(versionConst)
}

4
frontend/mirai-console-terminal/src/main/kotlin/net/mamoe/mirai/console/terminal/MiraiConsoleImplementationTerminal.kt
View File

@ -151,7 +151,9 @@ val terminal: Terminal = run {
private object ConsoleFrontEndDescImpl : MiraiConsoleFrontEndDescription {
override val name: String get() = "Terminal"
override val vendor: String get() = "Mamoe Technologies"
override val version: SemVersion = net.mamoe.mirai.console.internal.MiraiConsoleBuildConstants.version
// net.mamoe.mirai.console.internal.MiraiConsoleBuildConstants.version
// is console's version not frontend's version
override val version: SemVersion = SemVersion(net.mamoe.mirai.console.internal.MiraiConsoleBuildConstants.versionConst)
}
private val ANSI_RESET = Ansi().reset().toString()

11
frontend/mirai-console-terminal/src/main/kotlin/net/mamoe/mirai/console/terminal/MiraiConsoleTerminalLoader.kt
View File

@ -59,7 +59,8 @@ object MiraiConsoleTerminalLoader {
@ConsoleTerminalExperimentalApi
fun printHelpMessage() {
val help = listOf(
"" to "Mirai-Console[Terminal FrontEnd] v" + kotlin.runCatching {
"" to "Mirai-Console[Terminal FrontEnd] v" + net.mamoe.mirai.console.internal.MiraiConsoleBuildConstants.versionConst,
"" to " [ BackEnd] v" + kotlin.runCatching {
net.mamoe.mirai.console.internal.MiraiConsoleBuildConstants.version
}.getOrElse { "<unknown>" },
"" to "",
@ -171,14 +172,18 @@ internal fun overrideSTD() {
PrintStream(
BufferedOutputStream(
logger = DefaultLogger("stdout").run { ({ line: String? -> info(line) }) }
)
),
false,
"UTF-8"
)
)
System.setErr(
PrintStream(
BufferedOutputStream(
logger = DefaultLogger("stderr").run { ({ line: String? -> warning(line) }) }
)
),
false,
"UTF-8"
)
)
}