kscience/controls-kt
8
0
Fork 0
Code Issues Pull Requests 2 Packages Projects Releases 1 Wiki Activity

Compare commits

base: kscience:89656291517dfaccff3a32a15018caad93b7da68
Branches Tags
kscience:master
kscience:simulation
kscience:dev-maxim
kscience:dev
kscience:feature/device-collective-demo
kscience:feature/templating_kts
kscience:refactor/df-0.7
kscience:specialized-messages
kscience:motors
kscience:ktor-io
kscience:v0.2.0
..
compare: kscience:4639fdb558dc313f43d6f1b64561699e3bef0c15
Branches Tags
kscience:simulation
kscience:dev-maxim
kscience:dev
kscience:feature/device-collective-demo
kscience:feature/templating_kts
kscience:refactor/df-0.7
kscience:master
kscience:specialized-messages
kscience:motors
kscience:ktor-io
kscience:v0.2.0

No commits in common. "89656291517dfaccff3a32a15018caad93b7da68" and "4639fdb558dc313f43d6f1b64561699e3bef0c15" have entirely different histories.
8965629151 ... 4639fdb558

21 changed files with 68 additions and 100 deletions
Show Stats Expand all files Collapse all files

5
build.gradle.kts
View File

@ -6,6 +6,11 @@ plugins {
id("space.kscience.gradle.project")
}
val dataforgeVersion: String by extra("0.6.2-dev-3")
val ktorVersion: String by extra(space.kscience.gradle.KScienceVersions.ktorVersion)
val rsocketVersion by extra("0.15.4")
val xodusVersion by extra("2.0.1")
allprojects {
group = "space.kscience"
version = "0.2.0"

2
controls-core/build.gradle.kts
View File

@ -21,7 +21,7 @@ kscience {
}
useContextReceivers()
dependencies {
api(libs.dataforge.io)
api("space.kscience:dataforge-io:$dataforgeVersion")
api(spclibs.kotlinx.datetime)
}
}

2
controls-magix/build.gradle.kts
View File

@ -18,7 +18,7 @@ kscience {
dependencies {
api(projects.magix.magixApi)
api(projects.controlsCore)
api(libs.uuid)
api("com.benasher44:uuid:0.8.0")
}
}

4
controls-ports-ktor/build.gradle.kts
View File

