diff --git a/backfila-embedded/build.gradle.kts b/backfila-embedded/build.gradle.kts index 55b073755..eb10a5956 100644 --- a/backfila-embedded/build.gradle.kts +++ b/backfila-embedded/build.gradle.kts @@ -10,21 +10,21 @@ plugins { } dependencies { - implementation(Dependencies.guava) - implementation(Dependencies.guice) - implementation(Dependencies.kotlinReflection) - implementation(Dependencies.kotlinStdLib) - implementation(Dependencies.moshiCore) - implementation(Dependencies.moshiKotlin) - implementation(Dependencies.retrofit) - implementation(Dependencies.retrofitMock) + implementation(libs.guava) + implementation(libs.guice) + implementation(libs.kotlinReflection) + implementation(libs.kotlinStdLib) + implementation(libs.moshiCore) + implementation(libs.moshiKotlin) + implementation(libs.retrofit) + implementation(libs.retrofitMock) api(project(":client")) implementation(project(":client-base")) - testImplementation(Dependencies.assertj) - testImplementation(Dependencies.kotlinTest) + testImplementation(libs.assertj) + testImplementation(libs.kotlinTest) } configure { diff --git a/build.gradle.kts b/build.gradle.kts index 032276dff..5fc0ec8b2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -13,13 +13,13 @@ buildscript { } dependencies { - classpath(Dependencies.kotlinGradlePlugin) - classpath(Dependencies.kotlinAllOpenPlugin) - classpath(Dependencies.dokkaGradlePlugin) - classpath(Dependencies.mavenPublishGradlePlugin) - classpath(Dependencies.spotlessPlugin) - classpath(Dependencies.wireGradlePlugin) - classpath(Dependencies.shadowJarPlugin) + classpath(libs.kotlinGradlePlugin) + classpath(libs.kotlinAllOpenPlugin) + classpath(libs.dokkaGradlePlugin) + classpath(libs.mavenPublishGradlePlugin) + classpath(libs.spotlessPlugin) + classpath(libs.wireGradlePlugin) + classpath(libs.shadowJarPlugin) } } @@ -56,7 +56,7 @@ subprojects { configure { kotlin { target("**/*.kt") - ktlint(Versions.ktlint).editorConfigOverride( + ktlint(libs.versions.ktlint.get()).editorConfigOverride( mapOf( "indent_size" to "2", "continuation_indent_size" to "4", diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts deleted file mode 100644 index ef323ca29..000000000 --- a/buildSrc/build.gradle.kts +++ /dev/null @@ -1,7 +0,0 @@ -plugins { - kotlin("jvm") version "1.7.0" -} - -repositories { - mavenCentral() -} diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts deleted file mode 100644 index cd613b697..000000000 --- a/buildSrc/settings.gradle.kts +++ /dev/null @@ -1,5 +0,0 @@ -pluginManagement { - repositories { - mavenCentral() - } -} diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt deleted file mode 100644 index cdaeaf46d..000000000 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ /dev/null @@ -1,94 +0,0 @@ -object Dependencies { - val apacheCommonsLang3 = "org.apache.commons:commons-lang3:3.12.0" - val assertj = "org.assertj:assertj-core:3.23.1" - val aws2Dynamodb = "software.amazon.awssdk:dynamodb:2.17.267" - val aws2DynamodbEnhanced = "software.amazon.awssdk:dynamodb-enhanced:2.17.267" - val awsDynamodb = "com.amazonaws:aws-java-sdk-dynamodb:1.11.960" - val awsS3 = "com.amazonaws:aws-java-sdk-s3:1.12.231" - val dokkaGradlePlugin = "org.jetbrains.dokka:dokka-gradle-plugin:1.5.0" - val guava = "com.google.guava:guava:31.1-jre" - val guice = "com.google.inject:guice:5.1.0" - val jCommander = "com.beust:jcommander:1.72" - val jacksonDatabind = "com.fasterxml.jackson.core:jackson-databind:2.13.3" - val jacksonDataformatYaml = "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.3" - val jacksonJsr310 = "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.3" - val jacksonKotlin = "com.fasterxml.jackson.module:jackson-module-kotlin:2.13.3" - val jettyServer = "org.eclipse.jetty:jetty-server:10.0.11" - val jettyServlet = "org.eclipse.jetty:jetty-servlet:10.0.11" - val jettyWebsocketServer = "org.eclipse.jetty.websocket:websocket-jetty-server:10.0.11" - val jettyWebsocketServlet = "org.eclipse.jetty.websocket:websocket-servlet:10.0.11" - val junitApi = "org.junit.jupiter:junit-jupiter-api:5.9.1" - val junitEngine = "org.junit.jupiter:junit-jupiter-engine:5.9.1" - val junitParams = "org.junit.jupiter:junit-jupiter-params:5.9.1" - val logbackClassic = "ch.qos.logback:logback-classic:1.4.11" - val loggingApi = "io.github.microutils:kotlin-logging:2.1.23" - val mavenPublishGradlePlugin = "com.vanniktech:gradle-maven-publish-plugin:0.25.2" - val metricsCore = "io.dropwizard.metrics:metrics-core:4.0.2" - val metricsParent = "io.dropwizard.metrics:metrics-parent:4.0.2" - val moshiCore = "com.squareup.moshi:moshi:1.13.0" - val moshiKotlin = "com.squareup.moshi:moshi-kotlin:1.13.0" - val mysql = "mysql:mysql-connector-java:8.0.30" - val okHttp = "com.squareup.okhttp3:okhttp:5.0.0-alpha.10" - val okHttpMockWebServer = "com.squareup.okhttp3:mockwebserver:5.0.0-alpha.11" - val okio = "com.squareup.okio:okio:3.2.0" - val openTracing = "io.opentracing:opentracing-api:0.33.0" - val openTracingMock = "io.opentracing:opentracing-mock:0.33.0" - val openTracingOkHttp = "io.opentracing.contrib:opentracing-okhttp3:3.0.0" - val retrofit = "com.squareup.retrofit2:retrofit:2.9.0" - val retrofitGuavaAdapter = "com.squareup.retrofit2:adapter-guava:2.9.0" - val retrofitMock = "com.squareup.retrofit2:retrofit-mock:2.9.0" - val retrofitMoshi = "com.squareup.retrofit2:converter-moshi:2.9.0" - val retrofitWire = "com.squareup.retrofit2:converter-wire:2.9.0" - val shadowJarPlugin = "gradle.plugin.com.github.johnrengelman:shadow:7.1.2" - val slf4jApi = "org.slf4j:slf4j-api:2.0.3" - val spotlessPlugin = "com.diffplug.spotless:spotless-plugin-gradle:6.12.0" - val tracingJaeger = "io.jaegertracing:jaeger-core:1.1.0" - - // Dependencies with consistent versions - val jooq = "org.jooq:jooq:${Versions.jooq}" - val kotlinAllOpenPlugin = "org.jetbrains.kotlin:kotlin-allopen:${Versions.kotlin}" - val kotlinGradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}" - val kotlinReflection = "org.jetbrains.kotlin:kotlin-reflect:${Versions.kotlin}" - val kotlinStdLib = "org.jetbrains.kotlin:kotlin-stdlib:${Versions.kotlin}" - val kotlinTest = "org.jetbrains.kotlin:kotlin-test:${Versions.kotlin}" - val kotlinxCoroutines = "org.jetbrains.kotlinx:kotlinx-coroutines-core:${Versions.kotlinCoroutines}" - val kotlinxCoroutinesLogging = "org.jetbrains.kotlinx:kotlinx-coroutines-slf4j:${Versions.kotlinCoroutines}" - val kotlinxCoroutinesTest = "org.jetbrains.kotlinx:kotlinx-coroutines-test:${Versions.kotlinCoroutines}" - val misk = "com.squareup.misk:misk:${Versions.misk}" - val miskActions = "com.squareup.misk:misk-actions:${Versions.misk}" - val miskAdmin = "com.squareup.misk:misk-admin:${Versions.misk}" - val miskAwsDynamodb = "com.squareup.misk:misk-aws-dynamodb:${Versions.misk}" - val miskAws2Dynamodb = "com.squareup.misk:misk-aws2-dynamodb:${Versions.misk}" - val miskCore = "com.squareup.misk:misk-core:${Versions.misk}" - val miskHibernate = "com.squareup.misk:misk-hibernate:${Versions.misk}" - val miskHibernateTesting = "com.squareup.misk:misk-hibernate-testing:${Versions.misk}" - val miskHotwire = "com.squareup.misk:misk-hotwire:${Versions.misk}" - val miskJdbc = "com.squareup.misk:misk-jdbc:${Versions.misk}" - val miskInject = "com.squareup.misk:misk-inject:${Versions.misk}" - val miskMetrics = "com.squareup.misk:misk-metrics:${Versions.misk}" - val miskService = "com.squareup.misk:misk-service:${Versions.misk}" - val miskSlack = "com.squareup.misk:misk-slack:${Versions.misk}" - val miskTailwind = "com.squareup.misk:misk-tailwind:${Versions.misk}" - val miskTesting = "com.squareup.misk:misk-testing:${Versions.misk}" - val wireCompiler = "com.squareup.wire:wire-compiler:${Versions.wire}" - val wireGradlePlugin = "com.squareup.wire:wire-gradle-plugin:${Versions.wire}" - val wireMoshiAdapter = "com.squareup.wire:wire-moshi-adapter:${Versions.wire}" - val wireRuntime = "com.squareup.wire:wire-runtime:${Versions.wire}" - val wireSchema = "com.squareup.wire:wire-schema:${Versions.wire}" - val wispClient = "app.cash.wisp:wisp-client:${Versions.wisp}" - val wispConfig = "app.cash.wisp:wisp-config:${Versions.wisp}" - val wispDeployment = "app.cash.wisp:wisp-deployment:${Versions.wisp}" - val wispLogging = "app.cash.wisp:wisp-logging:${Versions.wisp}" -} - -object Versions { - val flywayDBPlugin = "7.15.0" - val jooqGenPlugin = "8.1" - val jooq = "3.18.1" - val kotlin = "1.7.0" - val kotlinCoroutines = "1.6.3" - val ktlint = "0.47.1" - val misk = "2023.12.01.175902-d977e5a" - val wire = "4.4.2" - val wisp = "2023.08.14.092919-cea18b8" -} diff --git a/client-base/build.gradle.kts b/client-base/build.gradle.kts index 186287e8b..6d73eb2f6 100644 --- a/client-base/build.gradle.kts +++ b/client-base/build.gradle.kts @@ -9,20 +9,20 @@ plugins { } dependencies { - implementation(Dependencies.apacheCommonsLang3) - implementation(Dependencies.guava) - implementation(Dependencies.moshiCore) - implementation(Dependencies.moshiKotlin) - implementation(Dependencies.wireRuntime) - implementation(Dependencies.guice) - implementation(Dependencies.retrofit) - implementation(Dependencies.retrofitMock) - implementation(Dependencies.retrofitMoshi) - implementation(Dependencies.retrofitWire) - implementation(Dependencies.okio) - implementation(Dependencies.kotlinStdLib) - implementation(Dependencies.wireMoshiAdapter) - implementation(Dependencies.wispLogging) + implementation(libs.apacheCommonsLang3) + implementation(libs.guava) + implementation(libs.moshiCore) + implementation(libs.moshiKotlin) + implementation(libs.wireRuntime) + implementation(libs.guice) + implementation(libs.retrofit) + implementation(libs.retrofitMock) + implementation(libs.retrofitMoshi) + implementation(libs.retrofitWire) + implementation(libs.okio) + implementation(libs.kotlinStdLib) + implementation(libs.wireMoshiAdapter) + implementation(libs.wispLogging) // "client" is an implementation not an api dependency because client implementations MUST // expose "client" as an explicit api dependency so that customers of that client have access to @@ -32,18 +32,18 @@ dependencies { // base classes accessible to the client implementations but not the client customers. implementation(project(":client")) - testImplementation(Dependencies.junitEngine) - testImplementation(Dependencies.assertj) - testImplementation(Dependencies.kotlinReflection) - testImplementation(Dependencies.kotlinTest) + testImplementation(libs.junitEngine) + testImplementation(libs.assertj) + testImplementation(libs.kotlinReflection) + testImplementation(libs.kotlinTest) testImplementation(project(":backfila-embedded")) // **************************************** // For TESTING purposes only. We only want Misk for easy testing. // DO NOT turn these into regular dependencies. // **************************************** - /* TEST ONLY */ testImplementation(Dependencies.misk) - /* TEST ONLY */ testImplementation(Dependencies.miskTesting) + /* TEST ONLY */ testImplementation(libs.misk) + /* TEST ONLY */ testImplementation(libs.miskTesting) /* TEST ONLY */ testImplementation(project(":client-misk")) // **************************************** // Can I make it any more obvious? diff --git a/client-dynamodb-v2/build.gradle.kts b/client-dynamodb-v2/build.gradle.kts index ca77a0fab..5c3c7f259 100644 --- a/client-dynamodb-v2/build.gradle.kts +++ b/client-dynamodb-v2/build.gradle.kts @@ -9,32 +9,32 @@ plugins { } dependencies { - implementation(Dependencies.aws2Dynamodb) - implementation(Dependencies.aws2DynamodbEnhanced) - implementation(Dependencies.kotlinReflection) - implementation(Dependencies.kotlinStdLib) - implementation(Dependencies.guava) - implementation(Dependencies.guice) - implementation(Dependencies.moshiCore) - implementation(Dependencies.moshiKotlin) - implementation(Dependencies.okHttp) - implementation(Dependencies.okio) - implementation(Dependencies.retrofit) - implementation(Dependencies.retrofitMock) - implementation(Dependencies.retrofitMoshi) - implementation(Dependencies.retrofitWire) - implementation(Dependencies.wireMoshiAdapter) - implementation(Dependencies.wireRuntime) + implementation(libs.aws2Dynamodb) + implementation(libs.aws2DynamodbEnhanced) + implementation(libs.kotlinReflection) + implementation(libs.kotlinStdLib) + implementation(libs.guava) + implementation(libs.guice) + implementation(libs.moshiCore) + implementation(libs.moshiKotlin) + implementation(libs.okHttp) + implementation(libs.okio) + implementation(libs.retrofit) + implementation(libs.retrofitMock) + implementation(libs.retrofitMoshi) + implementation(libs.retrofitWire) + implementation(libs.wireMoshiAdapter) + implementation(libs.wireRuntime) api(project(":client")) // We do not want to leak client-base implementation details to customers. implementation(project(":client-base")) - testImplementation(Dependencies.assertj) - testImplementation(Dependencies.aws2Dynamodb) - testImplementation(Dependencies.aws2DynamodbEnhanced) - testImplementation(Dependencies.junitEngine) - testImplementation(Dependencies.kotlinTest) + testImplementation(libs.assertj) + testImplementation(libs.aws2Dynamodb) + testImplementation(libs.aws2DynamodbEnhanced) + testImplementation(libs.junitEngine) + testImplementation(libs.kotlinTest) testImplementation(project(":backfila-embedded")) testImplementation(project(":client-testing")) @@ -43,11 +43,11 @@ dependencies { // For TESTING purposes only. We only want Misk for easy testing. // DO NOT turn these into regular dependencies. // **************************************** - testImplementation(Dependencies.misk) - testImplementation(Dependencies.miskAws2Dynamodb) - testImplementation(testFixtures(Dependencies.miskAws2Dynamodb)) - testImplementation(Dependencies.miskInject) - testImplementation(Dependencies.miskTesting) + testImplementation(libs.misk) + testImplementation(libs.miskAws2Dynamodb) + testImplementation(testFixtures(libs.miskAws2Dynamodb)) + testImplementation(libs.miskInject) + testImplementation(libs.miskTesting) testImplementation(project(":client-misk")) // Required until DynamoDBLocal is built with antlr >4.11 which wisp-config pulls in testImplementation("org.antlr:antlr4-runtime:4.9.3") { diff --git a/client-dynamodb/build.gradle.kts b/client-dynamodb/build.gradle.kts index da020c120..96f0b319d 100644 --- a/client-dynamodb/build.gradle.kts +++ b/client-dynamodb/build.gradle.kts @@ -9,29 +9,29 @@ plugins { } dependencies { - implementation(Dependencies.awsDynamodb) - implementation(Dependencies.kotlinReflection) - implementation(Dependencies.kotlinStdLib) - implementation(Dependencies.guava) - implementation(Dependencies.guice) - implementation(Dependencies.moshiCore) - implementation(Dependencies.moshiKotlin) - implementation(Dependencies.okio) - implementation(Dependencies.retrofit) - implementation(Dependencies.retrofitMock) - implementation(Dependencies.retrofitMoshi) - implementation(Dependencies.retrofitWire) - implementation(Dependencies.wireMoshiAdapter) - implementation(Dependencies.wireRuntime) + implementation(libs.awsDynamodb) + implementation(libs.kotlinReflection) + implementation(libs.kotlinStdLib) + implementation(libs.guava) + implementation(libs.guice) + implementation(libs.moshiCore) + implementation(libs.moshiKotlin) + implementation(libs.okio) + implementation(libs.retrofit) + implementation(libs.retrofitMock) + implementation(libs.retrofitMoshi) + implementation(libs.retrofitWire) + implementation(libs.wireMoshiAdapter) + implementation(libs.wireRuntime) api(project(":client")) // We do not want to leak client-base implementation details to customers. implementation(project(":client-base")) - testImplementation(Dependencies.assertj) - testImplementation(Dependencies.awsDynamodb) - testImplementation(Dependencies.junitEngine) - testImplementation(Dependencies.kotlinTest) + testImplementation(libs.assertj) + testImplementation(libs.awsDynamodb) + testImplementation(libs.junitEngine) + testImplementation(libs.kotlinTest) testImplementation(project(":backfila-embedded")) testImplementation(project(":client-testing")) @@ -40,11 +40,11 @@ dependencies { // For TESTING purposes only. We only want Misk for easy testing. // DO NOT turn these into regular dependencies. // **************************************** - testImplementation(Dependencies.misk) - testImplementation(Dependencies.miskAwsDynamodb) - testImplementation(testFixtures(Dependencies.miskAwsDynamodb)) - testImplementation(Dependencies.miskInject) - testImplementation(Dependencies.miskTesting) + testImplementation(libs.misk) + testImplementation(libs.miskAwsDynamodb) + testImplementation(testFixtures(libs.miskAwsDynamodb)) + testImplementation(libs.miskInject) + testImplementation(libs.miskTesting) testImplementation(project(":client-misk")) // Required until DynamoDBLocal is built with antlr >4.11 which wisp-config pulls in testImplementation("org.antlr:antlr4-runtime:4.9.3") { diff --git a/client-jooq/build.gradle.kts b/client-jooq/build.gradle.kts index 04525d877..5a885f6bc 100644 --- a/client-jooq/build.gradle.kts +++ b/client-jooq/build.gradle.kts @@ -10,44 +10,44 @@ buildscript { gradlePluginPortal() } dependencies { - classpath(Dependencies.mysql) + classpath(libs.mysql) } } plugins { kotlin("jvm") `java-library` - id("org.flywaydb.flyway") version Versions.flywayDBPlugin - id("nu.studer.jooq") version Versions.jooqGenPlugin + id("org.flywaydb.flyway") version "7.15.0" + id("nu.studer.jooq") version "8.1" id("com.vanniktech.maven.publish.base") } dependencies { - implementation(Dependencies.guava) - implementation(Dependencies.moshiCore) - implementation(Dependencies.moshiKotlin) - implementation(Dependencies.wireRuntime) - implementation(Dependencies.guice) - implementation(Dependencies.okio) - implementation(Dependencies.jooq) - implementation(Dependencies.kotlinReflection) - implementation(Dependencies.kotlinStdLib) - implementation(Dependencies.loggingApi) - implementation(Dependencies.wireMoshiAdapter) - - jooqGenerator(Dependencies.mysql) + implementation(libs.guava) + implementation(libs.moshiCore) + implementation(libs.moshiKotlin) + implementation(libs.wireRuntime) + implementation(libs.guice) + implementation(libs.okio) + implementation(libs.jooq) + implementation(libs.kotlinReflection) + implementation(libs.kotlinStdLib) + implementation(libs.loggingApi) + implementation(libs.wireMoshiAdapter) + + jooqGenerator(libs.mysql) api(project(":client")) // We do not want to leak client-base implementation details to customers. implementation(project(":client-base")) - testImplementation(Dependencies.assertj) - testImplementation(Dependencies.kotlinTest) - testImplementation(Dependencies.junitEngine) - testImplementation(Dependencies.junitParams) - testImplementation(Dependencies.okHttp) - testImplementation(Dependencies.mysql) - testImplementation(Dependencies.wispLogging) + testImplementation(libs.assertj) + testImplementation(libs.kotlinTest) + testImplementation(libs.junitEngine) + testImplementation(libs.junitParams) + testImplementation(libs.okHttp) + testImplementation(libs.mysql) + testImplementation(libs.wispLogging) testImplementation(project(":backfila-embedded")) testImplementation(project(":client-testing")) @@ -56,13 +56,13 @@ dependencies { // For TESTING purposes only. We only want Misk for easy testing. // DO NOT turn these into regular dependencies. // **************************************** - testImplementation(Dependencies.misk) - testImplementation(Dependencies.miskJdbc) - testImplementation(Dependencies.miskActions) - testImplementation(Dependencies.miskCore) - testImplementation(Dependencies.miskInject) - testImplementation(testFixtures(Dependencies.miskJdbc)) - testImplementation(Dependencies.miskTesting) + testImplementation(libs.misk) + testImplementation(libs.miskJdbc) + testImplementation(libs.miskActions) + testImplementation(libs.miskCore) + testImplementation(libs.miskInject) + testImplementation(testFixtures(libs.miskJdbc)) + testImplementation(libs.miskTesting) testImplementation(project(":client-misk")) } @@ -77,7 +77,7 @@ flyway { } jooq { - version.set(Versions.jooq) + version.set(libs.versions.jooq) edition.set(JooqEdition.OSS) configurations { diff --git a/client-misk-dynamodb/build.gradle.kts b/client-misk-dynamodb/build.gradle.kts index 34dffc1d6..704622a92 100644 --- a/client-misk-dynamodb/build.gradle.kts +++ b/client-misk-dynamodb/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } dependencies { - implementation(Dependencies.kotlinStdLib) + implementation(libs.kotlinStdLib) api(project(":client-dynamodb")) } diff --git a/client-misk-hibernate/build.gradle.kts b/client-misk-hibernate/build.gradle.kts index 37b6e5f7a..2f378ba3c 100644 --- a/client-misk-hibernate/build.gradle.kts +++ b/client-misk-hibernate/build.gradle.kts @@ -9,36 +9,36 @@ plugins { } dependencies { - implementation(Dependencies.guava) - implementation(Dependencies.moshiCore) - implementation(Dependencies.moshiKotlin) - implementation(Dependencies.wireRuntime) - implementation(Dependencies.guice) - implementation(Dependencies.okio) - implementation(Dependencies.kotlinReflection) - implementation(Dependencies.kotlinStdLib) - implementation(Dependencies.loggingApi) - implementation(Dependencies.wireMoshiAdapter) + implementation(libs.guava) + implementation(libs.moshiCore) + implementation(libs.moshiKotlin) + implementation(libs.wireRuntime) + implementation(libs.guice) + implementation(libs.okio) + implementation(libs.kotlinReflection) + implementation(libs.kotlinStdLib) + implementation(libs.loggingApi) + implementation(libs.wireMoshiAdapter) api(project(":client")) // We do not want to leak client-base implementation details to customers. implementation(project(":client-base")) - implementation(Dependencies.misk) - implementation(Dependencies.miskActions) - implementation(Dependencies.miskCore) - implementation(Dependencies.miskInject) - implementation(Dependencies.wispLogging) - api(Dependencies.miskHibernate) + implementation(libs.misk) + implementation(libs.miskActions) + implementation(libs.miskCore) + implementation(libs.miskInject) + implementation(libs.wispLogging) + api(libs.miskHibernate) - testImplementation(Dependencies.assertj) - testImplementation(Dependencies.miskTesting) - testImplementation(testFixtures(Dependencies.miskJdbc)) - testImplementation(Dependencies.miskHibernateTesting) + testImplementation(libs.assertj) + testImplementation(libs.miskTesting) + testImplementation(testFixtures(libs.miskJdbc)) + testImplementation(libs.miskHibernateTesting) testImplementation(project(":client-misk")) - testImplementation(Dependencies.kotlinTest) - testImplementation(Dependencies.junitEngine) - testImplementation(Dependencies.okHttp) + testImplementation(libs.kotlinTest) + testImplementation(libs.junitEngine) + testImplementation(libs.okHttp) testImplementation(project(":backfila-embedded")) testImplementation(project(":client-testing")) diff --git a/client-misk-jooq/build.gradle.kts b/client-misk-jooq/build.gradle.kts index 693f29988..66298d4ce 100644 --- a/client-misk-jooq/build.gradle.kts +++ b/client-misk-jooq/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } dependencies { - implementation(Dependencies.kotlinStdLib) + implementation(libs.kotlinStdLib) api(project(":client-jooq")) } diff --git a/client-misk-static/build.gradle.kts b/client-misk-static/build.gradle.kts index 965372fa6..94f33d59a 100644 --- a/client-misk-static/build.gradle.kts +++ b/client-misk-static/build.gradle.kts @@ -8,7 +8,7 @@ plugins { id("com.vanniktech.maven.publish.base") } dependencies { - implementation(Dependencies.kotlinStdLib) + implementation(libs.kotlinStdLib) api(project(":client-static")) } diff --git a/client-misk/build.gradle.kts b/client-misk/build.gradle.kts index ea1ad6a54..431ab1aad 100644 --- a/client-misk/build.gradle.kts +++ b/client-misk/build.gradle.kts @@ -9,37 +9,37 @@ plugins { } dependencies { - implementation(Dependencies.apacheCommonsLang3) - implementation(Dependencies.guava) - implementation(Dependencies.moshiCore) - implementation(Dependencies.moshiKotlin) - implementation(Dependencies.wireRuntime) - implementation(Dependencies.guice) - implementation(Dependencies.okHttp) - implementation(Dependencies.retrofit) - implementation(Dependencies.retrofitMock) - implementation(Dependencies.retrofitMoshi) - implementation(Dependencies.retrofitWire) - implementation(Dependencies.okio) - implementation(Dependencies.kotlinStdLib) - implementation(Dependencies.wireMoshiAdapter) - implementation(Dependencies.slf4jApi) - implementation(Dependencies.loggingApi) + implementation(libs.apacheCommonsLang3) + implementation(libs.guava) + implementation(libs.moshiCore) + implementation(libs.moshiKotlin) + implementation(libs.wireRuntime) + implementation(libs.guice) + implementation(libs.okHttp) + implementation(libs.retrofit) + implementation(libs.retrofitMock) + implementation(libs.retrofitMoshi) + implementation(libs.retrofitWire) + implementation(libs.okio) + implementation(libs.kotlinStdLib) + implementation(libs.wireMoshiAdapter) + implementation(libs.slf4jApi) + implementation(libs.loggingApi) api(project(":client")) // We do not want to leak client-base implementation details to customers. implementation(project(":client-base")) - implementation(Dependencies.misk) - implementation(Dependencies.miskActions) - implementation(Dependencies.miskCore) - implementation(Dependencies.miskInject) - implementation(Dependencies.miskService) - implementation(Dependencies.wispLogging) + implementation(libs.misk) + implementation(libs.miskActions) + implementation(libs.miskCore) + implementation(libs.miskInject) + implementation(libs.miskService) + implementation(libs.wispLogging) - testImplementation(Dependencies.assertj) - testImplementation(Dependencies.miskTesting) - testImplementation(Dependencies.junitEngine) + testImplementation(libs.assertj) + testImplementation(libs.miskTesting) + testImplementation(libs.junitEngine) testImplementation(project(":backfila-embedded")) testImplementation(project(":client-testing")) diff --git a/client-s3/build.gradle.kts b/client-s3/build.gradle.kts index e1bde30ea..7f596fd1b 100644 --- a/client-s3/build.gradle.kts +++ b/client-s3/build.gradle.kts @@ -9,27 +9,27 @@ plugins { } dependencies { - implementation(Dependencies.awsS3) - implementation(Dependencies.guava) - implementation(Dependencies.moshiCore) - implementation(Dependencies.moshiKotlin) - implementation(Dependencies.wireRuntime) - implementation(Dependencies.guice) - implementation(Dependencies.okHttp) - implementation(Dependencies.retrofit) - implementation(Dependencies.retrofitMock) - implementation(Dependencies.retrofitMoshi) - implementation(Dependencies.retrofitWire) - implementation(Dependencies.okio) - implementation(Dependencies.kotlinStdLib) - implementation(Dependencies.wireMoshiAdapter) + implementation(libs.awsS3) + implementation(libs.guava) + implementation(libs.moshiCore) + implementation(libs.moshiKotlin) + implementation(libs.wireRuntime) + implementation(libs.guice) + implementation(libs.okHttp) + implementation(libs.retrofit) + implementation(libs.retrofitMock) + implementation(libs.retrofitMoshi) + implementation(libs.retrofitWire) + implementation(libs.okio) + implementation(libs.kotlinStdLib) + implementation(libs.wireMoshiAdapter) api(project(":client")) // We do not want to leak client-base implementation details to customers. implementation(project(":client-base")) - testImplementation(Dependencies.assertj) - testImplementation(Dependencies.junitEngine) - testImplementation(Dependencies.kotlinTest) + testImplementation(libs.assertj) + testImplementation(libs.junitEngine) + testImplementation(libs.kotlinTest) testImplementation(project(":backfila-embedded")) testImplementation(project(":client-testing")) @@ -38,10 +38,10 @@ dependencies { // For TESTING purposes only. We only want Misk for easy testing. // DO NOT turn these into regular dependencies. // **************************************** - testImplementation(Dependencies.misk) - testImplementation(Dependencies.miskActions) - testImplementation(Dependencies.miskInject) - testImplementation(Dependencies.miskTesting) + testImplementation(libs.misk) + testImplementation(libs.miskActions) + testImplementation(libs.miskInject) + testImplementation(libs.miskTesting) testImplementation(project(":client-misk")) } diff --git a/client-static/build.gradle.kts b/client-static/build.gradle.kts index 6ff579441..1937389fc 100644 --- a/client-static/build.gradle.kts +++ b/client-static/build.gradle.kts @@ -9,27 +9,27 @@ plugins { } dependencies { - implementation(Dependencies.guava) - implementation(Dependencies.moshiCore) - implementation(Dependencies.moshiKotlin) - implementation(Dependencies.wireRuntime) - implementation(Dependencies.guice) - implementation(Dependencies.okHttp) - implementation(Dependencies.retrofit) - implementation(Dependencies.retrofitMock) - implementation(Dependencies.retrofitMoshi) - implementation(Dependencies.retrofitWire) - implementation(Dependencies.okio) - implementation(Dependencies.kotlinReflection) - implementation(Dependencies.kotlinStdLib) - implementation(Dependencies.wireMoshiAdapter) + implementation(libs.guava) + implementation(libs.moshiCore) + implementation(libs.moshiKotlin) + implementation(libs.wireRuntime) + implementation(libs.guice) + implementation(libs.okHttp) + implementation(libs.retrofit) + implementation(libs.retrofitMock) + implementation(libs.retrofitMoshi) + implementation(libs.retrofitWire) + implementation(libs.okio) + implementation(libs.kotlinReflection) + implementation(libs.kotlinStdLib) + implementation(libs.wireMoshiAdapter) api(project(":client")) // We do not want to leak client-base implementation details to customers. implementation(project(":client-base")) - testImplementation(Dependencies.assertj) - testImplementation(Dependencies.junitEngine) - testImplementation(Dependencies.kotlinTest) + testImplementation(libs.assertj) + testImplementation(libs.junitEngine) + testImplementation(libs.kotlinTest) testImplementation(project(":backfila-embedded")) testImplementation(project(":client-testing")) @@ -38,10 +38,10 @@ dependencies { // For TESTING purposes only. We only want Misk for easy testing. // DO NOT turn these into regular dependencies. // **************************************** - testImplementation(Dependencies.misk) - testImplementation(Dependencies.miskActions) - testImplementation(Dependencies.miskInject) - testImplementation(Dependencies.miskTesting) + testImplementation(libs.misk) + testImplementation(libs.miskActions) + testImplementation(libs.miskInject) + testImplementation(libs.miskTesting) testImplementation(project(":client-misk")) } diff --git a/client-testing/build.gradle.kts b/client-testing/build.gradle.kts index 7e17d986a..11b741716 100644 --- a/client-testing/build.gradle.kts +++ b/client-testing/build.gradle.kts @@ -12,8 +12,8 @@ dependencies { api(project(":client")) implementation(project(":backfila-embedded")) - implementation(Dependencies.junitEngine) - implementation(Dependencies.assertj) + implementation(libs.junitEngine) + implementation(libs.assertj) } configure { diff --git a/client/build.gradle.kts b/client/build.gradle.kts index 06afdc936..2b8920fcb 100644 --- a/client/build.gradle.kts +++ b/client/build.gradle.kts @@ -16,16 +16,16 @@ sourceSets { } dependencies { - implementation(Dependencies.moshiCore) - implementation(Dependencies.moshiKotlin) - implementation(Dependencies.wireRuntime) - implementation(Dependencies.guice) - implementation(Dependencies.retrofit) - implementation(Dependencies.retrofitMoshi) - implementation(Dependencies.retrofitWire) - implementation(Dependencies.okio) - implementation(Dependencies.kotlinStdLib) - implementation(Dependencies.wireMoshiAdapter) + implementation(libs.moshiCore) + implementation(libs.moshiKotlin) + implementation(libs.wireRuntime) + implementation(libs.guice) + implementation(libs.retrofit) + implementation(libs.retrofitMoshi) + implementation(libs.retrofitWire) + implementation(libs.okio) + implementation(libs.kotlinStdLib) + implementation(libs.wireMoshiAdapter) } wire { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 000000000..15d76835d --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,83 @@ +[versions] +jooq = "3.18.1" +ktlint = "0.47.1" + +[libraries] +apacheCommonsLang3 = { module = "org.apache.commons:commons-lang3", version = "3.12.0" } +assertj = { module = "org.assertj:assertj-core", version = "3.23.1" } +aws2Dynamodb = { module = "software.amazon.awssdk:dynamodb", version = "2.17.267" } +aws2DynamodbEnhanced = { module = "software.amazon.awssdk:dynamodb-enhanced", version = "2.17.267" } +awsDynamodb = { module = "com.amazonaws:aws-java-sdk-dynamodb", version = "1.11.960" } +awsS3 = { module = "com.amazonaws:aws-java-sdk-s3", version = "1.12.231" } +dokkaGradlePlugin = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version = "1.5.0" } +guava = { module = "com.google.guava:guava", version = "31.1-jre" } +guice = { module = "com.google.inject:guice", version = "5.1.0" } +jCommander = { module = "com.beust:jcommander", version = "1.72" } +jacksonDatabind = { module = "com.fasterxml.jackson.core:jackson-databind", version = "2.13.3" } +jacksonDataformatYaml = { module = "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml", version = "2.13.3" } +jacksonJsr310 = { module = "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", version = "2.13.3" } +jacksonKotlin = { module = "com.fasterxml.jackson.module:jackson-module-kotlin", version = "2.13.3" } +jettyServer = { module = "org.eclipse.jetty:jetty-server", version = "10.0.11" } +jettyServlet = { module = "org.eclipse.jetty:jetty-servlet", version = "10.0.11" } +jettyWebsocketServer = { module = "org.eclipse.jetty.websocket:websocket-jetty-server", version = "10.0.11" } +jettyWebsocketServlet = { module = "org.eclipse.jetty.websocket:websocket-servlet", version = "10.0.11" } +junitApi = { module = "org.junit.jupiter:junit-jupiter-api", version = "5.9.1" } +junitEngine = { module = "org.junit.jupiter:junit-jupiter-engine", version = "5.9.1" } +junitParams = { module = "org.junit.jupiter:junit-jupiter-params", version = "5.9.1" } +logbackClassic = { module = "ch.qos.logback:logback-classic", version = "1.4.11" } +loggingApi = { module = "io.github.microutils:kotlin-logging", version = "2.1.23" } +mavenPublishGradlePlugin = { module = "com.vanniktech:gradle-maven-publish-plugin", version = "0.25.2" } +metricsCore = { module = "io.dropwizard.metrics:metrics-core", version = "4.0.2" } +metricsParent = { module = "io.dropwizard.metrics:metrics-parent", version = "4.0.2" } +moshiCore = { module = "com.squareup.moshi:moshi", version = "1.13.0" } +moshiKotlin = { module = "com.squareup.moshi:moshi-kotlin", version = "1.13.0" } +mysql = { module = "mysql:mysql-connector-java", version = "8.0.30" } +okHttp = { module = "com.squareup.okhttp3:okhttp", version = "5.0.0-alpha.10" } +okHttpMockWebServer = { module = "com.squareup.okhttp3:mockwebserver", version = "5.0.0-alpha.11" } +okio = { module = "com.squareup.okio:okio", version = "3.2.0" } +openTracing = { module = "io.opentracing:opentracing-api", version = "0.33.0" } +openTracingMock = { module = "io.opentracing:opentracing-mock", version = "0.33.0" } +openTracingOkHttp = { module = "io.opentracing.contrib:opentracing-okhttp3", version = "3.0.0" } +retrofit = { module = "com.squareup.retrofit2:retrofit", version = "2.9.0" } +retrofitGuavaAdapter = { module = "com.squareup.retrofit2:adapter-guava", version = "2.9.0" } +retrofitMock = { module = "com.squareup.retrofit2:retrofit-mock", version = "2.9.0" } +retrofitMoshi = { module = "com.squareup.retrofit2:converter-moshi", version = "2.9.0" } +retrofitWire = { module = "com.squareup.retrofit2:converter-wire", version = "2.9.0" } +shadowJarPlugin = { module = "gradle.plugin.com.github.johnrengelman:shadow", version = "7.1.2" } +slf4jApi = { module = "org.slf4j:slf4j-api", version = "2.0.3" } +spotlessPlugin = { module = "com.diffplug.spotless:spotless-plugin-gradle", version = "6.12.0" } +tracingJaeger = { module = "io.jaegertracing:jaeger-core", version = "1.1.0" } +jooq = { module = "org.jooq:jooq", version.ref = "jooq" } +kotlinAllOpenPlugin = { module = "org.jetbrains.kotlin:kotlin-allopen", version = "1.7.0" } +kotlinGradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version = "1.7.0" } +kotlinReflection = { module = "org.jetbrains.kotlin:kotlin-reflect", version = "1.7.0" } +kotlinStdLib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version = "1.7.0" } +kotlinTest = { module = "org.jetbrains.kotlin:kotlin-test", version = "1.7.0" } +kotlinxCoroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version = "1.6.3" } +kotlinxCoroutinesLogging = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-slf4j", version = "1.6.3" } +kotlinxCoroutinesTest = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version = "1.6.3" } +misk = { module = "com.squareup.misk:misk", version = "2023.12.01.175902-d977e5a" } +miskActions = { module = "com.squareup.misk:misk-actions", version = "2023.12.01.175902-d977e5a" } +miskAdmin = { module = "com.squareup.misk:misk-admin", version = "2023.12.01.175902-d977e5a" } +miskAwsDynamodb = { module = "com.squareup.misk:misk-aws-dynamodb", version = "2023.12.01.175902-d977e5a" } +miskAws2Dynamodb = { module = "com.squareup.misk:misk-aws2-dynamodb", version = "2023.12.01.175902-d977e5a" } +miskCore = { module = "com.squareup.misk:misk-core", version = "2023.12.01.175902-d977e5a" } +miskHibernate = { module = "com.squareup.misk:misk-hibernate", version = "2023.12.01.175902-d977e5a" } +miskHibernateTesting = { module = "com.squareup.misk:misk-hibernate-testing", version = "2023.12.01.175902-d977e5a" } +miskHotwire = { module = "com.squareup.misk:misk-hotwire", version = "2023.12.01.175902-d977e5a" } +miskJdbc = { module = "com.squareup.misk:misk-jdbc", version = "2023.12.01.175902-d977e5a" } +miskInject = { module = "com.squareup.misk:misk-inject", version = "2023.12.01.175902-d977e5a" } +miskMetrics = { module = "com.squareup.misk:misk-metrics", version = "2023.12.01.175902-d977e5a" } +miskService = { module = "com.squareup.misk:misk-service", version = "2023.12.01.175902-d977e5a" } +miskSlack = { module = "com.squareup.misk:misk-slack", version = "2023.12.01.175902-d977e5a" } +miskTailwind = { module = "com.squareup.misk:misk-tailwind", version = "2023.12.01.175902-d977e5a" } +miskTesting = { module = "com.squareup.misk:misk-testing", version = "2023.12.01.175902-d977e5a" } +wireCompiler = { module = "com.squareup.wire:wire-compiler", version = "4.4.2" } +wireGradlePlugin = { module = "com.squareup.wire:wire-gradle-plugin", version = "4.4.2" } +wireMoshiAdapter = { module = "com.squareup.wire:wire-moshi-adapter", version = "4.4.2" } +wireRuntime = { module = "com.squareup.wire:wire-runtime", version = "4.4.2" } +wireSchema = { module = "com.squareup.wire:wire-schema", version = "4.4.2" } +wispClient = { module = "app.cash.wisp:wisp-client", version = "2023.12.01.175902-d977e5a" } +wispConfig = { module = "app.cash.wisp:wisp-config", version = "2023.12.01.175902-d977e5a" } +wispDeployment = { module = "app.cash.wisp:wisp-deployment", version = "2023.12.01.175902-d977e5a" } +wispLogging = { module = "app.cash.wisp:wisp-logging", version = "2023.12.01.175902-d977e5a" } diff --git a/service-self-backfill/build.gradle.kts b/service-self-backfill/build.gradle.kts index b851f7ace..22707d8e2 100644 --- a/service-self-backfill/build.gradle.kts +++ b/service-self-backfill/build.gradle.kts @@ -10,50 +10,50 @@ plugins { } dependencies { - implementation(Dependencies.apacheCommonsLang3) - implementation(Dependencies.guava) - implementation(Dependencies.guice) - implementation(Dependencies.jacksonDatabind) - implementation(Dependencies.jacksonDataformatYaml) - implementation(Dependencies.jacksonJsr310) - implementation(Dependencies.jacksonKotlin) - implementation(Dependencies.jCommander) - implementation(Dependencies.jettyServer) - implementation(Dependencies.jettyServlet) - implementation(Dependencies.jettyWebsocketServlet) - implementation(Dependencies.jettyWebsocketServer) - implementation(Dependencies.kotlinStdLib) - implementation(Dependencies.kotlinReflection) - implementation(Dependencies.kotlinxCoroutines) - implementation(Dependencies.kotlinxCoroutinesLogging) - implementation(Dependencies.loggingApi) - implementation(Dependencies.metricsCore) - implementation(Dependencies.metricsParent) - implementation(Dependencies.misk) - implementation(Dependencies.miskActions) - implementation(Dependencies.miskAdmin) - implementation(Dependencies.miskCore) - implementation(Dependencies.miskHibernate) - implementation(Dependencies.miskInject) - implementation(Dependencies.miskMetrics) - implementation(Dependencies.miskService) - implementation(Dependencies.miskSlack) - implementation(Dependencies.moshiCore) - implementation(Dependencies.moshiKotlin) - implementation(Dependencies.okio) - implementation(Dependencies.openTracing) - implementation(Dependencies.openTracingOkHttp) - implementation(Dependencies.retrofit) - implementation(Dependencies.retrofitGuavaAdapter) - implementation(Dependencies.retrofitWire) - implementation(Dependencies.tracingJaeger) - implementation(Dependencies.wireRuntime) - implementation(Dependencies.wireCompiler) - implementation(Dependencies.wireSchema) - implementation(Dependencies.wispClient) - implementation(Dependencies.wispConfig) - implementation(Dependencies.wispDeployment) - implementation(Dependencies.wispLogging) + implementation(libs.apacheCommonsLang3) + implementation(libs.guava) + implementation(libs.guice) + implementation(libs.jacksonDatabind) + implementation(libs.jacksonDataformatYaml) + implementation(libs.jacksonJsr310) + implementation(libs.jacksonKotlin) + implementation(libs.jCommander) + implementation(libs.jettyServer) + implementation(libs.jettyServlet) + implementation(libs.jettyWebsocketServlet) + implementation(libs.jettyWebsocketServer) + implementation(libs.kotlinStdLib) + implementation(libs.kotlinReflection) + implementation(libs.kotlinxCoroutines) + implementation(libs.kotlinxCoroutinesLogging) + implementation(libs.loggingApi) + implementation(libs.metricsCore) + implementation(libs.metricsParent) + implementation(libs.misk) + implementation(libs.miskActions) + implementation(libs.miskAdmin) + implementation(libs.miskCore) + implementation(libs.miskHibernate) + implementation(libs.miskInject) + implementation(libs.miskMetrics) + implementation(libs.miskService) + implementation(libs.miskSlack) + implementation(libs.moshiCore) + implementation(libs.moshiKotlin) + implementation(libs.okio) + implementation(libs.openTracing) + implementation(libs.openTracingOkHttp) + implementation(libs.retrofit) + implementation(libs.retrofitGuavaAdapter) + implementation(libs.retrofitWire) + implementation(libs.tracingJaeger) + implementation(libs.wireRuntime) + implementation(libs.wireCompiler) + implementation(libs.wireSchema) + implementation(libs.wispClient) + implementation(libs.wispConfig) + implementation(libs.wispDeployment) + implementation(libs.wispLogging) implementation(project(":client")) implementation(project(":client-base")) @@ -61,17 +61,17 @@ dependencies { implementation(project(":client-misk-hibernate")) implementation(project(":service")) - testImplementation(Dependencies.miskTesting) - testImplementation(Dependencies.miskHibernateTesting) - testImplementation(Dependencies.junitApi) - testImplementation(Dependencies.junitParams) - testImplementation(Dependencies.junitEngine) - testImplementation(Dependencies.kotlinTest) - testImplementation(Dependencies.kotlinxCoroutinesTest) - testImplementation(Dependencies.assertj) - testImplementation(Dependencies.openTracingMock) - testImplementation(Dependencies.logbackClassic) - testImplementation(Dependencies.slf4jApi) + testImplementation(libs.miskTesting) + testImplementation(libs.miskHibernateTesting) + testImplementation(libs.junitApi) + testImplementation(libs.junitParams) + testImplementation(libs.junitEngine) + testImplementation(libs.kotlinTest) + testImplementation(libs.kotlinxCoroutinesTest) + testImplementation(libs.assertj) + testImplementation(libs.openTracingMock) + testImplementation(libs.logbackClassic) + testImplementation(libs.slf4jApi) testImplementation(project(":backfila-embedded")) } diff --git a/service/build.gradle.kts b/service/build.gradle.kts index e9d1c617b..423c6c476 100644 --- a/service/build.gradle.kts +++ b/service/build.gradle.kts @@ -23,71 +23,71 @@ sourceSets { } dependencies { - implementation(Dependencies.apacheCommonsLang3) - implementation(Dependencies.guava) - implementation(Dependencies.guice) - implementation(Dependencies.jacksonDatabind) - implementation(Dependencies.jacksonDataformatYaml) - implementation(Dependencies.jacksonJsr310) - implementation(Dependencies.jacksonKotlin) - implementation(Dependencies.jCommander) - implementation(Dependencies.jettyServer) - implementation(Dependencies.jettyServlet) - implementation(Dependencies.jettyWebsocketServlet) - implementation(Dependencies.jettyWebsocketServer) - implementation(Dependencies.kotlinStdLib) - implementation(Dependencies.kotlinReflection) - implementation(Dependencies.kotlinxCoroutines) - implementation(Dependencies.kotlinxCoroutinesLogging) - implementation(Dependencies.loggingApi) - implementation(Dependencies.metricsCore) - implementation(Dependencies.metricsParent) - implementation(Dependencies.misk) - implementation(Dependencies.miskActions) - implementation(Dependencies.miskAdmin) - implementation(Dependencies.miskCore) - implementation(Dependencies.miskHibernate) - implementation(Dependencies.miskHotwire) - implementation(Dependencies.miskInject) - implementation(Dependencies.miskJdbc) - implementation(Dependencies.miskMetrics) - implementation(Dependencies.miskService) - implementation(Dependencies.miskSlack) - implementation(Dependencies.miskTailwind) - implementation(Dependencies.moshiCore) - implementation(Dependencies.moshiKotlin) - implementation(Dependencies.okHttp) - implementation(Dependencies.okio) - implementation(Dependencies.openTracing) - implementation(Dependencies.openTracingOkHttp) - implementation(Dependencies.retrofit) - implementation(Dependencies.retrofitGuavaAdapter) - implementation(Dependencies.retrofitWire) - implementation(Dependencies.tracingJaeger) - implementation(Dependencies.wireRuntime) - implementation(Dependencies.wireCompiler) - implementation(Dependencies.wireSchema) - implementation(Dependencies.wispClient) - implementation(Dependencies.wispConfig) - implementation(Dependencies.wispDeployment) - implementation(Dependencies.wispLogging) + implementation(libs.apacheCommonsLang3) + implementation(libs.guava) + implementation(libs.guice) + implementation(libs.jacksonDatabind) + implementation(libs.jacksonDataformatYaml) + implementation(libs.jacksonJsr310) + implementation(libs.jacksonKotlin) + implementation(libs.jCommander) + implementation(libs.jettyServer) + implementation(libs.jettyServlet) + implementation(libs.jettyWebsocketServlet) + implementation(libs.jettyWebsocketServer) + implementation(libs.kotlinStdLib) + implementation(libs.kotlinReflection) + implementation(libs.kotlinxCoroutines) + implementation(libs.kotlinxCoroutinesLogging) + implementation(libs.loggingApi) + implementation(libs.metricsCore) + implementation(libs.metricsParent) + implementation(libs.misk) + implementation(libs.miskActions) + implementation(libs.miskAdmin) + implementation(libs.miskCore) + implementation(libs.miskHibernate) + implementation(libs.miskHotwire) + implementation(libs.miskInject) + implementation(libs.miskJdbc) + implementation(libs.miskMetrics) + implementation(libs.miskService) + implementation(libs.miskSlack) + implementation(libs.miskTailwind) + implementation(libs.moshiCore) + implementation(libs.moshiKotlin) + implementation(libs.okHttp) + implementation(libs.okio) + implementation(libs.openTracing) + implementation(libs.openTracingOkHttp) + implementation(libs.retrofit) + implementation(libs.retrofitGuavaAdapter) + implementation(libs.retrofitWire) + implementation(libs.tracingJaeger) + implementation(libs.wireRuntime) + implementation(libs.wireCompiler) + implementation(libs.wireSchema) + implementation(libs.wispClient) + implementation(libs.wispConfig) + implementation(libs.wispDeployment) + implementation(libs.wispLogging) implementation(project(":client")) - testImplementation(Dependencies.miskTesting) - testImplementation(Dependencies.miskHibernateTesting) - testImplementation(Dependencies.junitApi) - testImplementation(Dependencies.junitParams) - testImplementation(Dependencies.junitEngine) - testImplementation(Dependencies.kotlinTest) - testImplementation(Dependencies.kotlinxCoroutinesTest) - testImplementation(Dependencies.assertj) - testImplementation(Dependencies.openTracingMock) - testImplementation(Dependencies.okHttpMockWebServer) - testImplementation(Dependencies.logbackClassic) - testImplementation(Dependencies.slf4jApi) + testImplementation(libs.miskTesting) + testImplementation(libs.miskHibernateTesting) + testImplementation(libs.junitApi) + testImplementation(libs.junitParams) + testImplementation(libs.junitEngine) + testImplementation(libs.kotlinTest) + testImplementation(libs.kotlinxCoroutinesTest) + testImplementation(libs.assertj) + testImplementation(libs.openTracingMock) + testImplementation(libs.okHttpMockWebServer) + testImplementation(libs.logbackClassic) + testImplementation(libs.slf4jApi) - // Dependencies for fake development services + // Dependencies for fake development services ONLY. testImplementation(project(":client-base")) testImplementation(project(":client-misk")) testImplementation(project(":client-static"))