diff --git a/mirai-console/build.gradle.kts b/mirai-console/build.gradle.kts index f55755310..bf72ff17d 100644 --- a/mirai-console/build.gradle.kts +++ b/mirai-console/build.gradle.kts @@ -57,7 +57,6 @@ dependencies { api(kotlinx("serialization-runtime", serializationVersion)) api(kotlinx("coroutines-io", coroutinesIoVersion)) api(kotlinx("coroutines-io-jvm", coroutinesIoVersion)) - api(kotlinx("io-jvm", coroutinesIoVersion)) api("org.bouncycastle:bcprov-jdk15on:1.64") diff --git a/mirai-console/src/main/kotlin/net/mamoe/mirai/console/core/MiraiCoreLoader.kt b/mirai-console/src/main/kotlin/net/mamoe/mirai/console/core/MiraiCoreLoader.kt index 13542cb69..8a410c0ad 100644 --- a/mirai-console/src/main/kotlin/net/mamoe/mirai/console/core/MiraiCoreLoader.kt +++ b/mirai-console/src/main/kotlin/net/mamoe/mirai/console/core/MiraiCoreLoader.kt @@ -155,14 +155,14 @@ object MiraiCoreLoader { }.content } - var stream = try { + var stream = kotlin.runCatching { MiraiConsole.logger("Downloading newest Protocol lib from Aliyun") downloadRequest(lib_aliyun, version) - } catch (ignored: Exception) { - try { + }.getOrElse { + kotlin.runCatching { MiraiConsole.logger("Downloading newest Protocol lib from JCenter") downloadRequest(lib_jcenter, version) - } catch (e: Exception) { + }.getOrElse { e -> MiraiConsole.logger("Failed to download Protocol lib, please seeking for help") e.printStackTrace() MiraiConsole.logger("Failed to download Protocol lib, please seeking for help")