Fix #359 by softening loadResolverConfig signature

Kotlin · Apr 13, 2022 · 6b634a4 · 6b634a4
1 parent be0a2ca
commit 6b634a4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/main/kotlin/org/jetbrains/kotlinx/jupyter/config.kt b/src/main/kotlin/org/jetbrains/kotlinx/jupyter/config.kt
@@ -162,7 +162,7 @@ data class KernelConfig(
                 signatureKey = if (cfg.sigScheme == null || cfg.key == null) "" else cfg.key,
                 scriptClasspath = args.scriptClasspath,
                 homeDir = args.homeDir,
-                resolverConfig = args.homeDir?.let { loadResolverConfig(it.toString(), resolutionInfoProvider) },
+                resolverConfig = loadResolverConfig(args.homeDir?.toString(), resolutionInfoProvider),
                 resolutionInfoProvider = resolutionInfoProvider,
                 embedded = embedded,
                 debugPort = args.debugPort,
@@ -171,4 +171,4 @@ data class KernelConfig(
     }
 }
 
-fun loadResolverConfig(homeDir: String, resolutionInfoProvider: ResolutionInfoProvider) = ResolverConfig(defaultRepositories, getStandardResolver(homeDir, resolutionInfoProvider))
+fun loadResolverConfig(homeDir: String?, resolutionInfoProvider: ResolutionInfoProvider) = ResolverConfig(defaultRepositories, getStandardResolver(homeDir, resolutionInfoProvider))
diff --git a/src/main/kotlin/org/jetbrains/kotlinx/jupyter/ikotlin.kt b/src/main/kotlin/org/jetbrains/kotlinx/jupyter/ikotlin.kt
@@ -101,11 +101,10 @@ fun main(vararg args: String) {
 @Suppress("unused")
 fun embedKernel(cfgFile: File, resolutionInfoProvider: ResolutionInfoProvider?, scriptReceivers: List<Any>? = null) {
     val cp = System.getProperty("java.class.path").split(File.pathSeparator).toTypedArray().map { File(it) }
-    val args = KernelArgs(cfgFile, cp, null, null)
 
     val config = KernelConfig.create(
         resolutionInfoProvider ?: EmptyResolutionInfoProvider,
-        args,
+        KernelArgs(cfgFile, cp, null, null),
         true
     )
     kernelServer(config, scriptReceivers = scriptReceivers ?: emptyList())