github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-01-11 02:50:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move ServiceHelper.kt into internal package

Browse Source
This commit is contained in:
Him188 2020-09-01 22:42:48 +08:00
parent fe27312421
commit fdc6ef8a35
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/internal/plugin/JarPluginLoaderImpl.kt
View File

@ -15,11 +15,11 @@ import kotlinx.coroutines.ensureActive
import net.mamoe.mirai.console.MiraiConsole import net.mamoe.mirai.console.MiraiConsole
import net.mamoe.mirai.console.data.PluginDataStorage import net.mamoe.mirai.console.data.PluginDataStorage
import net.mamoe.mirai.console.internal.MiraiConsoleImplementationBridge 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.AbstractFilePluginLoader
import net.mamoe.mirai.console.plugin.PluginLoadException import net.mamoe.mirai.console.plugin.PluginLoadException
import net.mamoe.mirai.console.plugin.jvm.* 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.console.util.childScope
import net.mamoe.mirai.utils.MiraiLogger import net.mamoe.mirai.utils.MiraiLogger
import net.mamoe.mirai.utils.info import net.mamoe.mirai.utils.info

4
backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/internal/plugin/PluginManagerImpl.kt
View File

@ -17,13 +17,13 @@ import kotlinx.coroutines.Job
import net.mamoe.mirai.console.MiraiConsole import net.mamoe.mirai.console.MiraiConsole
import net.mamoe.mirai.console.internal.data.cast import net.mamoe.mirai.console.internal.data.cast
import net.mamoe.mirai.console.internal.data.mkdir 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.*
import net.mamoe.mirai.console.plugin.description.PluginDependency import net.mamoe.mirai.console.plugin.description.PluginDependency
import net.mamoe.mirai.console.plugin.description.PluginDescription import net.mamoe.mirai.console.plugin.description.PluginDescription
import net.mamoe.mirai.console.plugin.description.PluginKind import net.mamoe.mirai.console.plugin.description.PluginKind
import net.mamoe.mirai.console.plugin.jvm.JvmPlugin 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.console.util.childScope
import net.mamoe.mirai.utils.info import net.mamoe.mirai.utils.info
import java.io.File import java.io.File

3
backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/util/ServiceHelper.kt → backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/internal/util/ServiceHelper.kt
View File

@ -7,13 +7,14 @@
* https://github.com/mamoe/mirai/blob/master/LICENSE * 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.cast
import net.mamoe.mirai.console.internal.data.createInstanceOrNull import net.mamoe.mirai.console.internal.data.createInstanceOrNull
import java.io.InputStream import java.io.InputStream
import kotlin.reflect.KClass import kotlin.reflect.KClass
@Suppress("unused")
internal class ServiceList<T>( internal class ServiceList<T>(
internal val classLoader: ClassLoader, internal val classLoader: ClassLoader,
internal val delegate: List<String> internal val delegate: List<String>