Обновление зависимостей #10

Merged
altavir merged 11 commits from support/update_dependencies into dev 2024-04-29 18:29:58 +03:00
12 changed files with 51 additions and 19 deletions
Showing only changes of commit 8965629151 - Show all commits

View File

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

View File

@ -20,8 +20,8 @@ dependencies {
implementation(projects.controlsOpcua) implementation(projects.controlsOpcua)
implementation(spclibs.ktor.client.cio) implementation(spclibs.ktor.client.cio)
implementation("no.tornado:tornadofx:1.7.20") implementation(libs.tornadofx)
implementation("space.kscience:plotlykt-server:0.5.3") implementation(libs.plotlykt.server)
// implementation("com.github.Ricky12Awesome:json-schema-serialization:0.6.6") // implementation("com.github.Ricky12Awesome:json-schema-serialization:0.6.6")
implementation(spclibs.logback.classic) implementation(spclibs.logback.classic)
} }

View File

@ -22,13 +22,13 @@ dependencies {
// implementation(projects.controlsMongo) // implementation(projects.controlsMongo)
implementation(spclibs.ktor.client.cio) implementation(spclibs.ktor.client.cio)
implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.3.1") implementation(spclibs.kotlinx.datetime)
implementation("no.tornado:tornadofx:1.7.20") implementation(libs.tornadofx)
implementation("space.kscience:plotlykt-server:0.5.0") implementation(libs.plotlykt.server)
implementation("ch.qos.logback:logback-classic:1.2.11") implementation(libs.logback.classic)
implementation("org.jetbrains.xodus:xodus-entity-store:1.3.232") implementation(libs.xodus.entity.store)
implementation("org.jetbrains.xodus:xodus-environment:1.3.232") implementation(libs.xodus.environment)
implementation("org.jetbrains.xodus:xodus-vfs:1.3.232") implementation(libs.xodus.vfs)
// implementation("org.litote.kmongo:kmongo-coroutine-serialization:4.4.0") // implementation("org.litote.kmongo:kmongo-coroutine-serialization:4.4.0")
} }

View File

@ -14,7 +14,7 @@ dependencies {
implementation(projects.magix.magixZmq) implementation(projects.magix.magixZmq)
implementation(spclibs.ktor.client.cio) implementation(spclibs.ktor.client.cio)
implementation("ch.qos.logback:logback-classic:1.2.11") implementation(libs.logback.classic)
} }
kotlin{ kotlin{
jvmToolchain(11) jvmToolchain(11)

View File

@ -16,7 +16,7 @@ dependencies {
implementation(projects.magix.magixZmq) implementation(projects.magix.magixZmq)
implementation(spclibs.ktor.client.cio) implementation(spclibs.ktor.client.cio)
implementation("space.kscience:plotlykt-server:0.6.0") implementation(libs.plotlykt.server)
implementation(spclibs.logback.classic) implementation(spclibs.logback.classic)
} }

View File

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

View File

@ -6,12 +6,44 @@ xodus = "2.0.1"
uuid = "0.8.0" 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] [libraries]
dataforge-io = { module = "space.kscience:dataforge-io", version.ref = "dataforge" } dataforge-io = { module = "space.kscience:dataforge-io", version.ref = "dataforge" }
uuid = { module = "com.benasher44:uuid", version.ref = "uuid" } uuid = { module = "com.benasher44:uuid", version.ref = "uuid" }
xodus-entity-store = { module = "org.jetbrains.xodus:xodus-entity-store", version.ref = "xodus" } 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-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-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" } 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" }

View File

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

View File

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

View File

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

View File

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

View File

@ -36,6 +36,8 @@ dependencyResolutionManagement {
create("spclibs") { create("spclibs") {
from("space.kscience:version-catalog:$toolsVersion") 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-core", "io.ktor", "ktor-client-core").versionRef("ktor")
library("ktor-client-cio", "io.ktor", "ktor-client-cio").versionRef("ktor") library("ktor-client-cio", "io.ktor", "ktor-client-cio").versionRef("ktor")
library("ktor-network", "io.ktor", "ktor-network").versionRef("ktor") library("ktor-network", "io.ktor", "ktor-network").versionRef("ktor")