diff --git a/client-groovy4/build.gradle.kts b/client-groovy4/build.gradle.kts index 308dde22..6a5b81bd 100644 --- a/client-groovy4/build.gradle.kts +++ b/client-groovy4/build.gradle.kts @@ -15,82 +15,62 @@ dependencies { constraints { implementation("de.gesellix:docker-engine") { version { - strictly("[2024-11-06T01-01-01,)") + strictly("[2025-01-01T01-01-01,)") } } implementation("de.gesellix:docker-filesocket") { version { - strictly("[2024-11-04T01-01-01,)") + strictly("[2025-01-01T01-01-01,)") } } implementation("de.gesellix:docker-remote-api-model-1-41") { version { - strictly("[2024-11-06T01-01-01,)") + strictly("[2025-01-01T01-01-01,)") } } - implementation("org.slf4j:slf4j-api") { + implementation(libs.slf4j) { version { - strictly("[1.7,3)") - prefer("2.0.16") + strictly(libs.versions.slf4jVersionrange.get()) + prefer(libs.versions.slf4j.get()) } } - implementation("com.squareup.okhttp3:mockwebserver") { - version { - strictly("[4,5)") - prefer("4.12.0") - } - } - api("com.squareup.okhttp3:okhttp") { - version { - strictly("[4,5)") - prefer("4.12.0") + listOf(libs.bundles.okhttp).forEach { + implementation(it) { + version { + strictly(libs.versions.okhttpVersionrange.get()) + prefer(libs.versions.okhttp.get()) + } } } - listOf( - "com.squareup.okio:okio", - "com.squareup.okio:okio-jvm" - ).forEach { + listOf(libs.bundles.okio).forEach { implementation(it) { version { - strictly("[3,4)") - prefer("3.9.1") + strictly(libs.versions.okioVersionrange.get()) + prefer(libs.versions.okio.get()) } } } - listOf( - "org.jetbrains.kotlin:kotlin-reflect", - "org.jetbrains.kotlin:kotlin-stdlib", - "org.jetbrains.kotlin:kotlin-stdlib-jdk7", - "org.jetbrains.kotlin:kotlin-stdlib-jdk8", - "org.jetbrains.kotlin:kotlin-stdlib-common", - "org.jetbrains.kotlin:kotlin-test" - ).forEach { + listOf(libs.bundles.kotlin).forEach { implementation(it) { version { - strictly("[1.6,3)") - prefer("2.1.0") + strictly(libs.versions.kotlinVersionrange.get()) + prefer(libs.versions.kotlin.get()) } } } - listOf( - "org.apache.groovy:groovy", - "org.apache.groovy:groovy-json" - ).forEach { + listOf(libs.bundles.groovy4).forEach { implementation(it) { version { - strictly("[4,)") - prefer("4.0.24") + strictly(libs.versions.groovy4Versionrange.get()) + prefer(libs.versions.groovy4.get()) } } } - listOf( - "com.squareup.moshi:moshi", - "com.squareup.moshi:moshi-kotlin" - ).forEach { + listOf(libs.bundles.moshi).forEach { implementation(it) { version { - strictly("[1.12.0,)") - prefer("1.15.2") + strictly(libs.versions.moshiVersionrange.get()) + prefer(libs.versions.moshi.get()) } } } @@ -103,24 +83,24 @@ dependencies { api("de.gesellix:docker-engine:2025-01-18T20-36-00") api("de.gesellix:docker-compose:2025-01-18T12-54-00") - implementation("org.apache.groovy:groovy:4.0.24") - implementation("org.apache.groovy:groovy-json:4.0.24") + implementation(libs.groovy4) + implementation(libs.groovy4json) - api("com.squareup.moshi:moshi:1.15.2") + api(libs.moshi) implementation("com.google.re2j:re2j:1.8") - implementation("org.slf4j:slf4j-api:2.0.16") - testImplementation("ch.qos.logback:logback-classic:[1.2,2)!!1.3.14") + implementation(libs.slf4j) + testImplementation("ch.qos.logback:logback-classic:${libs.versions.logbackVersionrange.get()}!!${libs.versions.logback.get()}") - implementation("com.squareup.okio:okio:3.9.1") - api("com.squareup.okhttp3:okhttp:4.12.0") - testImplementation("com.squareup.okhttp3:mockwebserver:[4,5)") + implementation(libs.okio) + api(libs.okhttp) + testImplementation("com.squareup.okhttp3:mockwebserver:${libs.versions.okhttp.get()}") implementation("org.apache.commons:commons-compress:1.27.1") -// implementation("org.bouncycastle:bcpkix-jdk18on:1.76") +// implementation("org.bouncycastle:bcpkix-jdk18on:1.80") - testImplementation("de.gesellix:testutil:[2024-01-01T01-01-01,)") + testImplementation("de.gesellix:testutil:[2025-01-01T01-01-01,)") testImplementation("org.junit.platform:junit-platform-launcher:1.11.4") testImplementation("org.spockframework:spock-core:2.3-groovy-4.0") diff --git a/client/build.gradle.kts b/client/build.gradle.kts index 776c6b42..719b736e 100644 --- a/client/build.gradle.kts +++ b/client/build.gradle.kts @@ -15,82 +15,62 @@ dependencies { constraints { implementation("de.gesellix:docker-engine") { version { - strictly("[2024-11-06T01-01-01,)") + strictly("[2025-01-01T01-01-01,)") } } implementation("de.gesellix:docker-filesocket") { version { - strictly("[2024-11-04T01-01-01,)") + strictly("[2025-01-01T01-01-01,)") } } implementation("de.gesellix:docker-remote-api-model-1-41") { version { - strictly("[2024-11-06T01-01-01,)") + strictly("[2025-01-01T01-01-01,)") } } - implementation("org.slf4j:slf4j-api") { + implementation(libs.slf4j) { version { - strictly("[1.7,3)") - prefer("2.0.16") + strictly(libs.versions.slf4jVersionrange.get()) + prefer(libs.versions.slf4j.get()) } } - implementation("com.squareup.okhttp3:mockwebserver") { - version { - strictly("[4,5)") - prefer("4.12.0") - } - } - api("com.squareup.okhttp3:okhttp") { - version { - strictly("[4,5)") - prefer("4.12.0") + listOf(libs.bundles.okhttp).forEach { + implementation(it) { + version { + strictly(libs.versions.okhttpVersionrange.get()) + prefer(libs.versions.okhttp.get()) + } } } - listOf( - "com.squareup.okio:okio", - "com.squareup.okio:okio-jvm" - ).forEach { + listOf(libs.bundles.okio).forEach { implementation(it) { version { - strictly("[3,4)") - prefer("3.9.1") + strictly(libs.versions.okioVersionrange.get()) + prefer(libs.versions.okio.get()) } } } - listOf( - "org.jetbrains.kotlin:kotlin-reflect", - "org.jetbrains.kotlin:kotlin-stdlib", - "org.jetbrains.kotlin:kotlin-stdlib-jdk7", - "org.jetbrains.kotlin:kotlin-stdlib-jdk8", - "org.jetbrains.kotlin:kotlin-stdlib-common", - "org.jetbrains.kotlin:kotlin-test" - ).forEach { + listOf(libs.bundles.kotlin).forEach { implementation(it) { version { - strictly("[1.6,3)") - prefer("2.1.0") + strictly(libs.versions.kotlinVersionrange.get()) + prefer(libs.versions.kotlin.get()) } } } - listOf( - "org.codehaus.groovy:groovy", - "org.codehaus.groovy:groovy-json" - ).forEach { + listOf(libs.bundles.groovy3).forEach { implementation(it) { version { - strictly("[3,4)") - prefer("3.0.23") + strictly(libs.versions.groovy3Versionrange.get()) + prefer(libs.versions.groovy3.get()) } } } - listOf( - "com.squareup.moshi:moshi", - "com.squareup.moshi:moshi-kotlin" - ).forEach { + listOf(libs.bundles.moshi).forEach { implementation(it) { version { - strictly("[1.12.0,)") - prefer("1.15.2") + strictly(libs.versions.moshiVersionrange.get()) + prefer(libs.versions.moshi.get()) } } } @@ -103,24 +83,24 @@ dependencies { api("de.gesellix:docker-engine:2025-01-18T20-36-00") api("de.gesellix:docker-compose:2025-01-18T12-54-00") - implementation("org.codehaus.groovy:groovy:3.0.23") - implementation("org.codehaus.groovy:groovy-json:3.0.23") + implementation(libs.groovy3) + implementation(libs.groovy3json) - api("com.squareup.moshi:moshi:1.15.2") + api(libs.moshi) implementation("com.google.re2j:re2j:1.8") - implementation("org.slf4j:slf4j-api:2.0.16") - testImplementation("ch.qos.logback:logback-classic:[1.2,2)!!1.3.14") + implementation(libs.slf4j) + testImplementation("ch.qos.logback:logback-classic:${libs.versions.logbackVersionrange.get()}!!${libs.versions.logback.get()}") - implementation("com.squareup.okio:okio:3.9.1") - api("com.squareup.okhttp3:okhttp:4.12.0") - testImplementation("com.squareup.okhttp3:mockwebserver:[4,5)") + implementation(libs.okio) + api(libs.okhttp) + testImplementation("com.squareup.okhttp3:mockwebserver:${libs.versions.okhttp.get()}") implementation("org.apache.commons:commons-compress:1.27.1") implementation("org.bouncycastle:bcpkix-jdk18on:1.80") - testImplementation("de.gesellix:testutil:[2024-01-01T01-01-01,)") + testImplementation("de.gesellix:testutil:[2025-01-01T01-01-01,)") testImplementation("org.junit.platform:junit-platform-launcher:1.11.4") testImplementation("org.spockframework:spock-core:2.3-groovy-3.0") diff --git a/explore/build.gradle.kts b/explore/build.gradle.kts index 547aa49a..e19f4523 100644 --- a/explore/build.gradle.kts +++ b/explore/build.gradle.kts @@ -11,68 +11,55 @@ java { dependencies { constraints { - implementation("org.slf4j:slf4j-api") { + implementation(libs.slf4j) { version { - strictly("[1.7,3)") - prefer("2.0.16") + strictly(libs.versions.slf4jVersionrange.get()) + prefer(libs.versions.slf4j.get()) } } - implementation("com.squareup.okio:okio") { + implementation(libs.okio) { version { - strictly("[3,4)") + strictly(libs.versions.okioVersionrange.get()) } } - listOf( - "org.jetbrains.kotlin:kotlin-reflect", - "org.jetbrains.kotlin:kotlin-stdlib", - "org.jetbrains.kotlin:kotlin-stdlib-jdk7", - "org.jetbrains.kotlin:kotlin-stdlib-jdk8", - "org.jetbrains.kotlin:kotlin-stdlib-common", - "org.jetbrains.kotlin:kotlin-test" - ).forEach { + listOf(libs.bundles.kotlin).forEach { implementation(it) { version { - strictly("[1.6,3)") - prefer("2.1.0") + strictly(libs.versions.kotlinVersionrange.get()) + prefer(libs.versions.kotlin.get()) } } } - listOf( - "org.codehaus.groovy:groovy", - "org.codehaus.groovy:groovy-json" - ).forEach { + listOf(libs.bundles.groovy3).forEach { implementation(it) { version { - strictly("[3,4)") - prefer("3.0.23") + strictly(libs.versions.groovy3Versionrange.get()) + prefer(libs.versions.groovy3.get()) } } } - listOf( - "org.apache.groovy:groovy", - "org.apache.groovy:groovy-json" - ).forEach { + listOf(libs.bundles.groovy4).forEach { implementation(it) { version { - strictly("[4,)") - prefer("4.0.24") + strictly(libs.versions.groovy4Versionrange.get()) + prefer(libs.versions.groovy4.get()) } } } } // implementation(project(":client")) implementation(project(":client-groovy4")) -// implementation("org.codehaus.groovy:groovy:[3,4)") - implementation("org.apache.groovy:groovy:4.0.24") +// implementation(libs.groovy3) + implementation(libs.groovy4) testImplementation("org.apache.commons:commons-compress:1.27.1") - implementation("org.slf4j:slf4j-api:2.0.16") - runtimeOnly("ch.qos.logback:logback-classic:[1.2,2)!!1.3.14") + implementation(libs.slf4j) + runtimeOnly("ch.qos.logback:logback-classic:${libs.versions.logbackVersionrange.get()}!!${libs.versions.logback.get()}") // testImplementation("org.spockframework:spock-core:2.3-groovy-3.0") testImplementation("org.spockframework:spock-core:2.3-groovy-4.0") testRuntimeOnly("net.bytebuddy:byte-buddy:1.16.0") - testRuntimeOnly("ch.qos.logback:logback-classic:[1.2,2)!!1.3.14") + testRuntimeOnly("ch.qos.logback:logback-classic:${libs.versions.logbackVersionrange.get()}!!${libs.versions.logback.get()}") } tasks { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 00000000..dbe487fc --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,56 @@ +[versions] +groovy3 = "3.0.23" +groovy3Versionrange = "[3,4)" +groovy4 = "4.0.24" +groovy4Versionrange = "[4,)" +junitJupiter = "5.11.4" +junitPlatform = "1.11.4" +kotlin = "2.1.0" +kotlinVersionrange = "[1.6,3)" +logback = "1.3.15" +logbackVersionrange = "[1.2,2)" +moshi = "1.15.2" +moshiVersionrange = "[1.12.0,2)" +okhttp = "4.12.0" +okhttpVersionrange = "[4,5)" +okio = "3.10.2" +okioVersionrange = "[3,4)" +slf4j = "2.0.16" +slf4jVersionrange = "[1.7,3)" + +[libraries] +groovy3 = { module = "org.codehaus.groovy:groovy", version.ref = "groovy3" } +groovy3json = { module = "org.codehaus.groovy:groovy-json", version.ref = "groovy3" } +groovy4 = { module = "org.apache.groovy:groovy", version.ref = "groovy4" } +groovy4json = { module = "org.apache.groovy:groovy-json", version.ref = "groovy4" } +junitJupiterApi = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junitJupiter" } +junitJupiterEngine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junitJupiter" } +junitPlatformCommons = { module = "org.junit.platform:junit-platform-commons", version.ref = "junitPlatform" } +junitPlatformLauncher = { module = "org.junit.platform:junit-platform-launcher", version.ref = "junitPlatform" } +kotlin = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" } +kotlinCommon = { module = "org.jetbrains.kotlin:kotlin-stdlib-common", version.ref = "kotlin" } +kotlinJdk7 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk7", version.ref = "kotlin" } +kotlinJdk8 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" } +kotlinReflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" } +kotlinScriptingJvm = { module = "org.jetbrains.kotlin:kotlin-scripting-jvm", version.ref = "kotlin" } +kotlinStdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" } +kotlinTest = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" } +logback = { module = "ch.qos.logback:logback-classic", version.ref = "logback" } +moshi = { module = "com.squareup.moshi:moshi", version.ref = "moshi" } +moshiKotlin = { module = "com.squareup.moshi:moshi-kotlin", version.ref = "moshi" } +okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" } +okhttpMockwebserver = { module = "com.squareup.okhttp3:mockwebserver", version.ref = "okhttp" } +okio = { module = "com.squareup.okio:okio", version.ref = "okio" } +okioJvm = { module = "com.squareup.okio:okio-jvm", version.ref = "okio" } +slf4j = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" } + +[bundles] +groovy3 = ["groovy3", "groovy3json"] +groovy4 = ["groovy4", "groovy4json"] +kotlin = ["kotlin", "kotlinCommon", "kotlinJdk7", "kotlinJdk8", "kotlinReflect", "kotlinScriptingJvm", "kotlinStdlib", "kotlinTest"] +moshi = ["moshi", "moshiKotlin"] +okhttp = ["okhttp", "okhttpMockwebserver"] +okio = ["okio", "okioJvm"] + +[plugins] +kotlinJvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } diff --git a/integration-test/build.gradle.kts b/integration-test/build.gradle.kts index 1ecc9d3b..6a2747df 100644 --- a/integration-test/build.gradle.kts +++ b/integration-test/build.gradle.kts @@ -13,63 +13,50 @@ dependencies { constraints { implementation("de.gesellix:docker-engine") { version { - strictly("[2024-11-06T01-01-01,)") + strictly("[2025-01-01T01-01-01,)") } } implementation("de.gesellix:docker-filesocket") { version { - strictly("[2024-11-04T01-01-01,)") + strictly("[2025-01-01T01-01-01,)") } } implementation("de.gesellix:docker-remote-api-model-1-41") { version { - strictly("[2024-11-06T01-01-01,)") + strictly("[2025-01-01T01-01-01,)") } } - implementation("org.slf4j:slf4j-api") { + implementation(libs.slf4j) { version { - strictly("[1.7,3)") - prefer("2.0.16") + strictly(libs.versions.slf4jVersionrange.get()) + prefer(libs.versions.slf4j.get()) } } - listOf( - "com.squareup.okhttp3:mockwebserver", - "com.squareup.okhttp3:okhttp" - ).forEach { + listOf(libs.bundles.okhttp).forEach { implementation(it) { version { - strictly("[4,5)") - prefer("4.12.0") + strictly(libs.versions.okhttpVersionrange.get()) + prefer(libs.versions.okhttp.get()) } } } - implementation("com.squareup.okio:okio") { + implementation(libs.okio) { version { - strictly("[3,4)") + strictly(libs.versions.okioVersionrange.get()) } } - implementation("com.squareup.moshi:moshi") { - version { - strictly("[1.12.0,2)") - } - } - implementation("com.squareup.moshi:moshi-kotlin") { - version { - strictly("[1.12.0,2)") + listOf(libs.bundles.moshi).forEach { + implementation(it) { + version { + strictly(libs.versions.moshiVersionrange.get()) + } } } - listOf( - "org.jetbrains.kotlin:kotlin-reflect", - "org.jetbrains.kotlin:kotlin-stdlib", - "org.jetbrains.kotlin:kotlin-stdlib-jdk7", - "org.jetbrains.kotlin:kotlin-stdlib-jdk8", - "org.jetbrains.kotlin:kotlin-stdlib-common", - "org.jetbrains.kotlin:kotlin-test" - ).forEach { + listOf(libs.bundles.kotlin).forEach { implementation(it) { version { - strictly("[1.6,3)") - prefer("2.1.0") + strictly(libs.versions.kotlinVersionrange.get()) + prefer(libs.versions.kotlin.get()) } } } @@ -84,15 +71,15 @@ dependencies { testImplementation("org.apache.commons:commons-compress:1.27.1") testImplementation("org.slf4j:slf4j-api:[1.7,)") - runtimeOnly("ch.qos.logback:logback-classic:[1.2,2)!!1.3.14") + runtimeOnly("ch.qos.logback:logback-classic:${libs.versions.logbackVersionrange.get()}!!${libs.versions.logback.get()}") - testImplementation("de.gesellix:docker-registry:2024-11-24T11-22-00") - testImplementation("de.gesellix:testutil:[2024-01-01T01-01-01,)") + testImplementation("de.gesellix:docker-registry:2025-01-18T21-41-00") + testImplementation("de.gesellix:testutil:[2025-01-01T01-01-01,)") testImplementation("org.spockframework:spock-core:2.3-groovy-3.0") // testImplementation("org.spockframework:spock-core:2.3-groovy-4.0") testRuntimeOnly("net.bytebuddy:byte-buddy:1.16.0") testImplementation("org.apache.commons:commons-lang3:3.17.0") - testRuntimeOnly("ch.qos.logback:logback-classic:[1.2,2)!!1.3.14") + testRuntimeOnly("ch.qos.logback:logback-classic:${libs.versions.logbackVersionrange.get()}!!${libs.versions.logback.get()}") } tasks{