Get rid of scripting-dependencies in the shared-compiler module

Author: ileasile

jupyter-lib/shared-compiler/build.gradle.kts

@@ -25,7 +25,6 @@ dependencies {
     compileOnly(libs.kotlin.dev.scriptingCommon)
     compileOnly(libs.kotlin.dev.scriptingJvm)
     compileOnly(libs.kotlin.dev.scriptingCompilerImplUnshaded)
-    compileOnly(libs.kotlin.dev.scriptingDependencies) { isTransitive = false }
 
     // Serialization runtime
     compileOnly(libs.serialization.json)

jupyter-lib/shared-compiler/src/main/kotlin/org/jetbrains/kotlinx/jupyter/config/defaultImports.kt

@@ -1,15 +1,5 @@
 package org.jetbrains.kotlinx.jupyter.config
 
-import kotlin.script.experimental.dependencies.RepositoryCoordinates
-
-val MAVEN_CENTRAL = RepositoryCoordinates("https://repo.maven.apache.org/maven2/")
-val JITPACK = RepositoryCoordinates("https://jitpack.io/")
-
-val defaultRepositories = listOf(
-    MAVEN_CENTRAL,
-    JITPACK,
-)
-
 val defaultGlobalImports = listOf(
     "kotlin.math.*",
     "jupyter.kotlin.*",

src/main/kotlin/org/jetbrains/kotlinx/jupyter/config.kt

@@ -14,19 +14,24 @@ import kotlinx.serialization.json.decodeFromJsonElement
 import kotlinx.serialization.serializer
 import org.jetbrains.kotlinx.jupyter.api.KotlinKernelVersion
 import org.jetbrains.kotlinx.jupyter.common.getNameForUser
-import org.jetbrains.kotlinx.jupyter.config.defaultRepositories
 import org.jetbrains.kotlinx.jupyter.config.getLogger
 import org.jetbrains.kotlinx.jupyter.config.readResourceAsIniFile
 import org.jetbrains.kotlinx.jupyter.dependencies.ResolverConfig
 import org.jetbrains.kotlinx.jupyter.libraries.ResolutionInfoProvider
 import org.jetbrains.kotlinx.jupyter.libraries.getStandardResolver
 import org.zeromq.SocketType
 import java.io.File
+import kotlin.script.experimental.dependencies.RepositoryCoordinates
 
 const val protocolVersion = "5.3"
 
 internal val log by lazy { getLogger() }
 
+val defaultRepositories = listOf(
+    RepositoryCoordinates("https://repo.maven.apache.org/maven2/"),
+    RepositoryCoordinates("https://jitpack.io/"),
+)
+
 val defaultRuntimeProperties by lazy {
     RuntimeKernelProperties(readResourceAsIniFile("runtime.properties"))
 }

jupyter-lib/shared-compiler/src/main/kotlin/org/jetbrains/kotlinx/jupyter/dependencies/JupyterScriptDependenciesResolver.kt renamed to src/main/kotlin/org/jetbrains/kotlinx/jupyter/dependencies/JupyterScriptDependenciesResolver.kt

@@ -0,0 +1,8 @@
+package org.jetbrains.kotlinx.jupyter.dependencies
+
+import kotlin.script.experimental.api.ResultWithDiagnostics
+import kotlin.script.experimental.api.ScriptCompilationConfiguration
+
+interface ScriptDependencyAnnotationHandler {
+    fun configure(configuration: ScriptCompilationConfiguration, annotations: List<Annotation>): ResultWithDiagnostics<ScriptCompilationConfiguration>
+}

jupyter-lib/shared-compiler/src/main/kotlin/org/jetbrains/kotlinx/jupyter/dependencies/RemoteResolverWrapper.kt renamed to src/main/kotlin/org/jetbrains/kotlinx/jupyter/dependencies/RemoteResolverWrapper.kt

@@ -8,10 +8,6 @@ import kotlin.script.experimental.api.asSuccess
 import kotlin.script.experimental.api.onSuccess
 import kotlin.script.experimental.jvm.withUpdatedClasspath
 
-interface ScriptDependencyAnnotationHandler {
-    fun configure(configuration: ScriptCompilationConfiguration, annotations: List<Annotation>): ResultWithDiagnostics<ScriptCompilationConfiguration>
-}
-
 open class ScriptDependencyAnnotationHandlerImpl(private val resolver: JupyterScriptDependenciesResolver) :
     ScriptDependencyAnnotationHandler {
     override fun configure(configuration: ScriptCompilationConfiguration, annotations: List<Annotation>): ResultWithDiagnostics<ScriptCompilationConfiguration> {

jupyter-lib/shared-compiler/src/main/kotlin/org/jetbrains/kotlinx/jupyter/dependencies/ResolverConfig.kt renamed to src/main/kotlin/org/jetbrains/kotlinx/jupyter/dependencies/ResolverConfig.kt

@@ -18,7 +18,7 @@ import org.jetbrains.kotlinx.jupyter.api.VariableStateImpl
 import org.jetbrains.kotlinx.jupyter.api.libraries.ExecutionHost
 import org.jetbrains.kotlinx.jupyter.api.libraries.JupyterIntegration
 import org.jetbrains.kotlinx.jupyter.api.libraries.LibraryDefinition
-import org.jetbrains.kotlinx.jupyter.config.defaultRepositories
+import org.jetbrains.kotlinx.jupyter.defaultRepositories
 import org.jetbrains.kotlinx.jupyter.defaultRuntimeProperties
 import org.jetbrains.kotlinx.jupyter.dependencies.ResolverConfig
 import org.jetbrains.kotlinx.jupyter.libraries.AbstractLibraryResolutionInfo