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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Him188 2021-01-14 17:22:06 +08:00
commit da04234a56
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/mirai-console/src/MiraiConsole.kt
View File

@ -139,6 +139,7 @@ public interface MiraiConsole : CoroutineScope {
@Suppress("UNREACHABLE_CODE") @Suppress("UNREACHABLE_CODE")
private fun addBotImpl(id: Long, password: Any, configuration: BotConfiguration.() -> Unit = {}): Bot { private fun addBotImpl(id: Long, password: Any, configuration: BotConfiguration.() -> Unit = {}): Bot {
var config = BotConfiguration().apply { var config = BotConfiguration().apply {
workingDir = rootDir
fileBasedDeviceInfo() fileBasedDeviceInfo()
redirectNetworkLogToDirectory() redirectNetworkLogToDirectory()
this.botLoggerSupplier = { this.botLoggerSupplier = {
@ -153,6 +154,7 @@ public interface MiraiConsole : CoroutineScope {
config = GlobalComponentStorage.run { config = GlobalComponentStorage.run {
BotConfigurationAlterer.foldExtensions(config) { acc, extension -> BotConfigurationAlterer.foldExtensions(config) { acc, extension ->
extension.alterConfiguration(id, acc) extension.alterConfiguration(id, acc)
} }
} }

2
buildSrc/src/main/kotlin/Versions.kt
View File

@ -13,7 +13,7 @@ import org.gradle.api.attributes.Attribute
object Versions { object Versions {
const val core = "2.0-RC" const val core = "2.0-RC"
const val console = "2.0-RC" const val console = "2.0-RC-dev-2"
const val consoleGraphical = "0.0.7" const val consoleGraphical = "0.0.7"
const val consoleTerminal = console const val consoleTerminal = console