From d131dc49abad5f48a88c39d83b87bfdf8ea66ec2 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sat, 11 Sep 2021 15:24:52 +0300
Subject: [PATCH] Removed KApt

---
 .../src/main/kotlin/VisionForgePlayGroundForJupyter.kt      | 2 --
 gradle.properties                                           | 2 +-
 jupyter/visionforge-gdml-jupyter/build.gradle.kts           | 6 +++++-
 .../src/jvmMain/kotlin/GdmlForJupyter.kt                    | 2 --
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/demo/jupyter-playground/src/main/kotlin/VisionForgePlayGroundForJupyter.kt b/demo/jupyter-playground/src/main/kotlin/VisionForgePlayGroundForJupyter.kt
index 12426672..5ada35ec 100644
--- a/demo/jupyter-playground/src/main/kotlin/VisionForgePlayGroundForJupyter.kt
+++ b/demo/jupyter-playground/src/main/kotlin/VisionForgePlayGroundForJupyter.kt
@@ -6,7 +6,6 @@ import kotlinx.html.script
 import kotlinx.html.stream.createHTML
 import kotlinx.html.unsafe
 import org.jetbrains.kotlinx.jupyter.api.HTML
-import org.jetbrains.kotlinx.jupyter.api.annotations.JupyterLibrary
 import org.jetbrains.kotlinx.jupyter.api.libraries.*
 import space.kscience.dataforge.context.Context
 import space.kscience.dataforge.misc.DFExperimental
@@ -22,7 +21,6 @@ import space.kscience.visionforge.plotly.asVision
 import space.kscience.visionforge.solid.Solids
 import space.kscience.visionforge.visionManager
 
-@JupyterLibrary
 @DFExperimental
 public class VisionForgePlayGroundForJupyter : JupyterIntegration() {
 
diff --git a/gradle.properties b/gradle.properties
index a1def2dd..d472c5ef 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,7 @@
 kotlin.code.style=official
 kotlin.mpp.stability.nowarn=true
 
-#kotlin.jupyter.add.scanner=false
+kotlin.jupyter.add.scanner=false
 #kotlin.incremental.js.klib=false
 
 org.gradle.jvmargs=-XX:MaxMetaspaceSize=1G
diff --git a/jupyter/visionforge-gdml-jupyter/build.gradle.kts b/jupyter/visionforge-gdml-jupyter/build.gradle.kts
index 896b44a4..6c1d7c43 100644
--- a/jupyter/visionforge-gdml-jupyter/build.gradle.kts
+++ b/jupyter/visionforge-gdml-jupyter/build.gradle.kts
@@ -56,4 +56,8 @@ kscience {
 
 readme {
     maturity = ru.mipt.npm.gradle.Maturity.EXPERIMENTAL
-}
\ No newline at end of file
+}
+
+tasks.named<org.jetbrains.kotlinx.jupyter.api.plugin.tasks.JupyterApiResourcesTask>("processJupyterApiResources") {
+    libraryProducers = listOf("space.kscience.visionforge.gdml.jupyter.GdmlForJupyter")
+}
diff --git a/jupyter/visionforge-gdml-jupyter/src/jvmMain/kotlin/GdmlForJupyter.kt b/jupyter/visionforge-gdml-jupyter/src/jvmMain/kotlin/GdmlForJupyter.kt
index 0b12d3fb..ce32f012 100644
--- a/jupyter/visionforge-gdml-jupyter/src/jvmMain/kotlin/GdmlForJupyter.kt
+++ b/jupyter/visionforge-gdml-jupyter/src/jvmMain/kotlin/GdmlForJupyter.kt
@@ -2,7 +2,6 @@ package space.kscience.visionforge.gdml.jupyter
 
 import kotlinx.html.stream.createHTML
 import org.jetbrains.kotlinx.jupyter.api.HTML
-import org.jetbrains.kotlinx.jupyter.api.annotations.JupyterLibrary
 import org.jetbrains.kotlinx.jupyter.api.libraries.JupyterIntegration
 import org.jetbrains.kotlinx.jupyter.api.libraries.resources
 import space.kscience.dataforge.context.Context
@@ -16,7 +15,6 @@ import space.kscience.visionforge.html.embedAndRenderVisionFragment
 import space.kscience.visionforge.solid.Solids
 import space.kscience.visionforge.visionManager
 
-@JupyterLibrary
 @DFExperimental
 internal class GdmlForJupyter : JupyterIntegration() {