Load dependencies from annotations on classpath initialization in tes…

…t-kit tests

gradle.properties

@@ -10,6 +10,7 @@ gradleCompatibleKotlinLanguageLevel=1.8
 
 kotlin.jupyter.add.api=false
 kotlin.jupyter.add.scanner=false
+kotlin.jupyter.add.testkit=false
 
 artifactsPath=build/artifacts
 

jupyter-lib/test-kit-test/build.gradle.kts

@@ -0,0 +1,28 @@
+plugins {
+    kotlin("libs.publisher")
+    kotlin("jvm")
+    kotlin("plugin.serialization")
+    kotlin("jupyter.api")
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    testImplementation(projects.testKit)
+    testImplementation(libs.test.kotlintest.assertions)
+}
+
+val rootShadowJar = ':' + build.SHADOW_JAR_TASK
+
+buildSettings {
+    withLanguageLevel(rootSettings.kotlinLanguageLevel)
+    withTests {
+        mustRunAfter(rootShadowJar)
+    }
+}
+
+tasks.processJupyterApiResources {
+    libraryProducers = listOf("org.jetbrains.kotlinx.jupyter.testkit.test.integrations.DatetimeTestIntegration")
+}

jupyter-lib/test-kit/src/test/kotlin/org/jetbrains/kotlinx/jupyter/testkit/test/JupyterReplWithResolverTest.kt → jupyter-lib/test-kit-test/src/test/kotlin/org/jetbrains/kotlinx/jupyter/testkit/test/JupyterReplWithResolverTest.kt

@@ -74,4 +74,9 @@ class JupyterReplWithResolverTest : JupyterReplTestCase(
         exception.shouldBeTypeOf<ReplCompilerException>()
         exception.message shouldContain "Unresolved reference: multik"
     }
+
+    @Test
+    fun `datetime is loaded and present`() {
+        execRendered("Clock.System.now()")
+    }
 }

jupyter-lib/test-kit-test/src/test/kotlin/org/jetbrains/kotlinx/jupyter/testkit/test/integrations/DatetimeTestIntegration.kt

@@ -0,0 +1,14 @@
+package org.jetbrains.kotlinx.jupyter.testkit.test.integrations
+
+import org.jetbrains.kotlinx.jupyter.api.libraries.JupyterIntegration
+import org.jetbrains.kotlinx.jupyter.api.libraries.dependencies
+
+@Suppress("unused")
+class DatetimeTestIntegration : JupyterIntegration() {
+    override fun Builder.onLoaded() {
+        dependencies {
+            implementation("org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.6.1")
+        }
+        import("kotlinx.datetime.Clock")
+    }
+}

jupyter-lib/test-kit/build.gradle.kts

@@ -20,9 +20,6 @@ val rootShadowJar = ':' + build.SHADOW_JAR_TASK
 
 buildSettings {
     withLanguageLevel(rootSettings.kotlinLanguageLevel)
-    withTests {
-        mustRunAfter(rootShadowJar)
-    }
 }
 
 tasks.dokkaHtmlPartial {

settings.gradle.kts

@@ -26,6 +26,7 @@ libSubproject("shared-compiler")
 libSubproject("spring-starter")
 libSubproject("lib-ext")
 libSubproject("test-kit")
+libSubproject("test-kit-test")
 
 exampleSubproject("getting-started")
 

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

@@ -391,6 +391,7 @@ class ReplForJupyterImpl(
 
     private fun <T> withEvalContext(action: () -> T): T {
         return synchronized(this) {
+            require(!evalContextEnabled) { "Recursive execution is not supported" }
             evalContextEnabled = true
             try {
                 action()
@@ -589,7 +590,7 @@ class ReplForJupyterImpl(
     }
 
     override fun <T> eval(execution: ExecutionCallback<T>): T {
-        return synchronized(this) {
+        return withEvalContext {
             executor.execute(execution)
         }
     }