Skip to content
Snippets Groups Projects
Commit 7d90ecbb authored by Davide Pianca's avatar Davide Pianca
Browse files

Use version catalogs

parent 10e9d747
No related branches found
No related tags found
No related merge requests found
......@@ -7,14 +7,14 @@ allprojects {
buildscript {
dependencies {
classpath("org.jetbrains.kotlinx:atomicfu-gradle-plugin:0.23.1")
classpath("org.jetbrains.kotlinx:atomicfu-gradle-plugin:0.24.0")
}
}
plugins {
kotlin("multiplatform") version "1.9.23" apply false
id("com.louiscad.complete-kotlin") version "1.1.0"
id("com.goncalossilva.resources") version "0.4.0"
alias(libs.plugins.kotlin.multiplatform) apply false
alias(libs.plugins.complete.kotlin)
alias(libs.plugins.goncalossilva.resources)
}
subprojects {
......
kotlin.code.style=official
serializationVersion=1.6.2
coroutineVersion=1.8.0-RC
atomicfuVersion=0.23.1
nodeWrapperVersion=18.16.12-pre.683
kotlin.js.generate.executable.default=false
systemProp.org.gradle.internal.http.connectionTimeout=180000
systemProp.org.gradle.internal.http.socketTimeout=180000
\ No newline at end of file
[versions]
serialization = "1.6.3"
coroutines = "1.8.0"
atomicfu = "0.24.0"
nodeWrapper = "20.11.30-pre.732"
completeKotlin = "1.1.0"
silvaResources = "0.4.0"
kotlin = "1.9.23"
shadow = "7.1.2"
[libraries]
kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
kotlinx-serialization-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core", version.ref = "serialization" }
kotlinx-serialization-protobuf = { module = "org.jetbrains.kotlinx:kotlinx-serialization-protobuf", version.ref = "serialization" }
kotlin-node = { module = "org.jetbrains.kotlin-wrappers:kotlin-node", version.ref = "nodeWrapper" }
atomicfu = { module = "org.jetbrains.kotlinx:atomicfu", version.ref = "atomicfu" }
goncalossilva-resources = { module = "com.goncalossilva:resources", version.ref = "silvaResources" }
[plugins]
kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
complete-kotlin = { id = "com.louiscad.complete-kotlin", version.ref = "completeKotlin" }
goncalossilva-resources = { id = "com.goncalossilva.resources", version.ref = "silvaResources" }
johnrengelman-shadow = { id = "com.github.johnrengelman.shadow", version.ref = "shadow" }
#Thu Jan 16 11:21:13 CET 2020
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
......
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
plugins {
kotlin("multiplatform")
kotlin("plugin.serialization") version "1.9.23"
alias(libs.plugins.kotlin.multiplatform)
alias(libs.plugins.kotlin.serialization)
id("convention.publication")
id("com.github.johnrengelman.shadow") version "7.1.2"
alias(libs.plugins.johnrengelman.shadow)
id("kotlinx-atomicfu")
}
val serializationVersion: String by project
val coroutineVersion: String by project
val atomicfuVersion: String by project
val nodeWrapperVersion: String by project
kotlin {
explicitApi()
......@@ -65,9 +60,9 @@ kotlin {
dependencies {
implementation(kotlin("stdlib-common"))
implementation(project(":kmqtt-common"))
implementation("org.jetbrains.kotlinx:kotlinx-serialization-core:$serializationVersion")
implementation("org.jetbrains.kotlinx:kotlinx-serialization-protobuf:$serializationVersion")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutineVersion")
implementation(libs.kotlinx.serialization.core)
implementation(libs.kotlinx.serialization.protobuf)
implementation(libs.kotlinx.coroutines.core)
}
}
val commonTest by getting {
......@@ -75,8 +70,8 @@ kotlin {
implementation(kotlin("test-common"))
implementation(kotlin("test-annotations-common"))
implementation(project(":kmqtt-client"))
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutineVersion")
implementation("com.goncalossilva:resources:0.4.0")
implementation(libs.kotlinx.coroutines.test)
implementation(libs.goncalossilva.resources)
}
}
val jvmMain by getting {
......@@ -92,7 +87,7 @@ kotlin {
}
val jsMain by getting {
dependencies {
implementation("org.jetbrains.kotlin-wrappers:kotlin-node:$nodeWrapperVersion")
implementation(libs.kotlin.node)
}
}
val jsTest by getting {
......@@ -103,7 +98,7 @@ kotlin {
val posixMain by creating {
dependsOn(commonMain)
dependencies {
implementation("org.jetbrains.kotlinx:atomicfu:$atomicfuVersion")
implementation(libs.atomicfu)
}
}
val mingwX64Main by getting {
......
......@@ -32,7 +32,7 @@ internal actual open class ServerSocket actual constructor(
}
fun onConnect(socket: node.net.Socket) {
socket.on(SocketEvent.ERROR) { error: Error ->
socket.on(SocketEvent.ERROR) { error: Throwable ->
println(error.message)
}
......
plugins {
kotlin("multiplatform")
alias(libs.plugins.kotlin.multiplatform)
id("convention.publication")
id("kotlinx-atomicfu")
}
val coroutineVersion: String by project
val atomicfuVersion: String by project
val nodeWrapperVersion: String by project
kotlin {
explicitApi()
jvm {
......@@ -47,7 +43,7 @@ kotlin {
dependencies {
implementation(kotlin("stdlib-common"))
implementation(project(":kmqtt-common"))
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutineVersion")
implementation(libs.kotlinx.coroutines.core)
}
}
val commonTest by getting {
......@@ -65,7 +61,7 @@ kotlin {
}
val jsMain by getting {
dependencies {
implementation("org.jetbrains.kotlin-wrappers:kotlin-node:$nodeWrapperVersion")
implementation(libs.kotlin.node)
}
}
val jsTest by getting {
......@@ -76,7 +72,7 @@ kotlin {
val posixMain by creating {
dependsOn(commonMain)
dependencies {
implementation("org.jetbrains.kotlinx:atomicfu:$atomicfuVersion")
implementation(libs.atomicfu)
}
}
val mingwX64Main by getting {
......
plugins {
kotlin("multiplatform")
alias(libs.plugins.kotlin.multiplatform)
id("convention.publication")
}
val nodeWrapperVersion: String by project
kotlin {
explicitApi()
......@@ -60,7 +58,7 @@ kotlin {
}
val jsMain by getting {
dependencies {
implementation("org.jetbrains.kotlin-wrappers:kotlin-node:$nodeWrapperVersion")
implementation(libs.kotlin.node)
implementation(kotlin("test-js"))
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment