From 113fc20cf9a1e7e893ebf95da4f9ed0671e251f1 Mon Sep 17 00:00:00 2001
From: Him188 <Him188@mamoe.net>
Date: Fri, 25 Dec 2020 20:45:38 +0800
Subject: [PATCH] 2.0-M2-dev-4
---
backend/mirai-console/test/TestMiraiConosle.kt | 2 +-
buildSrc/src/main/kotlin/Versions.kt | 4 ++--
.../src/MiraiConsoleImplementationTerminal.kt | 2 +-
tools/gradle-plugin/src/VersionConstants.kt | 4 ++--
tools/intellij-plugin/build.gradle.kts | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/backend/mirai-console/test/TestMiraiConosle.kt b/backend/mirai-console/test/TestMiraiConosle.kt
index 2c919c5d5..57c93361f 100644
--- a/backend/mirai-console/test/TestMiraiConosle.kt
+++ b/backend/mirai-console/test/TestMiraiConosle.kt
@@ -69,7 +69,7 @@ fun initTestEnvironment() {
}
override fun createLoginSolver(requesterBot: Long, configuration: BotConfiguration): LoginSolver =
- LoginSolver.Default
+ LoginSolver.Default!!
override fun createLogger(identity: String?): MiraiLogger {
return PlatformLogger(identity)
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
index 1e2453c28..237d33dcb 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-M1-1"
- const val console = "2.0-M1-1"
+ const val core = "2.0-M2-dev-4"
+ const val console = "2.0-M2-dev-4"
const val consoleGraphical = "0.0.7"
const val consoleTerminal = console
diff --git a/frontend/mirai-console-terminal/src/MiraiConsoleImplementationTerminal.kt b/frontend/mirai-console-terminal/src/MiraiConsoleImplementationTerminal.kt
index 0488d58ef..6c0cf0231 100644
--- a/frontend/mirai-console-terminal/src/MiraiConsoleImplementationTerminal.kt
+++ b/frontend/mirai-console-terminal/src/MiraiConsoleImplementationTerminal.kt
@@ -78,7 +78,7 @@ class MiraiConsoleImplementationTerminal
override val isAnsiSupported: Boolean get() = true
override fun createLoginSolver(requesterBot: Long, configuration: BotConfiguration): LoginSolver {
- return DefaultLoginSolver(input = { requestInput("LOGIN> ") })
+ return StandardCharImageLoginSolver(input = { requestInput("LOGIN> ") })
}
override fun createLogger(identity: String?): MiraiLogger = LoggerCreator(identity)
diff --git a/tools/gradle-plugin/src/VersionConstants.kt b/tools/gradle-plugin/src/VersionConstants.kt
index 81bad7100..c85d3203d 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-M1-1" // value is written here automatically during build
- const val CORE_VERSION = "2.0-M1-1" // value is written here automatically during build
+ 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
}
\ No newline at end of file
diff --git a/tools/intellij-plugin/build.gradle.kts b/tools/intellij-plugin/build.gradle.kts
index fd562b309..003f7c142 100644
--- a/tools/intellij-plugin/build.gradle.kts
+++ b/tools/intellij-plugin/build.gradle.kts
@@ -52,7 +52,7 @@ tasks.withType<org.jetbrains.intellij.tasks.PatchPluginXmlTask> {
</ul>
""".trimIndent())
changeNotes("""
- See https://github.com/mamoe/mirai-console/releases
+ See <a href="https://github.com/mamoe/mirai-console/releases">https://github.com/mamoe/mirai-console/releases</a>
""".trimIndent())
}