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

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

View File

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

View File

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

View File

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

View File

@ -9,16 +9,20 @@ description = """
A combined Magix event loop server with web server for visualization. A combined Magix event loop server with web server for visualization.
""".trimIndent() """.trimIndent()
dependencies {
implementation(projects.controlsCore) kscience {
implementation(projects.controlsPortsKtor) jvm()
implementation(projects.magix.magixServer) dependencies {
implementation(spclibs.ktor.server.cio) implementation(projects.controlsCore)
implementation(spclibs.ktor.server.websockets) implementation(projects.controlsPortsKtor)
implementation(spclibs.ktor.server.content.negotiation) implementation(projects.magix.magixServer)
implementation(spclibs.ktor.serialization.kotlinx.json) implementation(spclibs.ktor.server.cio)
implementation(spclibs.ktor.server.html.builder) implementation(spclibs.ktor.server.websockets)
implementation(spclibs.ktor.server.status.pages) implementation(spclibs.ktor.server.content.negotiation)
implementation(spclibs.ktor.serialization.kotlinx.json)
implementation(spclibs.ktor.server.html.builder)
implementation(spclibs.ktor.server.status.pages)
}
} }
readme{ readme{

View File

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

View File

@ -1,6 +1,6 @@
[versions] [versions]
dataforge = "0.6.2-dev-3" dataforge = "0.8.0"
rsocket = "0.15.4" rsocket = "0.15.4"
xodus = "2.0.1" xodus = "2.0.1"
@ -27,11 +27,16 @@ milo = "0.6.12"
pi4j = "2.3.0" pi4j = "2.3.0"
pi4j-ktx = "2.4.0" pi4j-ktx = "2.4.0"
plc4j = "0.12.0"
visionforge = "0.4.1"
versions = "0.51.0" versions = "0.51.0"
[libraries] [libraries]
dataforge-io = { module = "space.kscience:dataforge-io", version.ref = "dataforge" } 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" } 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-raspberrypi = { module = "com.pi4j:pi4j-plugin-raspberrypi", version.ref = "pi4j" }
pi4j-plugin-pigpio = { module = "com.pi4j:pi4j-plugin-pigpio", 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 # Buildscript
[plugins] [plugins]

View File

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