@ -9,9 +9,11 @@ description = """
Implementation of byte ports on top os ktor-io asynchronous API
""".trimIndent()
val ktorVersion: String by rootProject.extra
dependencies {
api(projects.controlsCore)
api(spclibs.ktor.network)
api("io.ktor:ktor-network:$ktorVersion")
}
readme{

2
controls-serial/build.gradle.kts
View File

@ -9,7 +9,7 @@ description = "Implementation of direct serial port communication with JSerialCo
dependencies{
api(project(":controls-core"))
implementation(libs.jSerialComm)
implementation("com.fazecast:jSerialComm:2.10.3")
}
readme{

15
controls-server/build.gradle.kts
View File

@ -9,16 +9,19 @@ description = """
A combined Magix event loop server with web server for visualization.
""".trimIndent()
val dataforgeVersion: String by rootProject.extra
val ktorVersion: String by rootProject.extra
dependencies {
implementation(projects.controlsCore)
implementation(projects.controlsPortsKtor)
implementation(projects.magix.magixServer)
implementation(spclibs.ktor.server.cio)
implementation(spclibs.ktor.server.websockets)
implementation(spclibs.ktor.server.content.negotiation)
implementation(spclibs.ktor.serialization.kotlinx.json)
implementation(spclibs.ktor.server.html.builder)
implementation(spclibs.ktor.server.status.pages)
implementation("io.ktor:ktor-server-cio:$ktorVersion")
implementation("io.ktor:ktor-server-websockets:$ktorVersion")
implementation("io.ktor:ktor-server-content-negotiation:$ktorVersion")
implementation("io.ktor:ktor-serialization-kotlinx-json:$ktorVersion")
implementation("io.ktor:ktor-server-html-builder:$ktorVersion")
implementation("io.ktor:ktor-server-status-pages:$ktorVersion")
}
readme{

4
controls-storage/controls-xodus/build.gradle.kts
View File

@ -3,13 +3,15 @@ plugins {
`maven-publish`
}
val xodusVersion: String by rootProject.extra
description = """
An implementation of controls-storage on top of JetBrains Xodus.
""".trimIndent()
dependencies {
api(projects.controlsStorage)
implementation(libs.xodus.entity.store)
implementation("org.jetbrains.xodus:xodus-entity-store:$xodusVersion")
// implementation("org.jetbrains.xodus:xodus-environment:$xodusVersion")
// implementation("org.jetbrains.xodus:xodus-vfs:$xodusVersion")

9
demo/all-things/build.gradle.kts
View File

@ -10,6 +10,9 @@ repositories {
maven("https://repo.kotlin.link")
}
val ktorVersion: String by rootProject.extra
val rsocketVersion: String by rootProject.extra
dependencies {
implementation(projects.controlsCore)
//implementation(projects.controlsServer)
@ -19,9 +22,9 @@ dependencies {
implementation(projects.magix.magixZmq)
implementation(projects.controlsOpcua)
implementation(spclibs.ktor.client.cio)
implementation(libs.tornadofx)
implementation(libs.plotlykt.server)
implementation("io.ktor:ktor-client-cio:$ktorVersion")
implementation("no.tornado:tornadofx:1.7.20")
implementation("space.kscience:plotlykt-server:0.5.3")
// implementation("com.github.Ricky12Awesome:json-schema-serialization:0.6.6")
implementation(spclibs.logback.classic)
}

19
demo/car/build.gradle.kts
View File

@ -10,6 +10,9 @@ repositories {
maven("https://repo.kotlin.link")
}
val ktorVersion: String by rootProject.extra
val rsocketVersion: String by rootProject.extra
dependencies {
implementation(projects.controlsCore)
implementation(projects.magix.magixApi)
@ -21,14 +24,14 @@ dependencies {
implementation(projects.magix.magixStorage.magixStorageXodus)
// implementation(projects.controlsMongo)
implementation(spclibs.ktor.client.cio)
implementation(spclibs.kotlinx.datetime)
implementation(libs.tornadofx)
implementation(libs.plotlykt.server)
implementation(libs.logback.classic)
implementation(libs.xodus.entity.store)
implementation(libs.xodus.environment)
implementation(libs.xodus.vfs)
implementation("io.ktor:ktor-client-cio:$ktorVersion")
implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.3.1")
implementation("no.tornado:tornadofx:1.7.20")
implementation("space.kscience:plotlykt-server:0.5.0")
implementation("ch.qos.logback:logback-classic:1.2.11")
implementation("org.jetbrains.xodus:xodus-entity-store:1.3.232")
implementation("org.jetbrains.xodus:xodus-environment:1.3.232")
implementation("org.jetbrains.xodus:xodus-vfs:1.3.232")
// implementation("org.litote.kmongo:kmongo-coroutine-serialization:4.4.0")
}

7
demo/echo/build.gradle.kts
View File

@ -8,13 +8,16 @@ repositories {
maven("https://repo.kotlin.link")
}
val ktorVersion: String by rootProject.extra
val rsocketVersion: String by rootProject.extra
dependencies {
implementation(projects.magix.magixServer)
implementation(projects.magix.magixRsocket)
implementation(projects.magix.magixZmq)
implementation(spclibs.ktor.client.cio)
implementation("io.ktor:ktor-client-cio:$ktorVersion")
implementation(libs.logback.classic)
implementation("ch.qos.logback:logback-classic:1.2.11")
}
kotlin{
jvmToolchain(11)

7
demo/many-devices/build.gradle.kts
View File

@ -9,14 +9,17 @@ repositories {
maven("https://repo.kotlin.link")
}
val ktorVersion: String by rootProject.extra
val rsocketVersion: String by rootProject.extra
dependencies {
implementation(projects.magix.magixServer)
implementation(projects.controlsMagix)
implementation(projects.magix.magixRsocket)
implementation(projects.magix.magixZmq)
implementation(spclibs.ktor.client.cio)
implementation(libs.plotlykt.server)
implementation("io.ktor:ktor-client-cio:$ktorVersion")
implementation("space.kscience:plotlykt-server:0.6.0")
implementation(spclibs.logback.classic)
}

2
demo/motors/build.gradle.kts
View File

@ -25,5 +25,5 @@ val dataforgeVersion: String by extra
dependencies {
implementation(project(":controls-ports-ktor"))
implementation(projects.controlsMagix)
implementation(libs.tornadofx)
implementation("no.tornado:tornadofx:1.7.20")
}

49
gradle/libs.versions.toml
View File

@ -1,49 +0,0 @@
[versions]
dataforge = "0.6.2-dev-3"
rsocket = "0.15.4"
xodus = "2.0.1"
uuid = "0.8.0"
fazecast = "2.10.3"
tornadofx = "1.7.20"
plotlykt = "0.5.3"
logback = "1.2.11"
hivemq = "1.3.1"
rabbitmq = "5.14.2"
kmongo = "4.5.1"
[libraries]
dataforge-io = { module = "space.kscience:dataforge-io", version.ref = "dataforge" }
uuid = { module = "com.benasher44:uuid", version.ref = "uuid" }
xodus-entity-store = { module = "org.jetbrains.xodus:xodus-entity-store", version.ref = "xodus" }
xodus-environment = { module = "org.jetbrains.xodus:xodus-environment", version.ref = "xodus" }
xodus-vfs = { module = "org.jetbrains.xodus:xodus-vfs", version.ref = "xodus" }
rsocket-ktor-client = { module = "io.rsocket.kotlin:rsocket-ktor-client", version.ref = "rsocket" }
rsocket-ktor-server = { module = "io.rsocket.kotlin:rsocket-ktor-server", version.ref = "rsocket" }
rsocket-transport-ktor-tcp = { module = "io.rsocket.kotlin:rsocket-transport-ktor-tcp", version.ref = "rsocket" }
jSerialComm = { module = "com.fazecast:jSerialComm", version.ref = "fazecast" }
tornadofx = { module = "no.tornado:tornadofx", version.ref = "tornadofx" }
plotlykt-server = { module = "space.kscience:plotlykt-server", version.ref = "plotlykt" }
logback-classic = { module = "ch.qos.logback:logback-classic", version.ref = "logback" }
hivemq-mqtt-client = { module = "com.hivemq:hivemq-mqtt-client", version.ref = "hivemq" }
rabbitmq-amqp-client = { module = "com.rabbitmq:amqp-client", version.ref = "rabbitmq" }
kmongo-coroutine-serialization = { module = "org.litote.kmongo:kmongo-coroutine-serialization", version.ref = "kmongo" }

2
magix/magix-java-endpoint/build.gradle.kts
View File

@ -14,7 +14,7 @@ description = """
dependencies {
implementation(project(":magix:magix-rsocket"))
implementation(spclibs.kotlinx.coroutines.jdk9)
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-jdk9:${KScienceVersions.coroutinesVersion}")
}
//java {

2
magix/magix-mqtt/build.gradle.kts
View File

@ -9,7 +9,7 @@ description = """
dependencies {
api(projects.magix.magixApi)
implementation(libs.hivemq.mqtt.client)
implementation("com.hivemq:hivemq-mqtt-client:1.3.1")
implementation(spclibs.kotlinx.coroutines.jdk8)
}

2
magix/magix-rabbit/build.gradle.kts
View File

@ -9,7 +9,7 @@ description = """
dependencies {
api(projects.magix.magixApi)
implementation(libs.rabbitmq.amqp.client)
implementation("com.rabbitmq:amqp-client:5.14.2")
}
readme{

9
magix/magix-rsocket/build.gradle.kts
View File

@ -10,6 +10,7 @@ description = """
""".trimIndent()
val ktorVersion: String by rootProject.extra
val rsocketVersion: String by rootProject.extra
kscience {
jvm()
@ -20,11 +21,11 @@ kscience {
}
dependencies {
api(projects.magix.magixApi)
implementation(spclibs.ktor.client.core)
implementation(libs.rsocket.ktor.client)
implementation("io.ktor:ktor-client-core:$ktorVersion")
implementation("io.rsocket.kotlin:rsocket-ktor-client:$rsocketVersion")
}
dependencies(jvmMain) {
implementation(libs.rsocket.transport.ktor.tcp)
implementation("io.rsocket.kotlin:rsocket-transport-ktor-tcp:$rsocketVersion")
}
}
@ -32,7 +33,7 @@ kotlin {
sourceSets {
getByName("linuxX64Main") {
dependencies {
implementation(libs.rsocket.transport.ktor.tcp)
implementation("io.rsocket.kotlin:rsocket-transport-ktor-tcp:$rsocketVersion")
}
}
}

5
magix/magix-server/build.gradle.kts
View File

@ -17,6 +17,7 @@ kscience {
}
val dataforgeVersion: String by rootProject.extra
val rsocketVersion: String by rootProject.extra
val ktorVersion: String = space.kscience.gradle.KScienceVersions.ktorVersion
dependencies{
@ -27,8 +28,8 @@ dependencies{
api("io.ktor:ktor-serialization-kotlinx-json:$ktorVersion")
api("io.ktor:ktor-server-html-builder:$ktorVersion")
api(libs.rsocket.ktor.server)
api(libs.rsocket.transport.ktor.tcp)
api("io.rsocket.kotlin:rsocket-ktor-server:$rsocketVersion")
api("io.rsocket.kotlin:rsocket-transport-ktor-tcp:$rsocketVersion")
}
readme{

4
magix/magix-storage/magix-storage-mongo/build.gradle.kts
View File

@ -3,9 +3,11 @@ plugins {
`maven-publish`
}
val kmongoVersion = "4.5.1"
dependencies {
implementation(projects.controlsStorage)
implementation(libs.kmongo.coroutine.serialization)
implementation("org.litote.kmongo:kmongo-coroutine-serialization:$kmongoVersion")
}
readme{

4
magix/magix-storage/magix-storage-xodus/build.gradle.kts
View File

@ -3,13 +3,15 @@ plugins {
`maven-publish`
}
val xodusVersion: String by rootProject.extra
kscience {
useCoroutines()
}
dependencies {
api(projects.magix.magixStorage)
implementation(libs.xodus.entity.store)
implementation("org.jetbrains.xodus:xodus-entity-store:$xodusVersion")
// implementation("org.jetbrains.xodus:dnq:2.0.0")
testImplementation(spclibs.kotlinx.coroutines.test)

13
settings.gradle.kts
View File

@ -35,19 +35,6 @@ dependencyResolutionManagement {
versionCatalogs {
create("spclibs") {
from("space.kscience:version-catalog:$toolsVersion")
library("kotlinx-coroutines-jdk9", "org.jetbrains.kotlinx", "kotlinx-coroutines-jdk9").versionRef("kotlinx-coroutines")
library("ktor-client-core", "io.ktor", "ktor-client-core").versionRef("ktor")
library("ktor-client-cio", "io.ktor", "ktor-client-cio").versionRef("ktor")
library("ktor-network", "io.ktor", "ktor-network").versionRef("ktor")
library("ktor-serialization-kotlinx-json", "io.ktor", "ktor-serialization-kotlinx-json").versionRef("ktor")
library("ktor-server-cio", "io.ktor", "ktor-server-cio").versionRef("ktor")
library("ktor-server-websockets", "io.ktor", "ktor-server-websockets").versionRef("ktor")
library("ktor-server-content-negotiation", "io.ktor", "ktor-server-content-negotiation").versionRef("ktor")
library("ktor-server-html-builder", "io.ktor", "ktor-server-html-builder").versionRef("ktor")
library("ktor-server-status-pages", "io.ktor", "ktor-server-status-pages").versionRef("ktor")
}
}
}