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

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

View File

@ -4,6 +4,7 @@ import space.kscience.gradle.useSPCTeam
plugins { plugins {
id("space.kscience.gradle.project") id("space.kscience.gradle.project")
alias(libs.plugins.versions)
} }
allprojects { allprojects {

View File

@ -12,7 +12,7 @@ description = """
dependencies { dependencies {
api(projects.controlsCore) api(projects.controlsCore)
api("com.ghgande:j2mod:3.1.1") api(libs.j2mod)
} }
readme{ readme{

View File

@ -11,15 +11,13 @@ description = """
val ktorVersion: String by rootProject.extra val ktorVersion: String by rootProject.extra
val miloVersion: String = "0.6.10"
dependencies { dependencies {
api(projects.controlsCore) api(projects.controlsCore)
api(spclibs.kotlinx.coroutines.jdk8) api(spclibs.kotlinx.coroutines.jdk8)
api("org.eclipse.milo:sdk-client:$miloVersion") api(libs.milo.client)
api("org.eclipse.milo:bsd-parser:$miloVersion") api(libs.milo.parser)
api("org.eclipse.milo:sdk-server:$miloVersion") api(libs.milo.server)
testImplementation(spclibs.kotlinx.coroutines.test) testImplementation(spclibs.kotlinx.coroutines.test)
} }

View File

@ -9,8 +9,8 @@ description = """
dependencies{ dependencies{
api(project(":controls-core")) api(project(":controls-core"))
api("com.pi4j:pi4j-ktx:2.4.0") // Kotlin DSL api(libs.pi4j.ktx) // Kotlin DSL
api("com.pi4j:pi4j-core:2.3.0") api(libs.pi4j.core)
api("com.pi4j:pi4j-plugin-raspberrypi:2.3.0") api(libs.pi4j.plugin.raspberrypi)
api("com.pi4j:pi4j-plugin-pigpio:2.3.0") api(libs.pi4j.plugin.pigpio)
} }

View File

@ -20,6 +20,15 @@ rabbitmq = "5.14.2"
kmongo = "4.5.1" 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] [libraries]
dataforge-io = { module = "space.kscience:dataforge-io", version.ref = "dataforge" } 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" } 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" } 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" }

View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists 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 zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists