From 829d0dfde7f9b7d4f3b86d55b94dd109238a6638 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Fri, 20 Aug 2021 20:24:41 +0300
Subject: [PATCH] Fix Jupyter Kapt problem

---
 demo/jupyter-playground/build.gradle.kts       |  4 ++--
 .../VisionForgePlayGroundForJupyter.kt         |  4 ++--
 demo/playground/build.gradle.kts               | 18 +++++++++---------
 gradle.properties                              |  2 ++
 4 files changed, 15 insertions(+), 13 deletions(-)
 rename demo/jupyter-playground/src/main/kotlin/{hep/dataforge/playground => }/VisionForgePlayGroundForJupyter.kt (96%)

diff --git a/demo/jupyter-playground/build.gradle.kts b/demo/jupyter-playground/build.gradle.kts
index 903b991b..62f92348 100644
--- a/demo/jupyter-playground/build.gradle.kts
+++ b/demo/jupyter-playground/build.gradle.kts
@@ -5,6 +5,7 @@ plugins {
 }
 
 repositories {
+    jcenter()
     mavenCentral()
     maven("https://repo.kotlin.link")
 }
@@ -15,7 +16,6 @@ dependencies {
 
 tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompile> {
     kotlinOptions {
-        useIR = true
         jvmTarget = ru.mipt.npm.gradle.KScienceVersions.JVM_TARGET.toString()
     }
 }
@@ -29,7 +29,7 @@ tasks.withType<Test> {
 }
 
 tasks.processJupyterApiResources {
-    libraryProducers = listOf("space.kscience.dataforge.playground.VisionForgePlayGroundForJupyter")
+    libraryProducers = listOf("playground.VisionForgePlayGroundForJupyter")
 }
 
 tasks.findByName("shadowJar")?.dependsOn("processJupyterApiResources")
\ No newline at end of file
diff --git a/demo/jupyter-playground/src/main/kotlin/hep/dataforge/playground/VisionForgePlayGroundForJupyter.kt b/demo/jupyter-playground/src/main/kotlin/VisionForgePlayGroundForJupyter.kt
similarity index 96%
rename from demo/jupyter-playground/src/main/kotlin/hep/dataforge/playground/VisionForgePlayGroundForJupyter.kt
rename to demo/jupyter-playground/src/main/kotlin/VisionForgePlayGroundForJupyter.kt
index 88e4effb..12426672 100644
--- a/demo/jupyter-playground/src/main/kotlin/hep/dataforge/playground/VisionForgePlayGroundForJupyter.kt
+++ b/demo/jupyter-playground/src/main/kotlin/VisionForgePlayGroundForJupyter.kt
@@ -1,4 +1,4 @@
-package space.kscience.dataforge.playground
+package playground
 
 import kotlinx.html.div
 import kotlinx.html.id
@@ -24,7 +24,7 @@ import space.kscience.visionforge.visionManager
 
 @JupyterLibrary
 @DFExperimental
-internal class VisionForgePlayGroundForJupyter : JupyterIntegration() {
+public class VisionForgePlayGroundForJupyter : JupyterIntegration() {
 
     private val context = Context("VisionForge") {
         plugin(Solids)
diff --git a/demo/playground/build.gradle.kts b/demo/playground/build.gradle.kts
index a89fe123..515cb165 100644
--- a/demo/playground/build.gradle.kts
+++ b/demo/playground/build.gradle.kts
@@ -51,25 +51,25 @@ kotlin {
     sourceSets {
         val commonMain by getting {
             dependencies {
-                implementation(project(":visionforge-solid"))
-                implementation(project(":visionforge-gdml"))
-                implementation(project(":visionforge-plotly"))
-                implementation(projects.visionforge.visionforgeMarkdown)
+                api(project(":visionforge-solid"))
+                api(project(":visionforge-gdml"))
+                api(project(":visionforge-plotly"))
+                api(projects.visionforge.visionforgeMarkdown)
             }
         }
 
         val jsMain by getting{
             dependencies {
-                implementation(project(":ui:ring"))
-                implementation(project(":visionforge-threejs"))
+                api(project(":ui:ring"))
+                api(project(":visionforge-threejs"))
             }
         }
 
         val jvmMain by getting{
             dependencies {
-                implementation(project(":visionforge-server"))
-                implementation("ch.qos.logback:logback-classic:1.2.3")
-                implementation("com.github.Ricky12Awesome:json-schema-serialization:0.6.6")
+                api(project(":visionforge-server"))
+                api("ch.qos.logback:logback-classic:1.2.3")
+                api("com.github.Ricky12Awesome:json-schema-serialization:0.6.6")
             }
         }
     }
diff --git a/gradle.properties b/gradle.properties
index 2ffacd8f..511d4130 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,5 +3,7 @@ kotlin.mpp.enableGranularSourceSetsMetadata=true
 kotlin.mpp.stability.nowarn=true
 kotlin.native.enableDependencyPropagation=false
 
+kotlin.jupyter.add.scanner=false
+
 org.gradle.jvmargs=-XX:MaxMetaspaceSize=1G
 org.gradle.parallel=true
\ No newline at end of file