github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-02-16 05:40:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
PeratX 2020-03-05 09:30:54 +08:00
commit c7bf9355aa
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mirai-console/build.gradle.kts
View File

@ -57,7 +57,6 @@ dependencies {
api(kotlinx("serialization-runtime", serializationVersion)) api(kotlinx("serialization-runtime", serializationVersion))
api(kotlinx("coroutines-io", coroutinesIoVersion)) api(kotlinx("coroutines-io", coroutinesIoVersion))
api(kotlinx("coroutines-io-jvm", coroutinesIoVersion)) api(kotlinx("coroutines-io-jvm", coroutinesIoVersion))
api(kotlinx("io-jvm", coroutinesIoVersion))
api("org.bouncycastle:bcprov-jdk15on:1.64") api("org.bouncycastle:bcprov-jdk15on:1.64")

8
mirai-console/src/main/kotlin/net/mamoe/mirai/console/core/MiraiCoreLoader.kt
View File

@ -155,14 +155,14 @@ object MiraiCoreLoader {
}.content }.content
} }
var stream = try { var stream = kotlin.runCatching {
MiraiConsole.logger("Downloading newest Protocol lib from Aliyun") MiraiConsole.logger("Downloading newest Protocol lib from Aliyun")
downloadRequest(lib_aliyun, version) downloadRequest(lib_aliyun, version)
} catch (ignored: Exception) { }.getOrElse {
try { kotlin.runCatching {
MiraiConsole.logger("Downloading newest Protocol lib from JCenter") MiraiConsole.logger("Downloading newest Protocol lib from JCenter")
downloadRequest(lib_jcenter, version) downloadRequest(lib_jcenter, version)
} catch (e: Exception) { }.getOrElse { e ->
MiraiConsole.logger("Failed to download Protocol lib, please seeking for help") MiraiConsole.logger("Failed to download Protocol lib, please seeking for help")
e.printStackTrace() e.printStackTrace()
MiraiConsole.logger("Failed to download Protocol lib, please seeking for help") MiraiConsole.logger("Failed to download Protocol lib, please seeking for help")