Updated dependencies

build.gradle.kts

@@ -2,7 +2,7 @@ plugins {
     id("space.kscience.gradle.project")
 }
 
-val dataforgeVersion: String by extra("0.6.0-dev-12")
+val dataforgeVersion: String by extra("0.6.0-dev-13")
 val ktorVersion: String by extra(space.kscience.gradle.KScienceVersions.ktorVersion)
 val rsocketVersion by extra("0.15.4")
 

controls-core/src/commonMain/kotlin/space/kscience/controls/spec/misc.kt

@@ -1,12 +1,7 @@
 package space.kscience.controls.spec
 
-import space.kscience.dataforge.meta.Meta
+import space.kscience.dataforge.meta.*
-import space.kscience.dataforge.meta.double
-import space.kscience.dataforge.meta.enum
-import space.kscience.dataforge.meta.get
 import space.kscience.dataforge.meta.transformations.MetaConverter
-import space.kscience.dataforge.values.asValue
-import space.kscience.dataforge.values.double
 import kotlin.time.Duration
 import kotlin.time.DurationUnit
 import kotlin.time.toDuration

controls-core/src/commonMain/kotlin/space/kscience/controls/spec/propertySpecDelegates.kt

@@ -3,8 +3,8 @@ package space.kscience.controls.spec
 import space.kscience.controls.api.PropertyDescriptor
 import space.kscience.controls.api.metaDescriptor
 import space.kscience.dataforge.meta.Meta
+import space.kscience.dataforge.meta.ValueType
 import space.kscience.dataforge.meta.transformations.MetaConverter
-import space.kscience.dataforge.values.ValueType
 import kotlin.properties.PropertyDelegateProvider
 import kotlin.properties.ReadOnlyProperty
 

controls-core/src/jvmMain/kotlin/space/kscience/controls/misc/javaTimeMeta.kt

@@ -3,7 +3,6 @@ package space.kscience.controls.misc
 import space.kscience.dataforge.meta.Meta
 import space.kscience.dataforge.meta.get
 import space.kscience.dataforge.meta.long
-import space.kscience.dataforge.values.long
 import java.time.Instant
 
 // TODO move to core

controls-opcua/build.gradle.kts

@@ -4,7 +4,7 @@ plugins {
 
 val ktorVersion: String by rootProject.extra
 
-val miloVersion: String = "0.6.3"
+val miloVersion: String = "0.6.7"
 
 dependencies {
     api(project(":controls-core"))

controls-opcua/src/main/kotlin/space/kscience/controls/opcua/client/MetaBsdParser.kt

@@ -16,7 +16,6 @@ import space.kscience.controls.misc.toMeta
 import space.kscience.dataforge.meta.*
 import space.kscience.dataforge.names.Name
 import space.kscience.dataforge.names.asName
-import space.kscience.dataforge.values.*
 import java.util.*
 
 

controls-opcua/src/main/kotlin/space/kscience/controls/opcua/server/DeviceNameSpace.kt

@@ -25,10 +25,10 @@ import space.kscience.controls.api.onPropertyChange
 import space.kscience.controls.manager.DeviceManager
 import space.kscience.dataforge.meta.Meta
 import space.kscience.dataforge.meta.MetaSerializer
+import space.kscience.dataforge.meta.ValueType
 import space.kscience.dataforge.names.Name
 import space.kscience.dataforge.names.asName
 import space.kscience.dataforge.names.plus
-import space.kscience.dataforge.values.ValueType
 
 
 public operator fun Device.get(propertyDescriptor: PropertyDescriptor): Meta? = getProperty(propertyDescriptor.name)

controls-opcua/src/main/kotlin/space/kscience/controls/opcua/server/metaToOpc.kt

@@ -5,10 +5,7 @@ import org.eclipse.milo.opcua.stack.core.types.builtin.DataValue
 import org.eclipse.milo.opcua.stack.core.types.builtin.DateTime
 import org.eclipse.milo.opcua.stack.core.types.builtin.StatusCode
 import org.eclipse.milo.opcua.stack.core.types.builtin.Variant
-import space.kscience.dataforge.meta.Meta
+import space.kscience.dataforge.meta.*
-import space.kscience.dataforge.meta.MetaSerializer
-import space.kscience.dataforge.meta.isLeaf
-import space.kscience.dataforge.values.*
 import java.time.Instant
 
 /**

controls-storage/src/jvmMain/kotlin/space/kscience/controls/storage/workDirectory.kt

@@ -3,8 +3,8 @@ package space.kscience.controls.storage
 import space.kscience.dataforge.context.ContextBuilder
 import space.kscience.dataforge.io.IOPlugin
 import space.kscience.dataforge.meta.get
+import space.kscience.dataforge.meta.set
 import space.kscience.dataforge.meta.string
-import space.kscience.dataforge.values.set
 import java.nio.file.Path
 import kotlin.io.path.Path
 

demo/all-things/build.gradle.kts

@@ -24,7 +24,7 @@ dependencies {
 
     implementation("io.ktor:ktor-client-cio:$ktorVersion")
     implementation("no.tornado:tornadofx:1.7.20")
-    implementation("space.kscience:plotlykt-server:0.5.2-dev-2")
+    implementation("space.kscience:plotlykt-server:0.5.3-dev-1")
 //    implementation("com.github.Ricky12Awesome:json-schema-serialization:0.6.6")
     implementation("ch.qos.logback:logback-classic:1.2.11")
 }

demo/all-things/src/main/kotlin/space/kscience/controls/demo/DemoDevice.kt

@@ -6,9 +6,9 @@ import space.kscience.controls.spec.*
 import space.kscience.dataforge.context.Context
 import space.kscience.dataforge.context.Factory
 import space.kscience.dataforge.meta.Meta
+import space.kscience.dataforge.meta.ValueType
 import space.kscience.dataforge.meta.descriptors.value
 import space.kscience.dataforge.meta.transformations.MetaConverter
-import space.kscience.dataforge.values.ValueType
 import java.time.Instant
 import kotlin.time.Duration.Companion.milliseconds
 import kotlin.time.ExperimentalTime

demo/all-things/src/main/kotlin/space/kscience/controls/demo/demoDeviceServer.kt

@@ -55,7 +55,7 @@ suspend fun Trace.updateXYFrom(flow: Flow<Iterable<Pair<Double, Double>>>) {
 }
 
 
-suspend fun MagixEndpoint.startDemoDeviceServer(): ApplicationEngine = embeddedServer(CIO, 9090) {
+suspend fun MagixEndpoint.startDemoDeviceServer(): ApplicationEngine = embeddedServer(CIO, 9091) {
     install(WebSockets)
     install(RSocketSupport)
 

demo/motors/src/main/kotlin/ru/mipt/npm/devices/pimotionmaster/PiMotionMasterDevice.kt

@@ -17,11 +17,11 @@ import space.kscience.controls.ports.*
 import space.kscience.controls.spec.*
 import space.kscience.dataforge.context.*
 import space.kscience.dataforge.meta.Meta
+import space.kscience.dataforge.meta.asValue
 import space.kscience.dataforge.meta.double
 import space.kscience.dataforge.meta.get
 import space.kscience.dataforge.meta.transformations.MetaConverter
 import space.kscience.dataforge.names.NameToken
-import space.kscience.dataforge.values.asValue
 import kotlin.collections.component1
 import kotlin.collections.component2
 import kotlin.time.Duration

magix/magix-java-client/build.gradle.kts

@@ -23,4 +23,4 @@ tasks.withType<KotlinCompile>{
     kotlinOptions {
         freeCompilerArgs -= "-Xjdk-release=11"
     }
-}
+}