From c62c7859811ddc47552574d935bc75d10125e781 Mon Sep 17 00:00:00 2001 From: Mehdi Mollaverdi Date: Thu, 18 Sep 2025 14:39:10 +1000 Subject: [PATCH 1/4] Upgrade most dependencies --- build.gradle.kts | 6 +-- gradle/libs.versions.toml | 53 ++++++++++++------------- samples/guides-junit4/build.gradle.kts | 8 ++-- samples/guides-junit5/build.gradle.kts | 8 ++-- samples/guides/build.gradle.kts | 8 ++-- samples/guides2-junit4/build.gradle.kts | 8 ++-- samples/guides2-junit5/build.gradle.kts | 8 ++-- samples/guides2/build.gradle.kts | 8 ++-- samples/javarecord/build.gradle.kts | 8 ++-- 9 files changed, 57 insertions(+), 58 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 8b97719c5..7c27145ee 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -73,9 +73,9 @@ subprojects { // Only apply if the project has the kotlin plugin added: plugins.withType { tasks.withType { - kotlinOptions { - jvmTarget = JavaVersion.VERSION_11.toString() - freeCompilerArgs = listOf("-Xjvm-default=all-compatibility") + compilerOptions { + jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11) + freeCompilerArgs.set(listOf("-Xjvm-default=all-compatibility")) } // dependsOn("spotlessKotlinApply") } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 72cf4083f..0cefdd7a2 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,58 +1,57 @@ [versions] -aws2 = "2.31.30" -jackson = "2.14.3" -jetty = "12.0.9" -ktlint = "0.40.0" -kotlin = "1.9.23" +aws2 = "2.33.11" +jackson = "2.20.0" +jetty = "12.0.27" +kotlin = "2.2.10" sqlite4java = "1.0.392" [libraries] antlr4Runtime = { module = "org.antlr:antlr4-runtime", version = "4.13.2" } -assertj = { module = "org.assertj:assertj-core", version = "3.23.1" } +assertj = { module = "org.assertj:assertj-core", version = "3.27.4" } aws2Dynamodb = { module = "software.amazon.awssdk:dynamodb", version.ref = "aws2" } aws2DynamodbEnhanced = { module = "software.amazon.awssdk:dynamodb-enhanced", version.ref = "aws2" } aws2Pinpoint = { module = "software.amazon.awssdk:pinpoint", version.ref = "aws2" } # for DynamoDBLocal -awsDynamodb = { module = "com.amazonaws:aws-java-sdk-dynamodb", version = "1.12.782" } -awsDynamodbLocal = { module = "com.amazonaws:DynamoDBLocal", version = "2.6.0" } +awsDynamodb = { module = "com.amazonaws:aws-java-sdk-dynamodb", version = "1.12.791" } +awsDynamodbLocal = { module = "com.amazonaws:DynamoDBLocal", version = "2.6.1" } clikt = { module = "com.github.ajalt:clikt", version = "2.8.0" } -commonsCli = { module = "commons-cli:commons-cli", version = "1.9.0" } # for DynamoDBLocal -commonsLang3 = { module = "org.apache.commons:commons-lang3", version = "3.17.0" } # for DynamoDBLocal -dokkaGradlePlugin = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version = "1.9.20" } -dockerCore = { module = "com.github.docker-java:docker-java-core", version = "3.5.0" } -dockerTransport = { module = "com.github.docker-java:docker-java-transport-httpclient5", version = "3.5.0" } +commonsCli = { module = "commons-cli:commons-cli", version = "1.10.0" } # for DynamoDBLocal +commonsLang3 = { module = "org.apache.commons:commons-lang3", version = "3.18.0" } # for DynamoDBLocal +dokkaGradlePlugin = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version = "2.0.0" } +dockerCore = { module = "com.github.docker-java:docker-java-core", version = "3.6.0" } +dockerTransport = { module = "com.github.docker-java:docker-java-transport-httpclient5", version = "3.6.0" } findbugsJsr305 = { module = "com.google.code.findbugs:jsr305", version = "3.0.2" } -guava = { module = "com.google.guava:guava", version = "31.0.1-jre" } +guava = { module = "com.google.guava:guava", version = "33.4.8-jre" } jacksonDatabind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson" } # for DynamoDBLocal jacksonDatatypeJsr310 = { module = "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", version.ref = "jackson" } # for DynamoDBLocal jettyAlpnClient = { module = "org.eclipse.jetty:jetty-alpn-client", version.ref = "jetty" } # for DynamoDBLocal jettyClient = { module = "org.eclipse.jetty:jetty-client", version.ref = "jetty" } # for DynamoDBLocal jettyServer = { module = "org.eclipse.jetty:jetty-server", version.ref = "jetty" } # for DynamoDBLocal junit4Api = { module = "junit:junit", version = "4.13.2" } -junitApi = { module = "org.junit.jupiter:junit-jupiter-api", version = "5.8.2" } -junitEngine = { module = "org.junit.jupiter:junit-jupiter-engine", version = "5.11.4" } +junitApi = { module = "org.junit.jupiter:junit-jupiter-api", version = "5.13.4" } +junitEngine = { module = "org.junit.jupiter:junit-jupiter-engine", version = "5.13.4" } junitGradlePlugin = { module = "org.junit.platform:junit-platform-gradle-plugin", version = "1.2.0" } kotlinGradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" } kotlinReflection = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" } kotlinStdLib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" } -kotlinxCoroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version = "1.6.4" } -kotlinxCoroutinesJdk8 = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8", version = "1.6.4" } -kotlinxCoroutinesReactive = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-reactive", version = "1.6.4" } -log4jCore = { module = "org.apache.logging.log4j:log4j-core", version = "2.17.1" } -loggingApi = { module = "io.github.microutils:kotlin-logging", version = "2.0.10" } -mavenPublishGradlePlugin = { module = "com.vanniktech:gradle-maven-publish-plugin", version = "0.31.0" } +kotlinxCoroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version = "1.10.2" } +kotlinxCoroutinesJdk8 = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8", version = "1.10.2" } +kotlinxCoroutinesReactive = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-reactive", version = "1.10.2" } +log4jCore = { module = "org.apache.logging.log4j:log4j-core", version = "2.25.1" } +loggingApi = { module = "io.github.microutils:kotlin-logging", version = "3.0.5" } +mavenPublishGradlePlugin = { module = "com.vanniktech:gradle-maven-publish-plugin", version = "0.33.0" } moshiCore = { module = "com.squareup.moshi:moshi", version = "1.15.2" } moshiKotlin = { module = "com.squareup.moshi:moshi-kotlin", version = "1.15.2" } -nettyBom = { module = "io.netty:netty-bom", version = "4.1.79.Final" } -okio = { module = "com.squareup.okio:okio", version = "3.4.0" } -okioFakefilesystem = { module = "com.squareup.okio:okio-fakefilesystem", version = "3.4.0" } -shadowGradlePlugin = { module = "com.gradleup.shadow:shadow-gradle-plugin", version = "8.3.6" } +nettyBom = { module = "io.netty:netty-bom", version = "4.2.6.Final" } +okio = { module = "com.squareup.okio:okio", version = "3.16.0" } +okioFakefilesystem = { module = "com.squareup.okio:okio-fakefilesystem", version = "3.16.0" } +shadowGradlePlugin = { module = "com.gradleup.shadow:shadow-gradle-plugin", version = "9.1.0" } slf4jApi = { module = "org.slf4j:slf4j-api", version = "2.0.17" } # for DynamoDBLocal sqlite4javaLinuxI386 = { module = "com.almworks.sqlite4java:libsqlite4java-linux-i386", version.ref = "sqlite4java" } # for DynamoDBLocal sqlite4javaLinuxAmd64 = { module = "com.almworks.sqlite4java:libsqlite4java-linux-amd64", version.ref = "sqlite4java" } # for DynamoDBLocal sqlite4javaOsx = { module = "com.almworks.sqlite4java:libsqlite4java-osx", version.ref = "sqlite4java" } # for DynamoDBLocal sqlite4javaWinX64 = { module = "com.almworks.sqlite4java:sqlite4java-win32-x64", version.ref = "sqlite4java" } # for DynamoDBLocal sqlite4javaWinX86 = { module = "com.almworks.sqlite4java:sqlite4java-win32-x86", version.ref = "sqlite4java" } # for DynamoDBLocal -wireGradlePlugin = { module = "com.squareup.wire:wire-gradle-plugin", version = "4.8.1" } +wireGradlePlugin = { module = "com.squareup.wire:wire-gradle-plugin", version = "5.4.0" } [bundles] jackson = ["jacksonDatabind", "jacksonDatatypeJsr310"] diff --git a/samples/guides-junit4/build.gradle.kts b/samples/guides-junit4/build.gradle.kts index a24bdb480..6f744d23e 100644 --- a/samples/guides-junit4/build.gradle.kts +++ b/samples/guides-junit4/build.gradle.kts @@ -22,14 +22,14 @@ tasks.withType { } val compileKotlin by tasks.getting(KotlinCompile::class) { - kotlinOptions { - jvmTarget = JavaVersion.VERSION_11.toString() + compilerOptions { + jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11) } } val compileTestKotlin by tasks.getting(KotlinCompile::class) { - kotlinOptions { - jvmTarget = JavaVersion.VERSION_11.toString() + compilerOptions { + jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11) } } diff --git a/samples/guides-junit5/build.gradle.kts b/samples/guides-junit5/build.gradle.kts index ade266f24..c1d8adae1 100644 --- a/samples/guides-junit5/build.gradle.kts +++ b/samples/guides-junit5/build.gradle.kts @@ -19,14 +19,14 @@ dependencies { } val compileKotlin by tasks.getting(KotlinCompile::class) { - kotlinOptions { - jvmTarget = JavaVersion.VERSION_11.toString() + compilerOptions { + jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11) } } val compileTestKotlin by tasks.getting(KotlinCompile::class) { - kotlinOptions { - jvmTarget = JavaVersion.VERSION_11.toString() + compilerOptions { + jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11) } } diff --git a/samples/guides/build.gradle.kts b/samples/guides/build.gradle.kts index f7a9c47e0..c0be5d2d1 100644 --- a/samples/guides/build.gradle.kts +++ b/samples/guides/build.gradle.kts @@ -14,14 +14,14 @@ dependencies { } val compileKotlin by tasks.getting(KotlinCompile::class) { - kotlinOptions { - jvmTarget = JavaVersion.VERSION_11.toString() + compilerOptions { + jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11) } } val compileTestKotlin by tasks.getting(KotlinCompile::class) { - kotlinOptions { - jvmTarget = JavaVersion.VERSION_11.toString() + compilerOptions { + jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11) } } diff --git a/samples/guides2-junit4/build.gradle.kts b/samples/guides2-junit4/build.gradle.kts index 8b1b3c067..f1f660617 100644 --- a/samples/guides2-junit4/build.gradle.kts +++ b/samples/guides2-junit4/build.gradle.kts @@ -23,14 +23,14 @@ tasks.withType { } val compileKotlin by tasks.getting(KotlinCompile::class) { - kotlinOptions { - jvmTarget = JavaVersion.VERSION_11.toString() + compilerOptions { + jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11) } } val compileTestKotlin by tasks.getting(KotlinCompile::class) { - kotlinOptions { - jvmTarget = JavaVersion.VERSION_11.toString() + compilerOptions { + jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11) } } diff --git a/samples/guides2-junit5/build.gradle.kts b/samples/guides2-junit5/build.gradle.kts index 461b901c4..9c06091e6 100644 --- a/samples/guides2-junit5/build.gradle.kts +++ b/samples/guides2-junit5/build.gradle.kts @@ -20,14 +20,14 @@ dependencies { } val compileKotlin by tasks.getting(KotlinCompile::class) { - kotlinOptions { - jvmTarget = JavaVersion.VERSION_11.toString() + compilerOptions { + jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11) } } val compileTestKotlin by tasks.getting(KotlinCompile::class) { - kotlinOptions { - jvmTarget = JavaVersion.VERSION_11.toString() + compilerOptions { + jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11) } } diff --git a/samples/guides2/build.gradle.kts b/samples/guides2/build.gradle.kts index 890348a61..843c760cf 100644 --- a/samples/guides2/build.gradle.kts +++ b/samples/guides2/build.gradle.kts @@ -13,14 +13,14 @@ dependencies { } val compileKotlin by tasks.getting(KotlinCompile::class) { - kotlinOptions { - jvmTarget = JavaVersion.VERSION_11.toString() + compilerOptions { + jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11) } } val compileTestKotlin by tasks.getting(KotlinCompile::class) { - kotlinOptions { - jvmTarget = JavaVersion.VERSION_11.toString() + compilerOptions { + jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11) } } diff --git a/samples/javarecord/build.gradle.kts b/samples/javarecord/build.gradle.kts index 302df8055..48fe22a5b 100644 --- a/samples/javarecord/build.gradle.kts +++ b/samples/javarecord/build.gradle.kts @@ -12,14 +12,14 @@ dependencies { } val compileKotlin by tasks.getting(KotlinCompile::class) { - kotlinOptions { - jvmTarget = JavaVersion.VERSION_14.toString() + compilerOptions { + jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_14) } } val compileTestKotlin by tasks.getting(KotlinCompile::class) { - kotlinOptions { - jvmTarget = JavaVersion.VERSION_14.toString() + compilerOptions { + jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_14) } } From f9a506e1b0707b7b819433c730402a9ceaacbca9 Mon Sep 17 00:00:00 2001 From: Mehdi Mollaverdi Date: Thu, 18 Sep 2025 14:41:53 +1000 Subject: [PATCH 2/4] Fix a compile error --- .../main/kotlin/app/cash/tempest/internal/DynamoDbQueryable.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tempest/src/main/kotlin/app/cash/tempest/internal/DynamoDbQueryable.kt b/tempest/src/main/kotlin/app/cash/tempest/internal/DynamoDbQueryable.kt index 745b9af2e..1ad86d9a9 100644 --- a/tempest/src/main/kotlin/app/cash/tempest/internal/DynamoDbQueryable.kt +++ b/tempest/src/main/kotlin/app/cash/tempest/internal/DynamoDbQueryable.kt @@ -68,7 +68,7 @@ internal class DynamoDbQueryable( val specificAttributeNamesAliased = mutableListOf() val expressionAttributeNames = mutableMapOf() for (name in specificAttributeNames) { - val upperName = name.toUpperCase() + val upperName = name.uppercase() if (reservedWords.contains(upperName)) { val alias = "#$name" specificAttributeNamesAliased.add(alias) From c2fe7a6ce2a1c8b6991d10576098c8e77d994e20 Mon Sep 17 00:00:00 2001 From: Mehdi Mollaverdi Date: Thu, 18 Sep 2025 14:43:27 +1000 Subject: [PATCH 3/4] Remove an unused build classpath dep --- build.gradle.kts | 1 - gradle/libs.versions.toml | 1 - 2 files changed, 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 7c27145ee..2df115703 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -19,7 +19,6 @@ buildscript { classpath(libs.kotlinGradlePlugin) classpath(libs.mavenPublishGradlePlugin) classpath(libs.shadowGradlePlugin) - classpath(libs.wireGradlePlugin) } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0cefdd7a2..cbf0fc833 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -51,7 +51,6 @@ sqlite4javaLinuxAmd64 = { module = "com.almworks.sqlite4java:libsqlite4java-linu sqlite4javaOsx = { module = "com.almworks.sqlite4java:libsqlite4java-osx", version.ref = "sqlite4java" } # for DynamoDBLocal sqlite4javaWinX64 = { module = "com.almworks.sqlite4java:sqlite4java-win32-x64", version.ref = "sqlite4java" } # for DynamoDBLocal sqlite4javaWinX86 = { module = "com.almworks.sqlite4java:sqlite4java-win32-x86", version.ref = "sqlite4java" } # for DynamoDBLocal -wireGradlePlugin = { module = "com.squareup.wire:wire-gradle-plugin", version = "5.4.0" } [bundles] jackson = ["jacksonDatabind", "jacksonDatatypeJsr310"] From 0dbc4b4bae809f9352f0f54ad2de8e8c2e976919 Mon Sep 17 00:00:00 2001 From: Mehdi Mollaverdi Date: Thu, 18 Sep 2025 15:10:57 +1000 Subject: [PATCH 4/4] Add junitLauncher dep to stop test tasks from failing Also remove junit deps from projects with no deps --- gradle/libs.versions.toml | 1 + samples/guides-junit5/build.gradle.kts | 2 ++ samples/guides2-junit5/build.gradle.kts | 2 ++ samples/javarecord/build.gradle.kts | 1 + samples/musiclibrary-testing/build.gradle.kts | 4 ---- samples/musiclibrary/build.gradle.kts | 4 ---- samples/musiclibrary2/build.gradle.kts | 4 ---- samples/urlshortener/build.gradle.kts | 4 ---- samples/urlshortener2/build.gradle.kts | 4 ---- tempest-docker/build.gradle.kts | 1 + tempest-internal/build.gradle.kts | 4 ---- tempest-testing-docker/build.gradle.kts | 1 + tempest-testing-internal/build.gradle.kts | 4 ---- tempest-testing-junit5/build.gradle.kts | 1 + tempest-testing-jvm/build.gradle.kts | 4 ---- tempest-testing/build.gradle.kts | 4 ---- tempest/build.gradle.kts | 1 + tempest2-testing-docker/build.gradle.kts | 1 + tempest2-testing-internal/build.gradle.kts | 4 ---- tempest2-testing-junit5/build.gradle.kts | 1 + tempest2-testing-jvm/build.gradle.kts | 4 ---- tempest2-testing/build.gradle.kts | 4 ---- tempest2/build.gradle.kts | 1 + 23 files changed, 13 insertions(+), 48 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index cbf0fc833..925bf3758 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -30,6 +30,7 @@ junit4Api = { module = "junit:junit", version = "4.13.2" } junitApi = { module = "org.junit.jupiter:junit-jupiter-api", version = "5.13.4" } junitEngine = { module = "org.junit.jupiter:junit-jupiter-engine", version = "5.13.4" } junitGradlePlugin = { module = "org.junit.platform:junit-platform-gradle-plugin", version = "1.2.0" } +junitLauncher = { module = "org.junit.platform:junit-platform-launcher", version = "1.8.2" } kotlinGradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" } kotlinReflection = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" } kotlinStdLib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" } diff --git a/samples/guides-junit5/build.gradle.kts b/samples/guides-junit5/build.gradle.kts index c1d8adae1..c2ae00560 100644 --- a/samples/guides-junit5/build.gradle.kts +++ b/samples/guides-junit5/build.gradle.kts @@ -13,6 +13,8 @@ dependencies { testImplementation(libs.assertj) testImplementation(libs.junitApi) testImplementation(libs.junitEngine) + testRuntimeOnly(libs.junitLauncher) + implementation(project(":tempest-testing-docker")) implementation(project(":tempest-testing-jvm")) implementation(project(":tempest-testing-junit5")) diff --git a/samples/guides2-junit5/build.gradle.kts b/samples/guides2-junit5/build.gradle.kts index 9c06091e6..1271913d1 100644 --- a/samples/guides2-junit5/build.gradle.kts +++ b/samples/guides2-junit5/build.gradle.kts @@ -14,6 +14,8 @@ dependencies { testImplementation(libs.assertj) testImplementation(libs.junitApi) testImplementation(libs.junitEngine) + testRuntimeOnly(libs.junitLauncher) + implementation(project(":tempest2-testing-docker")) implementation(project(":tempest2-testing-jvm")) implementation(project(":tempest2-testing-junit5")) diff --git a/samples/javarecord/build.gradle.kts b/samples/javarecord/build.gradle.kts index 48fe22a5b..fcf408099 100644 --- a/samples/javarecord/build.gradle.kts +++ b/samples/javarecord/build.gradle.kts @@ -9,6 +9,7 @@ dependencies { testImplementation(project(":tempest-testing-junit5")) testImplementation(libs.assertj) testImplementation(libs.junitEngine) + testRuntimeOnly(libs.junitLauncher) } val compileKotlin by tasks.getting(KotlinCompile::class) { diff --git a/samples/musiclibrary-testing/build.gradle.kts b/samples/musiclibrary-testing/build.gradle.kts index 7f5e28ed9..ad9b812cd 100644 --- a/samples/musiclibrary-testing/build.gradle.kts +++ b/samples/musiclibrary-testing/build.gradle.kts @@ -7,8 +7,4 @@ dependencies { api(libs.findbugsJsr305) implementation(libs.kotlinReflection) implementation(libs.kotlinStdLib) - - testImplementation(libs.assertj) - testImplementation(libs.junitApi) - testImplementation(libs.junitEngine) } diff --git a/samples/musiclibrary/build.gradle.kts b/samples/musiclibrary/build.gradle.kts index e8f90aa09..eb979ad11 100644 --- a/samples/musiclibrary/build.gradle.kts +++ b/samples/musiclibrary/build.gradle.kts @@ -6,8 +6,4 @@ plugins { dependencies { implementation(project(":tempest")) implementation(libs.kotlinStdLib) - - testImplementation(libs.assertj) - testImplementation(libs.junitApi) - testImplementation(libs.junitEngine) } diff --git a/samples/musiclibrary2/build.gradle.kts b/samples/musiclibrary2/build.gradle.kts index a7a8b5710..483a9a5e0 100644 --- a/samples/musiclibrary2/build.gradle.kts +++ b/samples/musiclibrary2/build.gradle.kts @@ -6,8 +6,4 @@ plugins { dependencies { implementation(project(":tempest2")) implementation(libs.kotlinStdLib) - - testImplementation(libs.assertj) - testImplementation(libs.junitApi) - testImplementation(libs.junitEngine) } diff --git a/samples/urlshortener/build.gradle.kts b/samples/urlshortener/build.gradle.kts index ec62de65c..221c92d6c 100644 --- a/samples/urlshortener/build.gradle.kts +++ b/samples/urlshortener/build.gradle.kts @@ -7,8 +7,4 @@ dependencies { implementation(project(":tempest")) implementation(libs.kotlinStdLib) implementation(libs.clikt) - - testImplementation(libs.assertj) - testImplementation(libs.junitApi) - testImplementation(libs.junitEngine) } diff --git a/samples/urlshortener2/build.gradle.kts b/samples/urlshortener2/build.gradle.kts index 254e353bb..18ccca899 100644 --- a/samples/urlshortener2/build.gradle.kts +++ b/samples/urlshortener2/build.gradle.kts @@ -7,8 +7,4 @@ dependencies { implementation(project(":tempest2")) implementation(libs.kotlinStdLib) implementation(libs.clikt) - - testImplementation(libs.assertj) - testImplementation(libs.junitApi) - testImplementation(libs.junitEngine) } diff --git a/tempest-docker/build.gradle.kts b/tempest-docker/build.gradle.kts index ebac7c7b8..0be90b38a 100644 --- a/tempest-docker/build.gradle.kts +++ b/tempest-docker/build.gradle.kts @@ -15,6 +15,7 @@ dependencies { testImplementation(libs.junitApi) testImplementation(libs.junitEngine) + testRuntimeOnly(libs.junitLauncher) testImplementation(libs.assertj) testImplementation(libs.okioFakefilesystem) } diff --git a/tempest-internal/build.gradle.kts b/tempest-internal/build.gradle.kts index 8157d8c06..525a9b702 100644 --- a/tempest-internal/build.gradle.kts +++ b/tempest-internal/build.gradle.kts @@ -12,10 +12,6 @@ dependencies { api(libs.findbugsJsr305) implementation(libs.kotlinReflection) implementation(libs.kotlinStdLib) - - testImplementation(libs.assertj) - testImplementation(libs.junitApi) - testImplementation(libs.junitEngine) } diff --git a/tempest-testing-docker/build.gradle.kts b/tempest-testing-docker/build.gradle.kts index ce265d1ec..251db7978 100644 --- a/tempest-testing-docker/build.gradle.kts +++ b/tempest-testing-docker/build.gradle.kts @@ -18,6 +18,7 @@ dependencies { testImplementation(libs.assertj) testImplementation(libs.junitEngine) + testRuntimeOnly(libs.junitLauncher) testImplementation(project(":samples:urlshortener")) testImplementation(project(":tempest-testing-junit5")) } diff --git a/tempest-testing-internal/build.gradle.kts b/tempest-testing-internal/build.gradle.kts index 5b79f867e..5f371a673 100644 --- a/tempest-testing-internal/build.gradle.kts +++ b/tempest-testing-internal/build.gradle.kts @@ -13,10 +13,6 @@ dependencies { api(libs.loggingApi) implementation(libs.log4jCore) implementation(libs.kotlinStdLib) - - testImplementation(libs.assertj) - testImplementation(libs.junitApi) - testImplementation(libs.junitEngine) } diff --git a/tempest-testing-junit5/build.gradle.kts b/tempest-testing-junit5/build.gradle.kts index 6c195763d..fb3fa0efe 100644 --- a/tempest-testing-junit5/build.gradle.kts +++ b/tempest-testing-junit5/build.gradle.kts @@ -20,6 +20,7 @@ dependencies { testImplementation(project(":tempest-testing-jvm")) testImplementation(libs.assertj) testImplementation(libs.junitEngine) + testRuntimeOnly(libs.junitLauncher) } diff --git a/tempest-testing-jvm/build.gradle.kts b/tempest-testing-jvm/build.gradle.kts index d307f5733..3321e2bfa 100644 --- a/tempest-testing-jvm/build.gradle.kts +++ b/tempest-testing-jvm/build.gradle.kts @@ -13,10 +13,6 @@ dependencies { implementation(project(":tempest-testing-internal")) implementation(project(":tempest-dynamodb-local")) implementation(libs.kotlinStdLib) - - testImplementation(libs.assertj) - testImplementation(libs.junitApi) - testImplementation(libs.junitEngine) } diff --git a/tempest-testing/build.gradle.kts b/tempest-testing/build.gradle.kts index 2fac6dc14..931c6a0cc 100644 --- a/tempest-testing/build.gradle.kts +++ b/tempest-testing/build.gradle.kts @@ -13,10 +13,6 @@ dependencies { api(libs.findbugsJsr305) api(libs.guava) implementation(libs.kotlinStdLib) - - testImplementation(libs.assertj) - testImplementation(libs.junitApi) - testImplementation(libs.junitEngine) } diff --git a/tempest/build.gradle.kts b/tempest/build.gradle.kts index f62ac5e41..829d36fb4 100644 --- a/tempest/build.gradle.kts +++ b/tempest/build.gradle.kts @@ -24,6 +24,7 @@ dependencies { testImplementation(project(":tempest-testing-junit5")) testImplementation(libs.assertj) testImplementation(libs.junitEngine) + testRuntimeOnly(libs.junitLauncher) } diff --git a/tempest2-testing-docker/build.gradle.kts b/tempest2-testing-docker/build.gradle.kts index 504386cf5..d7af19115 100644 --- a/tempest2-testing-docker/build.gradle.kts +++ b/tempest2-testing-docker/build.gradle.kts @@ -18,6 +18,7 @@ dependencies { testImplementation(libs.assertj) testImplementation(libs.junitEngine) + testRuntimeOnly(libs.junitLauncher) testImplementation(project(":samples:urlshortener2")) testImplementation(project(":tempest2-testing-junit5")) } diff --git a/tempest2-testing-internal/build.gradle.kts b/tempest2-testing-internal/build.gradle.kts index 9334e2344..94bba426f 100644 --- a/tempest2-testing-internal/build.gradle.kts +++ b/tempest2-testing-internal/build.gradle.kts @@ -13,10 +13,6 @@ dependencies { api(libs.loggingApi) implementation(libs.log4jCore) implementation(libs.kotlinStdLib) - - testImplementation(libs.assertj) - testImplementation(libs.junitApi) - testImplementation(libs.junitEngine) } diff --git a/tempest2-testing-junit5/build.gradle.kts b/tempest2-testing-junit5/build.gradle.kts index d8426b127..27b9b6188 100644 --- a/tempest2-testing-junit5/build.gradle.kts +++ b/tempest2-testing-junit5/build.gradle.kts @@ -20,6 +20,7 @@ dependencies { testImplementation(project(":tempest2-testing-jvm")) testImplementation(libs.assertj) testImplementation(libs.junitEngine) + testRuntimeOnly(libs.junitLauncher) } diff --git a/tempest2-testing-jvm/build.gradle.kts b/tempest2-testing-jvm/build.gradle.kts index 5d185a03d..60b5666ee 100644 --- a/tempest2-testing-jvm/build.gradle.kts +++ b/tempest2-testing-jvm/build.gradle.kts @@ -13,10 +13,6 @@ dependencies { implementation(project(":tempest2-testing-internal")) implementation(project(":tempest-dynamodb-local")) implementation(libs.kotlinStdLib) - - testImplementation(libs.assertj) - testImplementation(libs.junitApi) - testImplementation(libs.junitEngine) } diff --git a/tempest2-testing/build.gradle.kts b/tempest2-testing/build.gradle.kts index 06981a8e1..8c8af9047 100644 --- a/tempest2-testing/build.gradle.kts +++ b/tempest2-testing/build.gradle.kts @@ -13,10 +13,6 @@ dependencies { api(libs.findbugsJsr305) api(libs.guava) implementation(libs.kotlinStdLib) - - testImplementation(libs.assertj) - testImplementation(libs.junitApi) - testImplementation(libs.junitEngine) } configure { diff --git a/tempest2/build.gradle.kts b/tempest2/build.gradle.kts index 74ad989ec..8b92ec9eb 100644 --- a/tempest2/build.gradle.kts +++ b/tempest2/build.gradle.kts @@ -26,6 +26,7 @@ dependencies { testImplementation(project(":tempest2-testing-junit5")) testImplementation(libs.assertj) testImplementation(libs.junitEngine) + testRuntimeOnly(libs.junitLauncher) }