Skip to content

Commit

Permalink
Migrate to libs.versions.toml (#367)
Browse files Browse the repository at this point in the history
Co-authored-by: Michael Pawliszyn <[email protected]>
  • Loading branch information
adrw and mpawliszyn authored Jan 15, 2024
1 parent 8902361 commit e75454a
Show file tree
Hide file tree
Showing 21 changed files with 422 additions and 445 deletions.
20 changes: 10 additions & 10 deletions backfila-embedded/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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<MavenPublishBaseExtension> {
Expand Down
16 changes: 8 additions & 8 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}

Expand Down Expand Up @@ -56,7 +56,7 @@ subprojects {
configure<SpotlessExtension> {
kotlin {
target("**/*.kt")
ktlint(Versions.ktlint).editorConfigOverride(
ktlint(libs.versions.ktlint.get()).editorConfigOverride(
mapOf(
"indent_size" to "2",
"continuation_indent_size" to "4",
Expand Down
7 changes: 0 additions & 7 deletions buildSrc/build.gradle.kts

This file was deleted.

5 changes: 0 additions & 5 deletions buildSrc/settings.gradle.kts

This file was deleted.

94 changes: 0 additions & 94 deletions buildSrc/src/main/kotlin/Dependencies.kt

This file was deleted.

40 changes: 20 additions & 20 deletions client-base/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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?
Expand Down
52 changes: 26 additions & 26 deletions client-dynamodb-v2/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand All @@ -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") {
Expand Down
46 changes: 23 additions & 23 deletions client-dynamodb/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand All @@ -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") {
Expand Down
Loading

0 comments on commit e75454a

Please sign in to comment.