From 23bceed89da647fd461dd74aa5ca243ee6346720 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Mon, 29 Apr 2024 17:22:56 +0600 Subject: [PATCH] update dependencies --- build.gradle.kts | 1 + controls-modbus/build.gradle.kts | 2 +- controls-opcua/build.gradle.kts | 8 +++----- controls-pi/build.gradle.kts | 8 ++++---- gradle/libs.versions.toml | 26 ++++++++++++++++++++++++ gradle/wrapper/gradle-wrapper.properties | 2 +- 6 files changed, 36 insertions(+), 11 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 02dde8d..2463418 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,6 +4,7 @@ import space.kscience.gradle.useSPCTeam plugins { id("space.kscience.gradle.project") + alias(libs.plugins.versions) } allprojects { diff --git a/controls-modbus/build.gradle.kts b/controls-modbus/build.gradle.kts index aee64d5..2f280b6 100644 --- a/controls-modbus/build.gradle.kts +++ b/controls-modbus/build.gradle.kts @@ -12,7 +12,7 @@ description = """ dependencies { api(projects.controlsCore) - api("com.ghgande:j2mod:3.1.1") + api(libs.j2mod) } readme{ diff --git a/controls-opcua/build.gradle.kts b/controls-opcua/build.gradle.kts index e7e1da8..686ae62 100644 --- a/controls-opcua/build.gradle.kts +++ b/controls-opcua/build.gradle.kts @@ -11,15 +11,13 @@ description = """ val ktorVersion: String by rootProject.extra -val miloVersion: String = "0.6.10" - dependencies { api(projects.controlsCore) api(spclibs.kotlinx.coroutines.jdk8) - api("org.eclipse.milo:sdk-client:$miloVersion") - api("org.eclipse.milo:bsd-parser:$miloVersion") - api("org.eclipse.milo:sdk-server:$miloVersion") + api(libs.milo.client) + api(libs.milo.parser) + api(libs.milo.server) testImplementation(spclibs.kotlinx.coroutines.test) } diff --git a/controls-pi/build.gradle.kts b/controls-pi/build.gradle.kts index a763396..997fcf2 100644 --- a/controls-pi/build.gradle.kts +++ b/controls-pi/build.gradle.kts @@ -9,8 +9,8 @@ description = """ dependencies{ api(project(":controls-core")) - api("com.pi4j:pi4j-ktx:2.4.0") // Kotlin DSL - api("com.pi4j:pi4j-core:2.3.0") - api("com.pi4j:pi4j-plugin-raspberrypi:2.3.0") - api("com.pi4j:pi4j-plugin-pigpio:2.3.0") + api(libs.pi4j.ktx) // Kotlin DSL + api(libs.pi4j.core) + api(libs.pi4j.plugin.raspberrypi) + api(libs.pi4j.plugin.pigpio) } \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e39b1d9..da20aff 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -20,6 +20,15 @@ rabbitmq = "5.14.2" kmongo = "4.5.1" +j2mod = "3.2.1" + +milo = "0.6.12" + +pi4j = "2.3.0" +pi4j-ktx = "2.4.0" + +versions = "0.51.0" + [libraries] dataforge-io = { module = "space.kscience:dataforge-io", version.ref = "dataforge" } @@ -46,4 +55,21 @@ hivemq-mqtt-client = { module = "com.hivemq:hivemq-mqtt-client", version.ref = " rabbitmq-amqp-client = { module = "com.rabbitmq:amqp-client", version.ref = "rabbitmq" } +j2mod = { module = "com.ghgande:j2mod", version.ref = "j2mod" } + kmongo-coroutine-serialization = { module = "org.litote.kmongo:kmongo-coroutine-serialization", version.ref = "kmongo" } + +milo-client = { module = "org.eclipse.milo:sdk-client", version.ref = "milo" } +milo-parser = { module = "org.eclipse.milo:bsd-parser", version.ref = "milo" } +milo-server = { module = "org.eclipse.milo:sdk-server", version.ref = "milo" } + +pi4j-ktx = { module = "com.pi4j:pi4j-ktx", version.ref = "pi4j-ktx" } +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" } + +# Buildscript + +[plugins] + +versions = { id = "com.github.ben-manes.versions", version.ref = "versions" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 17655d0..48c0a02 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists