Fix Skie Kotlin Compiler Subplugin loading

touchlab · Jun 27, 2024 · ac19bf5 · ac19bf5
1 parent beb6530
commit ac19bf5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/SKIE/kotlin-compiler/core/src/commonMain/kotlin/co/touchlab/skie/spi/SkiePluginLoader.kt b/SKIE/kotlin-compiler/core/src/commonMain/kotlin/co/touchlab/skie/spi/SkiePluginLoader.kt
@@ -5,7 +5,10 @@ import java.util.ServiceLoader
 
 class SkiePluginLoader {
 
-    val pluginRegistrars: List<SkiePluginRegistrar> = ServiceLoader.load(SkiePluginRegistrar::class.java).toList()
+    val pluginRegistrars: List<SkiePluginRegistrar> = ServiceLoader.load(
+        SkiePluginRegistrar::class.java,
+        SkiePluginRegistrar::class.java.classLoader
+    ).toList()
 
     fun registerAll(initPhaseContext: InitPhase.Context) {
         pluginRegistrars.forEach {

diff --git a/...gp_common/kotlin/co/touchlab/skie/compilerinject/interceptor/PhaseInterceptorRegistrar.kt b/...gp_common/kotlin/co/touchlab/skie/compilerinject/interceptor/PhaseInterceptorRegistrar.kt
@@ -36,7 +36,7 @@ object PhaseInterceptorRegistrar {
 
         val phaseInterceptors =
             (this::class.java.classLoader as? URLClassLoader)?.let { ServiceLoaderLite.loadImplementations(it) }
-                ?: ServiceLoader.load(PhaseInterceptor::class.java)
+                ?: ServiceLoader.load(PhaseInterceptor::class.java, this::class.java.classLoader)
 
         phaseInterceptors
             .groupBy { it.getInterceptedPhase() }