diff --git a/build.gradle.kts b/build.gradle.kts index a135960..2b3f6b3 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -13,7 +13,7 @@ val xodusVersion by extra("2.0.1") allprojects { group = "space.kscience" - version = "0.3.0-dev-1" + version = "0.3.0-dev-2" repositories{ maven("https://maven.pkg.jetbrains.space/spc/p/sci/dev") } diff --git a/controls-jupyter/build.gradle.kts b/controls-jupyter/build.gradle.kts index 3191720..c8486bd 100644 --- a/controls-jupyter/build.gradle.kts +++ b/controls-jupyter/build.gradle.kts @@ -1,5 +1,6 @@ plugins { id("space.kscience.gradle.mpp") + `maven-publish` } val visionforgeVersion: String by rootProject.extra @@ -8,7 +9,7 @@ kscience { fullStack("js/controls-jupyter.js") useKtor() useContextReceivers() - jupyterLibrary() + jupyterLibrary("space.kscience.controls.jupyter.ControlsJupyter") dependencies { implementation(projects.controlsVision) implementation("space.kscience:visionforge-jupyter:$visionforgeVersion") diff --git a/controls-jupyter/src/jvmMain/kotlin/ControlsJupyter.kt b/controls-jupyter/src/jvmMain/kotlin/ControlsJupyter.kt index 2e05e5d..ec4bcee 100644 --- a/controls-jupyter/src/jvmMain/kotlin/ControlsJupyter.kt +++ b/controls-jupyter/src/jvmMain/kotlin/ControlsJupyter.kt @@ -1,3 +1,5 @@ +package space.kscience.controls.jupyter + import org.jetbrains.kotlinx.jupyter.api.declare import org.jetbrains.kotlinx.jupyter.api.libraries.resources import space.kscience.controls.manager.ClockManager @@ -5,13 +7,11 @@ import space.kscience.controls.manager.DeviceManager import space.kscience.dataforge.context.Context import space.kscience.dataforge.misc.DFExperimental import space.kscience.plotly.Plot -import space.kscience.tables.Table import space.kscience.visionforge.jupyter.VisionForge import space.kscience.visionforge.jupyter.VisionForgeIntegration import space.kscience.visionforge.markup.MarkupPlugin import space.kscience.visionforge.plotly.PlotlyPlugin import space.kscience.visionforge.plotly.asVision -import space.kscience.visionforge.tables.toVision import space.kscience.visionforge.visionManager @@ -34,7 +34,7 @@ public class ControlsJupyter : VisionForgeIntegration(CONTEXT.visionManager) { "kotlin.time.*", "kotlin.time.Duration.Companion.milliseconds", "kotlin.time.Duration.Companion.seconds", - "space.kscience.tables.*", +// "space.kscience.tables.*", "space.kscience.dataforge.meta.*", "space.kscience.dataforge.context.*", "space.kscience.plotly.*", @@ -46,11 +46,11 @@ public class ControlsJupyter : VisionForgeIntegration(CONTEXT.visionManager) { "space.kscience.controls.spec.*" ) - render> { table -> - vf.produceHtml { - vision { table.toVision() } - } - } +// render> { table -> +// vf.produceHtml { +// vision { table.toVision() } +// } +// } render { plot -> vf.produceHtml { diff --git a/controls-vision/build.gradle.kts b/controls-vision/build.gradle.kts index 89080a0..9395b92 100644 --- a/controls-vision/build.gradle.kts +++ b/controls-vision/build.gradle.kts @@ -18,7 +18,8 @@ kscience { api(projects.controlsConstructor) api("space.kscience:visionforge-plotly:$visionforgeVersion") api("space.kscience:visionforge-markdown:$visionforgeVersion") - api("space.kscience:visionforge-tables:$visionforgeVersion") +// api("space.kscience:tables-kt:0.2.1") +// api("space.kscience:visionforge-tables:$visionforgeVersion") } jvmMain{