upfixes

controls-core/build.gradle.kts

@@ -9,8 +9,6 @@ description = """
     Core interfaces for building a device server
 """.trimIndent()
 
-val dataforgeVersion: String by rootProject.extra
-
 kscience {
     jvm()
     js()

controls-jupyter/build.gradle.kts

@@ -3,8 +3,6 @@ plugins {
     `maven-publish`
 }
 
-val visionforgeVersion: String by rootProject.extra
-
 kscience {
     fullStack("js/controls-jupyter.js")
     useKtor()
@@ -12,7 +10,7 @@ kscience {
     jupyterLibrary("space.kscience.controls.jupyter.ControlsJupyter")
     dependencies {
         implementation(projects.controlsVision)
-        implementation("space.kscience:visionforge-jupyter:$visionforgeVersion")
+        implementation(libs.visionforge.jupiter)
     }
     jvmMain {
         implementation(spclibs.logback.classic)

controls-plc4x/build.gradle.kts

@@ -5,8 +5,6 @@ plugins {
     `maven-publish`
 }
 
-val plc4xVersion = "0.12.0"
-
 description = """
     A plugin for Controls-kt device server on top of plc4x library
 """.trimIndent()
@@ -15,7 +13,7 @@ kscience {
     jvm()
     jvmMain {
         api(projects.controlsCore)
-        api("org.apache.plc4x:plc4j-spi:$plc4xVersion")
+        api(libs.plc4j.spi)
     }
 }
 

controls-server/build.gradle.kts

@@ -9,7 +9,10 @@ description = """
    A combined Magix event loop server with web server for visualization.
 """.trimIndent()
 
-dependencies {
+
+kscience {
+    jvm()
+    dependencies {
         implementation(projects.controlsCore)
         implementation(projects.controlsPortsKtor)
         implementation(projects.magix.magixServer)
@@ -19,6 +22,7 @@ dependencies {
         implementation(spclibs.ktor.serialization.kotlinx.json)
         implementation(spclibs.ktor.server.html.builder)
         implementation(spclibs.ktor.server.status.pages)
+    }
 }
 
 readme{

controls-vision/build.gradle.kts

@@ -7,8 +7,6 @@ description = """
     Dashboard and visualization extensions for devices
 """.trimIndent()
 
-val visionforgeVersion: String by rootProject.extra
-
 kscience {
     fullStack("js/controls-vision.js")
     useKtor()
@@ -16,15 +14,15 @@ kscience {
     dependencies {
         api(projects.controlsCore)
         api(projects.controlsConstructor)
-        api("space.kscience:visionforge-plotly:$visionforgeVersion")
+        api(libs.visionforge.plotly)
-        api("space.kscience:visionforge-markdown:$visionforgeVersion")
+        api(libs.visionforge.markdown)
 //        api("space.kscience:tables-kt:0.2.1")
 //        api("space.kscience:visionforge-tables:$visionforgeVersion")
     }
 
     jvmMain{
-        api("space.kscience:visionforge-server:$visionforgeVersion")
+        api(libs.visionforge.server)
-        api("io.ktor:ktor-server-cio")
+        api(spclibs.ktor.server.cio)
     }
 }
 

gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 
-dataforge = "0.6.2-dev-3"
+dataforge = "0.8.0"
 rsocket = "0.15.4"
 xodus = "2.0.1"
 
@@ -27,11 +27,16 @@ milo = "0.6.12"
 pi4j = "2.3.0"
 pi4j-ktx = "2.4.0"
 
+plc4j = "0.12.0"
+
+visionforge = "0.4.1"
+
 versions = "0.51.0"
 
 [libraries]
 
 dataforge-io = { module = "space.kscience:dataforge-io", version.ref = "dataforge" }
+dataforge-meta = { module = "space.kscience:dataforge-meta", version.ref = "dataforge" }
 
 uuid = { module = "com.benasher44:uuid", version.ref = "uuid" }
 
@@ -68,6 +73,13 @@ pi4j-core = { module = "com.pi4j:pi4j-core", version.ref = "pi4j" }
 pi4j-plugin-raspberrypi = { module = "com.pi4j:pi4j-plugin-raspberrypi", version.ref = "pi4j" }
 pi4j-plugin-pigpio = { module = "com.pi4j:pi4j-plugin-pigpio", version.ref = "pi4j" }
 
+plc4j-spi = { module = "org.apache.plc4x:plc4j-spi", version.ref = "plc4j" }
+
+visionforge-jupiter = { module = "space.kscience:visionforge-jupyter", version.ref = "visionforge" }
+visionforge-plotly = { module = "space.kscience:visionforge-plotly", version.ref = "visionforge" }
+visionforge-markdown = { module = "space.kscience:visionforge-markdown", version.ref = "visionforge" }
+visionforge-server = { module = "space.kscience:visionforge-server", version.ref = "visionforge" }
+
 # Buildscript
 
 [plugins]

magix/magix-utils/build.gradle.kts

@@ -9,8 +9,6 @@ description = """
     Common utilities and services for Magix endpoints.   
 """.trimIndent()
 
-val dataforgeVersion: String by rootProject.extra
-
 kscience {
     jvm()
     js()
@@ -18,7 +16,7 @@ kscience {
     useSerialization()
     commonMain {
         api(projects.magix.magixApi)
-        api("space.kscience:dataforge-meta:$dataforgeVersion")
+        api(libs.dataforge.meta)
     }
 }