From 446bd67738c22f1dfbd5a000add22481d1f5b6c6 Mon Sep 17 00:00:00 2001 From: Him188 Date: Thu, 5 Mar 2020 08:27:18 +0800 Subject: [PATCH 1/2] Remove kotlinx.io --- mirai-console/build.gradle.kts | 1 - 1 file changed, 1 deletion(-) 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") From 6dc4a24d8cf56da2d221551995087765c8d455c4 Mon Sep 17 00:00:00 2001 From: Him188 Date: Thu, 5 Mar 2020 08:27:27 +0800 Subject: [PATCH 2/2] Use `runCatching` --- .../net/mamoe/mirai/console/core/MiraiCoreLoader.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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")