Switch to Maven dependencies resolver

Author: ileasile

build.gradle.kts

@@ -103,7 +103,7 @@ dependencies {
     implKotlin("scripting-compiler-impl-embeddable")
     implKotlin("scripting-compiler-embeddable")
     implKotlin("scripting-ide-services")
-    implKotlin("main-kts")
+    implKotlin("scripting-dependencies-maven")
     implKotlin("script-util")
     implKotlin("scripting-common")
 

docs/README.md

@@ -8,7 +8,7 @@
 
 # Kotlin kernel for IPython/Jupyter
 
-[Kotlin](https://kotlinlang.org/) (1.5.30-dev-454) kernel for [Jupyter](https://jupyter.org).
+[Kotlin](https://kotlinlang.org/) (1.5.255-SNAPSHOT) kernel for [Jupyter](https://jupyter.org).
 
 Beta version. Tested with Jupyter Notebook 6.0.3, Jupyter Lab 1.2.6 and Jupyter Console 6.1.0
 on Windows, Ubuntu Linux and macOS.

gradle.properties

@@ -1,5 +1,5 @@
-# kotlinVersion=1.5.255-SNAPSHOT
-kotlinVersion=1.5.30-dev-454
+kotlinVersion=1.5.255-SNAPSHOT
+# kotlinVersion=1.5.30-dev-454
 stableKotlinVersion=1.5.0
 kotlinLanguageLevel=1.5
 stableKotlinLanguageLevel=1.5

jupyter-lib/lib/src/main/kotlin/jupyter/kotlin/annotations.kt

@@ -1,18 +1,41 @@
 package jupyter.kotlin
 
-// in case of flat or direct resolvers the value should be a direct path or file name of a jar respectively
-// in case of maven resolver the maven coordinates string is accepted
+/**
+ * Describes the dependency
+ *
+ * @property value Can be one of the following:
+ * - Maven artifact coordinates in the following form:
+ * `<groupId>:<artifactId>[:<extension>[:<classifier>]]:<version>}`
+ * - Path to the JAR file (absolute or relative to the directory specified in [Repository])
+ */
 @Target(AnnotationTarget.FILE)
 @Repeatable
 @Retention(AnnotationRetention.SOURCE)
 annotation class DependsOn(val value: String = "")
 
-// only flat directory repositories are supported now, so value should be a path to a directory with jars
+/**
+ * Describes the repository which is used for dependency resolution
+ *
+ * @property value Can be one of the following:
+ * - Maven repository URL
+ * - Local directory in which JARs are stored
+ * @property username In case of private Maven repositories, username which is used for authentication
+ * @property password In case of private Maven repositories, password which is used for authentication
+ */
 @Target(AnnotationTarget.FILE)
 @Repeatable
 @Retention(AnnotationRetention.SOURCE)
-annotation class Repository(val value: String = "")
+annotation class Repository(
+    val value: String = "",
+    val username: String = "",
+    val password: String = "",
+)
 
+/**
+ * Describes compilation arguments used for the compilation of this and all following snippets
+ *
+ * @property values List of free compiler arguments
+ */
 @Target(AnnotationTarget.FILE)
 @Repeatable
 @Retention(AnnotationRetention.SOURCE)

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

@@ -38,11 +38,9 @@ class RemoteResolverWrapper(private val remoteResolver: ExternalDependenciesReso
                     val path = "$HOME_PATH/.ivy2/cache"
                     path.toURLString()
                 },
-            )
-                .map {
-                    "$PREFIX${it.shortcut}" to it
-                }
-                .toMap()
+            ).associateBy {
+                "$PREFIX${it.shortcut}"
+            }
 
         fun hasRepository(repository: RepositoryCoordinates): Boolean {
             return repositories.containsKey(repository.string)

libraries/serialization.json

@@ -1,7 +1,7 @@
 {
   "description": "Kotlin multi-format reflection-less serialization",
   "properties": {
-    "v": "1.0.1"
+    "v": "1.1.0"
   },
   "link": "https://github.com/Kotlin/kotlinx.serialization",
   "dependencies": [

src/main/kotlin/org/jetbrains/kotlinx/jupyter/dependencies/JupyterScriptDependenciesResolverImpl.kt

@@ -3,7 +3,6 @@ package org.jetbrains.kotlinx.jupyter.dependencies
 import jupyter.kotlin.DependsOn
 import jupyter.kotlin.Repository
 import kotlinx.coroutines.runBlocking
-import org.jetbrains.kotlin.mainKts.impl.IvyResolver
 import org.jetbrains.kotlinx.jupyter.config.getLogger
 import java.io.File
 import kotlin.script.dependencies.ScriptContents
@@ -18,6 +17,8 @@ import kotlin.script.experimental.dependencies.FileSystemDependenciesResolver
 import kotlin.script.experimental.dependencies.RepositoryCoordinates
 import kotlin.script.experimental.dependencies.impl.DependenciesResolverOptionsName
 import kotlin.script.experimental.dependencies.impl.makeExternalDependenciesResolverOptions
+import kotlin.script.experimental.dependencies.maven.MavenDependenciesResolver
+import kotlin.script.experimental.dependencies.maven.MavenRepositoryCoordinates
 
 open class JupyterScriptDependenciesResolverImpl(resolverConfig: ResolverConfig?) : JupyterScriptDependenciesResolver {
 
@@ -36,7 +37,7 @@ open class JupyterScriptDependenciesResolverImpl(resolverConfig: ResolverConfig?
     init {
         resolver = CompoundDependenciesResolver(
             FileSystemDependenciesResolver(),
-            RemoteResolverWrapper(IvyResolver())
+            RemoteResolverWrapper(MavenDependenciesResolver())
         )
         resolverConfig?.repositories?.forEach { addRepository(it) }
     }
@@ -68,7 +69,14 @@ open class JupyterScriptDependenciesResolverImpl(resolverConfig: ResolverConfig?
                         existingRepositories = ArrayList(repositories)
                     }
 
-                    if (!addRepository(RepositoryCoordinates(annotation.value))) {
+                    val repository = MavenRepositoryCoordinates(
+                        annotation.value,
+                        annotation.username.takeIf { it.isNotEmpty() },
+                        annotation.password,
+                        null,
+                        null,
+                    )
+                    if (!addRepository(repository)) {
                         throw IllegalArgumentException("Illegal argument for Repository annotation: $annotation")
                     }
 

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

@@ -72,6 +72,7 @@ import kotlin.script.experimental.api.with
 import kotlin.script.experimental.jvm.BasicJvmReplEvaluator
 import kotlin.script.experimental.jvm.JvmDependency
 import kotlin.script.experimental.jvm.baseClassLoader
+import kotlin.script.experimental.jvm.impl.BorderGuardClassLoader
 import kotlin.script.experimental.jvm.jvm
 
 data class EvalResult(
@@ -258,7 +259,7 @@ class ReplForJupyterImpl(
     override val currentClasspath = compilerConfiguration.classpath.map { it.canonicalPath }.toMutableSet()
 
     private class FilteringClassLoader(parent: ClassLoader, val includeFilter: (String) -> Boolean) :
-        ClassLoader(parent) {
+        ClassLoader(parent), BorderGuardClassLoader {
         override fun loadClass(name: String?, resolve: Boolean): Class<*> {
             val c = if (name != null && includeFilter(name)) {
                 parent.loadClass(name)

src/main/resources/logback.xml

@@ -11,4 +11,8 @@
     <root level="DEBUG">
         <appender-ref ref="STDERR" />
     </root>
+
+    <logger name="org.apache" level="ERROR" />
+    <logger name="httpclient" level="ERROR" />
+    <logger name="org.eclipse.aether" level="INFO" />
 </configuration>

src/test/kotlin/org/jetbrains/kotlinx/jupyter/test/ResolverTests.kt

@@ -1,13 +1,13 @@
 package org.jetbrains.kotlinx.jupyter.test
 
 import kotlinx.coroutines.runBlocking
-import org.jetbrains.kotlin.mainKts.impl.IvyResolver
 import org.junit.jupiter.api.Test
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import java.io.File
 import kotlin.script.experimental.api.ResultWithDiagnostics
 import kotlin.script.experimental.dependencies.ExternalDependenciesResolver
+import kotlin.script.experimental.dependencies.maven.MavenDependenciesResolver
 import kotlin.test.assertTrue
 
 class ResolverTests {
@@ -23,7 +23,7 @@ class ResolverTests {
 
     @Test
     fun resolveSparkMlLibTest() {
-        val files = IvyResolver().doResolve("org.apache.spark:spark-mllib_2.11:2.4.4")
+        val files = MavenDependenciesResolver().doResolve("org.apache.spark:spark-mllib_2.11:2.4.4")
         log.debug("Downloaded files: ${files.count()}")
         files.forEach {
             log.debug(it.toString())

src/test/kotlin/org/jetbrains/kotlinx/jupyter/test/repl/ReplTests.kt

@@ -148,12 +148,7 @@ class ReplTests : AbstractSingleReplTest() {
         val newClasspath = res.metadata.newClasspath
         assertTrue(newClasspath.size >= 2)
 
-        val htmlLibPath = listOf(
-            "org.jetbrains.kotlinx",
-            "kotlinx-html-jvm",
-            "jars",
-            "kotlinx-html-jvm"
-        ).joinToString(File.separator)
+        val htmlLibPath = "org/jetbrains/kotlinx/kotlinx-html-jvm/0.7.2/kotlinx-html-jvm".replace('/', File.separatorChar)
         assertTrue(newClasspath.any { htmlLibPath in it })
     }