From fdc6ef8a3526b0050484f1bd75ad78ac8258696e Mon Sep 17 00:00:00 2001
From: Him188 <Him188@mamoe.net>
Date: Tue, 1 Sep 2020 22:42:48 +0800
Subject: [PATCH] Move ServiceHelper.kt into internal package

---
 .../mirai/console/internal/plugin/JarPluginLoaderImpl.kt      | 4 ++--
 .../mamoe/mirai/console/internal/plugin/PluginManagerImpl.kt  | 4 ++--
 .../mamoe/mirai/console/{ => internal}/util/ServiceHelper.kt  | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)
 rename backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/{ => internal}/util/ServiceHelper.kt (97%)

diff --git a/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/internal/plugin/JarPluginLoaderImpl.kt b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/internal/plugin/JarPluginLoaderImpl.kt
index 5b2242c58..69b383732 100644
--- a/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/internal/plugin/JarPluginLoaderImpl.kt
+++ b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/internal/plugin/JarPluginLoaderImpl.kt
@@ -15,11 +15,11 @@ import kotlinx.coroutines.ensureActive
 import net.mamoe.mirai.console.MiraiConsole
 import net.mamoe.mirai.console.data.PluginDataStorage
 import net.mamoe.mirai.console.internal.MiraiConsoleImplementationBridge
+import net.mamoe.mirai.console.internal.util.ServiceHelper.findServices
+import net.mamoe.mirai.console.internal.util.ServiceHelper.loadAllServices
 import net.mamoe.mirai.console.plugin.AbstractFilePluginLoader
 import net.mamoe.mirai.console.plugin.PluginLoadException
 import net.mamoe.mirai.console.plugin.jvm.*
-import net.mamoe.mirai.console.util.ServiceHelper.findServices
-import net.mamoe.mirai.console.util.ServiceHelper.loadAllServices
 import net.mamoe.mirai.console.util.childScope
 import net.mamoe.mirai.utils.MiraiLogger
 import net.mamoe.mirai.utils.info
diff --git a/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/internal/plugin/PluginManagerImpl.kt b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/internal/plugin/PluginManagerImpl.kt
index 5a2554f95..56ccd2116 100644
--- a/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/internal/plugin/PluginManagerImpl.kt
+++ b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/internal/plugin/PluginManagerImpl.kt
@@ -17,13 +17,13 @@ import kotlinx.coroutines.Job
 import net.mamoe.mirai.console.MiraiConsole
 import net.mamoe.mirai.console.internal.data.cast
 import net.mamoe.mirai.console.internal.data.mkdir
+import net.mamoe.mirai.console.internal.util.ServiceHelper.findServices
+import net.mamoe.mirai.console.internal.util.ServiceHelper.loadAllServices
 import net.mamoe.mirai.console.plugin.*
 import net.mamoe.mirai.console.plugin.description.PluginDependency
 import net.mamoe.mirai.console.plugin.description.PluginDescription
 import net.mamoe.mirai.console.plugin.description.PluginKind
 import net.mamoe.mirai.console.plugin.jvm.JvmPlugin
-import net.mamoe.mirai.console.util.ServiceHelper.findServices
-import net.mamoe.mirai.console.util.ServiceHelper.loadAllServices
 import net.mamoe.mirai.console.util.childScope
 import net.mamoe.mirai.utils.info
 import java.io.File
diff --git a/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/util/ServiceHelper.kt b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/internal/util/ServiceHelper.kt
similarity index 97%
rename from backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/util/ServiceHelper.kt
rename to backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/internal/util/ServiceHelper.kt
index 3a3bf8dba..0824d2a02 100644
--- a/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/util/ServiceHelper.kt
+++ b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/internal/util/ServiceHelper.kt
@@ -7,13 +7,14 @@
  * https://github.com/mamoe/mirai/blob/master/LICENSE
  */
 
-package net.mamoe.mirai.console.util
+package net.mamoe.mirai.console.internal.util
 
 import net.mamoe.mirai.console.internal.data.cast
 import net.mamoe.mirai.console.internal.data.createInstanceOrNull
 import java.io.InputStream
 import kotlin.reflect.KClass
 
+@Suppress("unused")
 internal class ServiceList<T>(
     internal val classLoader: ClassLoader,
     internal val delegate: List<String>