From c804bbda13b68c4017f18bcca56af98fc4cb413c Mon Sep 17 00:00:00 2001 From: Him188 Date: Sun, 11 Sep 2022 19:47:44 +0800 Subject: [PATCH] [core] Remove dependency on ktor-client for mirai-core-api. Fix duplicated class errors on Android, close #2248 --- mirai-core-api/build.gradle.kts | 2 -- mirai-core-api/src/commonMain/kotlin/IMirai.kt | 2 -- 2 files changed, 4 deletions(-) diff --git a/mirai-core-api/build.gradle.kts b/mirai-core-api/build.gradle.kts index 93c57311f..6c8b7426e 100644 --- a/mirai-core-api/build.gradle.kts +++ b/mirai-core-api/build.gradle.kts @@ -39,7 +39,6 @@ kotlin { api(`kotlinx-serialization-core`) api(`kotlinx-serialization-json`) api(`kotlinx-coroutines-core`) // don't remove it, otherwise IDE will complain - implementation(`ktor-client-core`) implementation(project(":mirai-core-utils")) implementation(project(":mirai-console-compiler-annotations")) @@ -69,7 +68,6 @@ kotlin { dependsOn(commonMain) dependencies { compileOnly(`android-runtime`) -// api(`ktor-client-android`) } } diff --git a/mirai-core-api/src/commonMain/kotlin/IMirai.kt b/mirai-core-api/src/commonMain/kotlin/IMirai.kt index 2d2b6bce3..72e8e6ff2 100644 --- a/mirai-core-api/src/commonMain/kotlin/IMirai.kt +++ b/mirai-core-api/src/commonMain/kotlin/IMirai.kt @@ -9,12 +9,10 @@ @file:Suppress("INTERFACE_NOT_SUPPORTED", "PropertyName") @file:JvmName("Mirai") -@file:OptIn(LowLevelApi::class, MiraiExperimentalApi::class, MiraiInternalApi::class) @file:JvmBlockingBridge package net.mamoe.mirai -import io.ktor.client.* import me.him188.kotlin.jvm.blocking.bridge.JvmBlockingBridge import net.mamoe.mirai.contact.* import net.mamoe.mirai.data.UserProfile