diff --git a/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/internal/util/JavaPluginSchedulerImpl.kt b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/internal/util/JavaPluginSchedulerImpl.kt index fcbbf5ead..c413f1229 100644 --- a/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/internal/util/JavaPluginSchedulerImpl.kt +++ b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/internal/util/JavaPluginSchedulerImpl.kt @@ -11,7 +11,7 @@ package net.mamoe.mirai.console.internal.util import kotlinx.coroutines.* import kotlinx.coroutines.future.future -import net.mamoe.mirai.console.util.JavaPluginScheduler +import net.mamoe.mirai.console.plugin.jvm.JavaPluginScheduler import java.util.concurrent.Callable import java.util.concurrent.CompletableFuture import java.util.concurrent.Future diff --git a/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugin/jvm/JarPluginLoader.kt b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugin/jvm/JarPluginLoader.kt index 80dfbbac4..4950c2b9e 100644 --- a/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugin/jvm/JarPluginLoader.kt +++ b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugin/jvm/JarPluginLoader.kt @@ -18,6 +18,7 @@ import net.mamoe.mirai.console.util.ConsoleExperimentalAPI /** * 内建的 Jar (JVM) 插件加载器 */ +@ConsoleExperimentalAPI("classname might change") public interface JarPluginLoader : CoroutineScope, FilePluginLoader { /** * [JvmPlugin.loadPluginData] 默认使用的实例 diff --git a/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugin/jvm/JavaPlugin.kt b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugin/jvm/JavaPlugin.kt index b3e89bccc..7f55d7d95 100644 --- a/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugin/jvm/JavaPlugin.kt +++ b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugin/jvm/JavaPlugin.kt @@ -11,7 +11,6 @@ package net.mamoe.mirai.console.plugin.jvm -import net.mamoe.mirai.console.util.JavaPluginScheduler import kotlin.coroutines.CoroutineContext import kotlin.coroutines.EmptyCoroutineContext diff --git a/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/util/JavaPluginScheduler.kt b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugin/jvm/JavaPluginScheduler.kt similarity index 96% rename from backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/util/JavaPluginScheduler.kt rename to backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugin/jvm/JavaPluginScheduler.kt index 17bfe23e3..97a79ceb3 100644 --- a/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/util/JavaPluginScheduler.kt +++ b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugin/jvm/JavaPluginScheduler.kt @@ -10,12 +10,11 @@ @file:JvmMultifileClass @file:JvmName("ConsoleUtils") -package net.mamoe.mirai.console.util +package net.mamoe.mirai.console.plugin.jvm import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Runnable import net.mamoe.mirai.console.internal.util.JavaPluginSchedulerImpl -import net.mamoe.mirai.console.plugin.jvm.JavaPlugin import java.util.concurrent.Callable import java.util.concurrent.CompletableFuture import java.util.concurrent.Future