From d0afec8ea1d15db79bb80840952f7dd11e245ed0 Mon Sep 17 00:00:00 2001 From: Andrew Alexander Date: Mon, 15 Jan 2024 07:38:24 -0500 Subject: [PATCH] Migrate to libs.versions.toml --- build.gradle.kts | 12 +++---- buildSrc/src/main/kotlin/Dependencies.kt | 30 ------------------ gradle/libs.versions.toml | 31 +++++++++++++++++++ samples/guides-junit4/build.gradle.kts | 6 ++-- samples/guides-junit5/build.gradle.kts | 8 ++--- samples/guides/build.gradle.kts | 4 +-- samples/guides2-junit4/build.gradle.kts | 6 ++-- samples/guides2-junit5/build.gradle.kts | 8 ++--- samples/guides2/build.gradle.kts | 4 +-- samples/javarecord/build.gradle.kts | 4 +-- samples/musiclibrary-testing/build.gradle.kts | 12 +++---- samples/musiclibrary/build.gradle.kts | 8 ++--- samples/musiclibrary2/build.gradle.kts | 8 ++--- samples/urlshortener/build.gradle.kts | 10 +++--- samples/urlshortener2/build.gradle.kts | 10 +++--- tempest-internal/build.gradle.kts | 12 +++---- tempest-testing-docker/build.gradle.kts | 10 +++--- tempest-testing-internal/build.gradle.kts | 12 +++---- tempest-testing-junit4/build.gradle.kts | 10 +++--- tempest-testing-junit5/build.gradle.kts | 12 +++---- tempest-testing-jvm/build.gradle.kts | 10 +++--- tempest-testing/build.gradle.kts | 12 +++---- tempest/build.gradle.kts | 14 ++++----- tempest2-testing-docker/build.gradle.kts | 10 +++--- tempest2-testing-internal/build.gradle.kts | 12 +++---- tempest2-testing-junit4/build.gradle.kts | 10 +++--- tempest2-testing-junit5/build.gradle.kts | 12 +++---- tempest2-testing-jvm/build.gradle.kts | 10 +++--- tempest2-testing/build.gradle.kts | 12 +++---- tempest2/build.gradle.kts | 20 ++++++------ 30 files changed, 170 insertions(+), 169 deletions(-) delete mode 100644 buildSrc/src/main/kotlin/Dependencies.kt create mode 100644 gradle/libs.versions.toml diff --git a/build.gradle.kts b/build.gradle.kts index 486a2d4a6..179815a24 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -13,11 +13,11 @@ buildscript { } dependencies { - classpath(Dependencies.dokkaGradlePlugin) - classpath(Dependencies.junitGradlePlugin) - classpath(Dependencies.kotlinGradlePlugin) - classpath(Dependencies.mavenPublishGradlePlugin) - classpath(Dependencies.wireGradlePlugin) + classpath(libs.dokkaGradlePlugin) + classpath(libs.junitGradlePlugin) + classpath(libs.kotlinGradlePlugin) + classpath(libs.mavenPublishGradlePlugin) + classpath(libs.wireGradlePlugin) } } @@ -56,7 +56,7 @@ subprojects { dependencies { // add("api", project(":tempest-bom")) - add("api", platform(Dependencies.nettyBom)) + add("api", platform(libs.nettyBom)) } } diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt deleted file mode 100644 index bc7240479..000000000 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ /dev/null @@ -1,30 +0,0 @@ -object Dependencies { - val assertj = "org.assertj:assertj-core:3.23.1" - val aws2Dynamodb = "software.amazon.awssdk:dynamodb:2.17.134" - val aws2DynamodbEnhanced = "software.amazon.awssdk:dynamodb-enhanced:2.17.134" - val awsDynamodb = "com.amazonaws:aws-java-sdk-dynamodb:1.11.960" - val awsDynamodbLocal = "com.amazonaws:DynamoDBLocal:1.13.5" - val clikt = "com.github.ajalt:clikt:2.8.0" - val dokkaGradlePlugin = "org.jetbrains.dokka:dokka-gradle-plugin:1.7.0" - val dockerCore = "com.github.docker-java:docker-java-core:3.2.13" - val dockerTransport = "com.github.docker-java:docker-java-transport-httpclient5:3.2.13" - val findbugsJsr305 = "com.google.code.findbugs:jsr305:3.0.2" - val guava = "com.google.guava:guava:31.0.1-jre" - val junit4Api = "junit:junit:4.13.2" - val junitApi = "org.junit.jupiter:junit-jupiter-api:5.8.2" - val junitEngine = "org.junit.jupiter:junit-jupiter-engine:5.8.2" - val junitGradlePlugin = "org.junit.platform:junit-platform-gradle-plugin:1.2.0" - val kotlinGradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10" - val kotlinReflection = "org.jetbrains.kotlin:kotlin-reflect:1.7.10" - val kotlinStdLib = "org.jetbrains.kotlin:kotlin-stdlib:1.7.10" - val kotlinxCoroutines = "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4" - val kotlinxCoroutinesJdk8 = "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.6.4" - val kotlinxCoroutinesReactive = "org.jetbrains.kotlinx:kotlinx-coroutines-reactive:1.6.4" - val ktlintVersion = "0.40.0" - val log4jCore = "org.apache.logging.log4j:log4j-core:2.17.1" - val loggingApi = "io.github.microutils:kotlin-logging:2.0.10" - val mavenPublishGradlePlugin = "com.vanniktech:gradle-maven-publish-plugin:0.25.1" - val nettyBom = "io.netty:netty-bom:4.1.79.Final" - val okio = "com.squareup.okio:okio:3.2.0" - val wireGradlePlugin = "com.squareup.wire:wire-gradle-plugin:4.4.0" -} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 000000000..0c974d7c4 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,31 @@ +[versions] +ktlint = "0.40.0" + +[libraries] +assertj = { module = "org.assertj:assertj-core", version = "3.23.1" } +aws2Dynamodb = { module = "software.amazon.awssdk:dynamodb", version = "2.17.134" } +aws2DynamodbEnhanced = { module = "software.amazon.awssdk:dynamodb-enhanced", version = "2.17.134" } +awsDynamodb = { module = "com.amazonaws:aws-java-sdk-dynamodb", version = "1.11.960" } +awsDynamodbLocal = { module = "com.amazonaws:DynamoDBLocal", version = "1.13.5" } +clikt = { module = "com.github.ajalt:clikt", version = "2.8.0" } +dokkaGradlePlugin = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version = "1.7.0" } +dockerCore = { module = "com.github.docker-java:docker-java-core", version = "3.2.13" } +dockerTransport = { module = "com.github.docker-java:docker-java-transport-httpclient5", version = "3.2.13" } +findbugsJsr305 = { module = "com.google.code.findbugs:jsr305", version = "3.0.2" } +guava = { module = "com.google.guava:guava", version = "31.0.1-jre" } +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.8.2" } +junitGradlePlugin = { module = "org.junit.platform:junit-platform-gradle-plugin", version = "1.2.0" } +kotlinGradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version = "1.7.10" } +kotlinReflection = { module = "org.jetbrains.kotlin:kotlin-reflect", version = "1.7.10" } +kotlinStdLib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version = "1.7.10" } +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.25.1" } +nettyBom = { module = "io.netty:netty-bom", version = "4.1.79.Final" } +okio = { module = "com.squareup.okio:okio", version = "3.2.0" } +wireGradlePlugin = { module = "com.squareup.wire:wire-gradle-plugin", version = "4.4.0" } diff --git a/samples/guides-junit4/build.gradle.kts b/samples/guides-junit4/build.gradle.kts index 7d355f2fa..a24bdb480 100644 --- a/samples/guides-junit4/build.gradle.kts +++ b/samples/guides-junit4/build.gradle.kts @@ -8,10 +8,10 @@ dependencies { implementation(project(":tempest")) implementation(project(":samples:musiclibrary")) implementation(project(":samples:urlshortener")) - implementation(Dependencies.kotlinStdLib) + implementation(libs.kotlinStdLib) - testImplementation(Dependencies.assertj) - testImplementation(Dependencies.junit4Api) + testImplementation(libs.assertj) + testImplementation(libs.junit4Api) implementation(project(":tempest-testing-docker")) implementation(project(":tempest-testing-jvm")) implementation(project(":tempest-testing-junit4")) diff --git a/samples/guides-junit5/build.gradle.kts b/samples/guides-junit5/build.gradle.kts index 848375636..ade266f24 100644 --- a/samples/guides-junit5/build.gradle.kts +++ b/samples/guides-junit5/build.gradle.kts @@ -8,11 +8,11 @@ dependencies { implementation(project(":tempest")) implementation(project(":samples:musiclibrary")) implementation(project(":samples:urlshortener")) - implementation(Dependencies.kotlinStdLib) + implementation(libs.kotlinStdLib) - testImplementation(Dependencies.assertj) - testImplementation(Dependencies.junitApi) - testImplementation(Dependencies.junitEngine) + testImplementation(libs.assertj) + testImplementation(libs.junitApi) + testImplementation(libs.junitEngine) implementation(project(":tempest-testing-docker")) implementation(project(":tempest-testing-jvm")) implementation(project(":tempest-testing-junit5")) diff --git a/samples/guides/build.gradle.kts b/samples/guides/build.gradle.kts index c4e5864e3..f7a9c47e0 100644 --- a/samples/guides/build.gradle.kts +++ b/samples/guides/build.gradle.kts @@ -9,8 +9,8 @@ dependencies { implementation(project(":tempest")) implementation(project(":samples:musiclibrary")) implementation(project(":samples:urlshortener")) - implementation(Dependencies.kotlinStdLib) - implementation(Dependencies.kotlinxCoroutines) + implementation(libs.kotlinStdLib) + implementation(libs.kotlinxCoroutines) } val compileKotlin by tasks.getting(KotlinCompile::class) { diff --git a/samples/guides2-junit4/build.gradle.kts b/samples/guides2-junit4/build.gradle.kts index 6b8686cdc..8b1b3c067 100644 --- a/samples/guides2-junit4/build.gradle.kts +++ b/samples/guides2-junit4/build.gradle.kts @@ -9,10 +9,10 @@ dependencies { implementation(project(":tempest2")) implementation(project(":samples:musiclibrary2")) implementation(project(":samples:urlshortener2")) - implementation(Dependencies.kotlinStdLib) + implementation(libs.kotlinStdLib) - testImplementation(Dependencies.assertj) - testImplementation(Dependencies.junit4Api) + testImplementation(libs.assertj) + testImplementation(libs.junit4Api) implementation(project(":tempest2-testing-docker")) implementation(project(":tempest2-testing-jvm")) implementation(project(":tempest2-testing-junit4")) diff --git a/samples/guides2-junit5/build.gradle.kts b/samples/guides2-junit5/build.gradle.kts index d55992f66..461b901c4 100644 --- a/samples/guides2-junit5/build.gradle.kts +++ b/samples/guides2-junit5/build.gradle.kts @@ -9,11 +9,11 @@ dependencies { implementation(project(":tempest2")) implementation(project(":samples:musiclibrary2")) implementation(project(":samples:urlshortener2")) - implementation(Dependencies.kotlinStdLib) + implementation(libs.kotlinStdLib) - testImplementation(Dependencies.assertj) - testImplementation(Dependencies.junitApi) - testImplementation(Dependencies.junitEngine) + testImplementation(libs.assertj) + testImplementation(libs.junitApi) + testImplementation(libs.junitEngine) implementation(project(":tempest2-testing-docker")) implementation(project(":tempest2-testing-jvm")) implementation(project(":tempest2-testing-junit5")) diff --git a/samples/guides2/build.gradle.kts b/samples/guides2/build.gradle.kts index 74b524e91..890348a61 100644 --- a/samples/guides2/build.gradle.kts +++ b/samples/guides2/build.gradle.kts @@ -8,8 +8,8 @@ dependencies { implementation(project(":tempest2")) implementation(project(":samples:musiclibrary2")) implementation(project(":samples:urlshortener2")) - implementation(Dependencies.kotlinStdLib) - implementation(Dependencies.kotlinxCoroutines) + implementation(libs.kotlinStdLib) + implementation(libs.kotlinxCoroutines) } val compileKotlin by tasks.getting(KotlinCompile::class) { diff --git a/samples/javarecord/build.gradle.kts b/samples/javarecord/build.gradle.kts index 267a9eef1..302df8055 100644 --- a/samples/javarecord/build.gradle.kts +++ b/samples/javarecord/build.gradle.kts @@ -7,8 +7,8 @@ dependencies { testImplementation(project(":tempest-testing-jvm")) testImplementation(project(":tempest-testing-junit5")) - testImplementation(Dependencies.assertj) - testImplementation(Dependencies.junitEngine) + testImplementation(libs.assertj) + testImplementation(libs.junitEngine) } val compileKotlin by tasks.getting(KotlinCompile::class) { diff --git a/samples/musiclibrary-testing/build.gradle.kts b/samples/musiclibrary-testing/build.gradle.kts index 9b3b92b03..7f5e28ed9 100644 --- a/samples/musiclibrary-testing/build.gradle.kts +++ b/samples/musiclibrary-testing/build.gradle.kts @@ -4,11 +4,11 @@ plugins { } dependencies { - api(Dependencies.findbugsJsr305) - implementation(Dependencies.kotlinReflection) - implementation(Dependencies.kotlinStdLib) + api(libs.findbugsJsr305) + implementation(libs.kotlinReflection) + implementation(libs.kotlinStdLib) - testImplementation(Dependencies.assertj) - testImplementation(Dependencies.junitApi) - testImplementation(Dependencies.junitEngine) + testImplementation(libs.assertj) + testImplementation(libs.junitApi) + testImplementation(libs.junitEngine) } diff --git a/samples/musiclibrary/build.gradle.kts b/samples/musiclibrary/build.gradle.kts index 13f5e30e0..e8f90aa09 100644 --- a/samples/musiclibrary/build.gradle.kts +++ b/samples/musiclibrary/build.gradle.kts @@ -5,9 +5,9 @@ plugins { dependencies { implementation(project(":tempest")) - implementation(Dependencies.kotlinStdLib) + implementation(libs.kotlinStdLib) - testImplementation(Dependencies.assertj) - testImplementation(Dependencies.junitApi) - testImplementation(Dependencies.junitEngine) + testImplementation(libs.assertj) + testImplementation(libs.junitApi) + testImplementation(libs.junitEngine) } diff --git a/samples/musiclibrary2/build.gradle.kts b/samples/musiclibrary2/build.gradle.kts index 725709652..a7a8b5710 100644 --- a/samples/musiclibrary2/build.gradle.kts +++ b/samples/musiclibrary2/build.gradle.kts @@ -5,9 +5,9 @@ plugins { dependencies { implementation(project(":tempest2")) - implementation(Dependencies.kotlinStdLib) + implementation(libs.kotlinStdLib) - testImplementation(Dependencies.assertj) - testImplementation(Dependencies.junitApi) - testImplementation(Dependencies.junitEngine) + testImplementation(libs.assertj) + testImplementation(libs.junitApi) + testImplementation(libs.junitEngine) } diff --git a/samples/urlshortener/build.gradle.kts b/samples/urlshortener/build.gradle.kts index f3fb93ca6..ec62de65c 100644 --- a/samples/urlshortener/build.gradle.kts +++ b/samples/urlshortener/build.gradle.kts @@ -5,10 +5,10 @@ plugins { dependencies { implementation(project(":tempest")) - implementation(Dependencies.kotlinStdLib) - implementation(Dependencies.clikt) + implementation(libs.kotlinStdLib) + implementation(libs.clikt) - testImplementation(Dependencies.assertj) - testImplementation(Dependencies.junitApi) - testImplementation(Dependencies.junitEngine) + testImplementation(libs.assertj) + testImplementation(libs.junitApi) + testImplementation(libs.junitEngine) } diff --git a/samples/urlshortener2/build.gradle.kts b/samples/urlshortener2/build.gradle.kts index 06c5a89e8..254e353bb 100644 --- a/samples/urlshortener2/build.gradle.kts +++ b/samples/urlshortener2/build.gradle.kts @@ -5,10 +5,10 @@ plugins { dependencies { implementation(project(":tempest2")) - implementation(Dependencies.kotlinStdLib) - implementation(Dependencies.clikt) + implementation(libs.kotlinStdLib) + implementation(libs.clikt) - testImplementation(Dependencies.assertj) - testImplementation(Dependencies.junitApi) - testImplementation(Dependencies.junitEngine) + testImplementation(libs.assertj) + testImplementation(libs.junitApi) + testImplementation(libs.junitEngine) } diff --git a/tempest-internal/build.gradle.kts b/tempest-internal/build.gradle.kts index 94b48db7e..8157d8c06 100644 --- a/tempest-internal/build.gradle.kts +++ b/tempest-internal/build.gradle.kts @@ -9,13 +9,13 @@ plugins { } dependencies { - api(Dependencies.findbugsJsr305) - implementation(Dependencies.kotlinReflection) - implementation(Dependencies.kotlinStdLib) + api(libs.findbugsJsr305) + implementation(libs.kotlinReflection) + implementation(libs.kotlinStdLib) - testImplementation(Dependencies.assertj) - testImplementation(Dependencies.junitApi) - testImplementation(Dependencies.junitEngine) + 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 31f1fba37..3a0430377 100644 --- a/tempest-testing-docker/build.gradle.kts +++ b/tempest-testing-docker/build.gradle.kts @@ -11,12 +11,12 @@ plugins { dependencies { api(project(":tempest-testing")) implementation(project(":tempest-testing-internal")) - implementation(Dependencies.kotlinStdLib) - implementation(Dependencies.dockerCore) - implementation(Dependencies.dockerTransport) + implementation(libs.kotlinStdLib) + implementation(libs.dockerCore) + implementation(libs.dockerTransport) - testImplementation(Dependencies.assertj) - testImplementation(Dependencies.junitEngine) + testImplementation(libs.assertj) + testImplementation(libs.junitEngine) 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 a4b332451..5b79f867e 100644 --- a/tempest-testing-internal/build.gradle.kts +++ b/tempest-testing-internal/build.gradle.kts @@ -10,13 +10,13 @@ plugins { dependencies { api(project(":tempest-testing")) - api(Dependencies.loggingApi) - implementation(Dependencies.log4jCore) - implementation(Dependencies.kotlinStdLib) + api(libs.loggingApi) + implementation(libs.log4jCore) + implementation(libs.kotlinStdLib) - testImplementation(Dependencies.assertj) - testImplementation(Dependencies.junitApi) - testImplementation(Dependencies.junitEngine) + testImplementation(libs.assertj) + testImplementation(libs.junitApi) + testImplementation(libs.junitEngine) } diff --git a/tempest-testing-junit4/build.gradle.kts b/tempest-testing-junit4/build.gradle.kts index e604460ec..d1b923e47 100644 --- a/tempest-testing-junit4/build.gradle.kts +++ b/tempest-testing-junit4/build.gradle.kts @@ -10,15 +10,15 @@ plugins { dependencies { api(project(":tempest-testing")) - api(Dependencies.junit4Api) + api(libs.junit4Api) implementation(project(":tempest-testing-internal")) - implementation(Dependencies.kotlinStdLib) - implementation(Dependencies.guava) - implementation(Dependencies.kotlinReflection) + implementation(libs.kotlinStdLib) + implementation(libs.guava) + implementation(libs.kotlinReflection) testImplementation(project(":samples:urlshortener")) testImplementation(project(":tempest-testing-jvm")) - testImplementation(Dependencies.assertj) + testImplementation(libs.assertj) } tasks.withType { diff --git a/tempest-testing-junit5/build.gradle.kts b/tempest-testing-junit5/build.gradle.kts index b90c69941..6c195763d 100644 --- a/tempest-testing-junit5/build.gradle.kts +++ b/tempest-testing-junit5/build.gradle.kts @@ -10,16 +10,16 @@ plugins { dependencies { api(project(":tempest-testing")) - api(Dependencies.junitApi) + api(libs.junitApi) implementation(project(":tempest-testing-internal")) - implementation(Dependencies.kotlinStdLib) - implementation(Dependencies.guava) - implementation(Dependencies.kotlinReflection) + implementation(libs.kotlinStdLib) + implementation(libs.guava) + implementation(libs.kotlinReflection) testImplementation(project(":samples:urlshortener")) testImplementation(project(":tempest-testing-jvm")) - testImplementation(Dependencies.assertj) - testImplementation(Dependencies.junitEngine) + testImplementation(libs.assertj) + testImplementation(libs.junitEngine) } diff --git a/tempest-testing-jvm/build.gradle.kts b/tempest-testing-jvm/build.gradle.kts index f5c710b7d..f10717616 100644 --- a/tempest-testing-jvm/build.gradle.kts +++ b/tempest-testing-jvm/build.gradle.kts @@ -11,16 +11,16 @@ plugins { dependencies { api(project(":tempest-testing")) implementation(project(":tempest-testing-internal")) - implementation(Dependencies.awsDynamodbLocal) - implementation(Dependencies.kotlinStdLib) + implementation(libs.awsDynamodbLocal) + implementation(libs.kotlinStdLib) if (org.apache.tools.ant.taskdefs.condition.Os.isArch("aarch64")) { implementation("io.github.ganadist.sqlite4java:libsqlite4java-osx-aarch64:1.0.392") } - testImplementation(Dependencies.assertj) - testImplementation(Dependencies.junitApi) - testImplementation(Dependencies.junitEngine) + testImplementation(libs.assertj) + testImplementation(libs.junitApi) + testImplementation(libs.junitEngine) } diff --git a/tempest-testing/build.gradle.kts b/tempest-testing/build.gradle.kts index 1dca44026..2fac6dc14 100644 --- a/tempest-testing/build.gradle.kts +++ b/tempest-testing/build.gradle.kts @@ -10,13 +10,13 @@ plugins { dependencies { api(project(":tempest")) - api(Dependencies.findbugsJsr305) - api(Dependencies.guava) - implementation(Dependencies.kotlinStdLib) + api(libs.findbugsJsr305) + api(libs.guava) + implementation(libs.kotlinStdLib) - testImplementation(Dependencies.assertj) - testImplementation(Dependencies.junitApi) - testImplementation(Dependencies.junitEngine) + testImplementation(libs.assertj) + testImplementation(libs.junitApi) + testImplementation(libs.junitEngine) } diff --git a/tempest/build.gradle.kts b/tempest/build.gradle.kts index 56e1f9583..f62ac5e41 100644 --- a/tempest/build.gradle.kts +++ b/tempest/build.gradle.kts @@ -10,20 +10,20 @@ plugins { } dependencies { - api(Dependencies.awsDynamodb) - api(Dependencies.findbugsJsr305) + api(libs.awsDynamodb) + api(libs.findbugsJsr305) implementation(project(":tempest-internal")) - implementation(Dependencies.kotlinReflection) - implementation(Dependencies.kotlinStdLib) - implementation(Dependencies.okio) + implementation(libs.kotlinReflection) + implementation(libs.kotlinStdLib) + implementation(libs.okio) testImplementation(project(":samples:musiclibrary")) testImplementation(project(":samples:musiclibrary-testing")) testImplementation(project(":samples:urlshortener")) testImplementation(project(":tempest-testing-jvm")) testImplementation(project(":tempest-testing-junit5")) - testImplementation(Dependencies.assertj) - testImplementation(Dependencies.junitEngine) + testImplementation(libs.assertj) + testImplementation(libs.junitEngine) } diff --git a/tempest2-testing-docker/build.gradle.kts b/tempest2-testing-docker/build.gradle.kts index 74f1c0615..e2a61bc2d 100644 --- a/tempest2-testing-docker/build.gradle.kts +++ b/tempest2-testing-docker/build.gradle.kts @@ -11,12 +11,12 @@ plugins { dependencies { api(project(":tempest2-testing")) implementation(project(":tempest2-testing-internal")) - implementation(Dependencies.kotlinStdLib) - implementation(Dependencies.dockerCore) - implementation(Dependencies.dockerTransport) + implementation(libs.kotlinStdLib) + implementation(libs.dockerCore) + implementation(libs.dockerTransport) - testImplementation(Dependencies.assertj) - testImplementation(Dependencies.junitEngine) + testImplementation(libs.assertj) + testImplementation(libs.junitEngine) 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 fb7465942..9334e2344 100644 --- a/tempest2-testing-internal/build.gradle.kts +++ b/tempest2-testing-internal/build.gradle.kts @@ -10,13 +10,13 @@ plugins { dependencies { api(project(":tempest2-testing")) - api(Dependencies.loggingApi) - implementation(Dependencies.log4jCore) - implementation(Dependencies.kotlinStdLib) + api(libs.loggingApi) + implementation(libs.log4jCore) + implementation(libs.kotlinStdLib) - testImplementation(Dependencies.assertj) - testImplementation(Dependencies.junitApi) - testImplementation(Dependencies.junitEngine) + testImplementation(libs.assertj) + testImplementation(libs.junitApi) + testImplementation(libs.junitEngine) } diff --git a/tempest2-testing-junit4/build.gradle.kts b/tempest2-testing-junit4/build.gradle.kts index 3d88f23de..db7dd2ecf 100644 --- a/tempest2-testing-junit4/build.gradle.kts +++ b/tempest2-testing-junit4/build.gradle.kts @@ -10,15 +10,15 @@ plugins { dependencies { api(project(":tempest2-testing")) - api(Dependencies.junit4Api) + api(libs.junit4Api) implementation(project(":tempest2-testing-internal")) - implementation(Dependencies.kotlinStdLib) - implementation(Dependencies.guava) - implementation(Dependencies.kotlinReflection) + implementation(libs.kotlinStdLib) + implementation(libs.guava) + implementation(libs.kotlinReflection) testImplementation(project(":samples:urlshortener2")) testImplementation(project(":tempest2-testing-jvm")) - testImplementation(Dependencies.assertj) + testImplementation(libs.assertj) } tasks.withType { diff --git a/tempest2-testing-junit5/build.gradle.kts b/tempest2-testing-junit5/build.gradle.kts index d4ef754a1..d8426b127 100644 --- a/tempest2-testing-junit5/build.gradle.kts +++ b/tempest2-testing-junit5/build.gradle.kts @@ -10,16 +10,16 @@ plugins { dependencies { api(project(":tempest2-testing")) - api(Dependencies.junitApi) + api(libs.junitApi) implementation(project(":tempest2-testing-internal")) - implementation(Dependencies.kotlinStdLib) - implementation(Dependencies.guava) - implementation(Dependencies.kotlinReflection) + implementation(libs.kotlinStdLib) + implementation(libs.guava) + implementation(libs.kotlinReflection) testImplementation(project(":samples:urlshortener2")) testImplementation(project(":tempest2-testing-jvm")) - testImplementation(Dependencies.assertj) - testImplementation(Dependencies.junitEngine) + testImplementation(libs.assertj) + testImplementation(libs.junitEngine) } diff --git a/tempest2-testing-jvm/build.gradle.kts b/tempest2-testing-jvm/build.gradle.kts index 7fddd8067..c0993742d 100644 --- a/tempest2-testing-jvm/build.gradle.kts +++ b/tempest2-testing-jvm/build.gradle.kts @@ -11,16 +11,16 @@ plugins { dependencies { api(project(":tempest2-testing")) implementation(project(":tempest2-testing-internal")) - implementation(Dependencies.awsDynamodbLocal) - implementation(Dependencies.kotlinStdLib) + implementation(libs.awsDynamodbLocal) + implementation(libs.kotlinStdLib) if (org.apache.tools.ant.taskdefs.condition.Os.isArch("aarch64")) { implementation("io.github.ganadist.sqlite4java:libsqlite4java-osx-aarch64:1.0.392") } - testImplementation(Dependencies.assertj) - testImplementation(Dependencies.junitApi) - testImplementation(Dependencies.junitEngine) + testImplementation(libs.assertj) + testImplementation(libs.junitApi) + testImplementation(libs.junitEngine) } diff --git a/tempest2-testing/build.gradle.kts b/tempest2-testing/build.gradle.kts index d6325fba6..06981a8e1 100644 --- a/tempest2-testing/build.gradle.kts +++ b/tempest2-testing/build.gradle.kts @@ -10,13 +10,13 @@ plugins { dependencies { api(project(":tempest2")) - api(Dependencies.findbugsJsr305) - api(Dependencies.guava) - implementation(Dependencies.kotlinStdLib) + api(libs.findbugsJsr305) + api(libs.guava) + implementation(libs.kotlinStdLib) - testImplementation(Dependencies.assertj) - testImplementation(Dependencies.junitApi) - testImplementation(Dependencies.junitEngine) + testImplementation(libs.assertj) + testImplementation(libs.junitApi) + testImplementation(libs.junitEngine) } configure { diff --git a/tempest2/build.gradle.kts b/tempest2/build.gradle.kts index ac56dba8f..74ad989ec 100644 --- a/tempest2/build.gradle.kts +++ b/tempest2/build.gradle.kts @@ -9,23 +9,23 @@ plugins { } dependencies { - api(Dependencies.aws2Dynamodb) - api(Dependencies.aws2DynamodbEnhanced) - api(Dependencies.findbugsJsr305) - api(Dependencies.kotlinxCoroutines) - implementation(Dependencies.kotlinxCoroutinesJdk8) - implementation(Dependencies.kotlinxCoroutinesReactive) + api(libs.aws2Dynamodb) + api(libs.aws2DynamodbEnhanced) + api(libs.findbugsJsr305) + api(libs.kotlinxCoroutines) + implementation(libs.kotlinxCoroutinesJdk8) + implementation(libs.kotlinxCoroutinesReactive) implementation(project(":tempest-internal")) - implementation(Dependencies.kotlinReflection) - implementation(Dependencies.kotlinStdLib) + implementation(libs.kotlinReflection) + implementation(libs.kotlinStdLib) testImplementation(project(":samples:musiclibrary2")) testImplementation(project(":samples:musiclibrary-testing")) testImplementation(project(":samples:urlshortener2")) testImplementation(project(":tempest2-testing-jvm")) testImplementation(project(":tempest2-testing-junit5")) - testImplementation(Dependencies.assertj) - testImplementation(Dependencies.junitEngine) + testImplementation(libs.assertj) + testImplementation(libs.junitEngine) }