Skip to content

Commit

Permalink
Migrate to libs.versions.toml
Browse files Browse the repository at this point in the history
  • Loading branch information
adrw committed Jan 13, 2024
1 parent 018440a commit 5ec123f
Show file tree
Hide file tree
Showing 13 changed files with 150 additions and 160 deletions.
12 changes: 6 additions & 6 deletions armeria/dashboard-search-table/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ dependencies {
implementation(projects.hotwireKt.kotlinxHtmlTemplates)
implementation(projects.hotwireKt.tailwindsUi)

implementation(Dependencies.kotlinxHtml)
implementation(Dependencies.okio)
implementation(Dependencies.moshiCore)
implementation(Dependencies.moshiKotlin)
implementation(Dependencies.wispLogging)
implementation(libs.kotlinxHtml)
implementation(libs.okio)
implementation(libs.moshiCore)
implementation(libs.moshiKotlin)
implementation(libs.wispLogging)

implementation(platform(Dependencies.armeriaBom))
implementation(platform(libs.armeriaBom))
implementation("com.linecorp.armeria:armeria-grpc")
}

Expand Down
10 changes: 5 additions & 5 deletions armeria/full-spec/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ dependencies {
implementation(projects.hotwireKt.kotlinxHtmlTemplates)
implementation(projects.hotwireKt.tailwindsUi)

implementation(Dependencies.mustacheCompiler)
implementation(Dependencies.kotlinxHtml)
implementation(Dependencies.okio)
implementation(Dependencies.wispLogging)
implementation(libs.mustacheCompiler)
implementation(libs.kotlinxHtml)
implementation(libs.okio)
implementation(libs.wispLogging)

implementation(platform(Dependencies.armeriaBom))
implementation(platform(libs.armeriaBom))
implementation("com.linecorp.armeria:armeria-grpc")
}

Expand Down
12 changes: 6 additions & 6 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ buildscript {
}

dependencies {
classpath(hotwire_kt.Dependencies.kotlinAllOpenPlugin)
classpath(hotwire_kt.Dependencies.kotlinGradlePlugin)
classpath(hotwire_kt.Dependencies.junitGradlePlugin)
classpath(hotwire_kt.Dependencies.shadowJarPlugin)
classpath(hotwire_kt.Dependencies.sqldelightGradle)
classpath(hotwire_kt.Dependencies.wireGradlePlugin)
classpath(hotwire_kt.libs.kotlinAllOpenPlugin)
classpath(hotwire_kt.libs.kotlinGradlePlugin)
classpath(hotwire_kt.libs.junitGradlePlugin)
classpath(hotwire_kt.libs.shadowJarPlugin)
classpath(hotwire_kt.libs.sqldelightGradle)
classpath(hotwire_kt.libs.wireGradlePlugin)
}
}

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.

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

This file was deleted.

9 changes: 0 additions & 9 deletions buildSrc/src/main/kotlin/Versions.kt

This file was deleted.

87 changes: 87 additions & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
[versions]

[libraries]
armeriaBom = { module = "com.linecorp.armeria:armeria-bom", version = "1.11.0" }
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" }
junitParams = { module = "org.junit.jupiter:junit-jupiter-params", version = "5.6.0" }
kotestJunitRunnerJvm = { module = "io.kotest:kotest-runner-junit5-jvm", version = "4.6.2" }
kotlinAllOpenPlugin = { module = "org.jetbrains.kotlin:kotlin-allopen:${Versions.kotlin}" }
kotlinGradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}" }
kotlinReflection = { module = "org.jetbrains.kotlin:kotlin-reflect:${Versions.kotlin}" }
kotlinStdLibJdk8 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${Versions.kotlin}" }
kotlinTest = { module = "org.jetbrains.kotlin:kotlin-test:${Versions.kotlin}" }
kotlinxHtml = { module = "org.jetbrains.kotlinx:kotlinx-html-jvm", version = "0.6.4" }
logbackClassic = { module = "ch.qos.logback:logback-classic", version = "1.2.5" }
misk = { module = "com.squareup.misk:misk:${Versions.misk}" }
miskActions = { module = "com.squareup.misk:misk-actions:${Versions.misk}" }
miskAdmin = { module = "com.squareup.misk:misk-admin:${Versions.misk}" }
miskAws = { module = "com.squareup.misk:misk-aws:${Versions.misk}" }
miskAws2Dynamodb = { module = "com.squareup.misk:misk-aws2-dynamodb:${Versions.misk}" }
miskAwsDynamodb = { module = "com.squareup.misk:misk-aws-dynamodb:${Versions.misk}" }
miskCore = { module = "com.squareup.misk:misk-core:${Versions.misk}" }
miskCrypto = { module = "com.squareup.misk:misk-crypto:${Versions.misk}" }
miskDatadog = { module = "com.squareup.misk:misk-datadog:${Versions.misk}" }
miskFeature = { module = "com.squareup.misk:misk-feature:${Versions.misk}" }
miskFeatureTesting = { module = "com.squareup.misk:misk-feature-testing:${Versions.misk}" }
miskGrpcReflect = { module = "com.squareup.misk:misk-grpc-reflect:${Versions.misk}" }
miskHibernate = { module = "com.squareup.misk:misk-hibernate:${Versions.misk}" }
miskHibernateTesting = { module = "com.squareup.misk:misk-hibernate-testing:${Versions.misk}" }
miskInject = { module = "com.squareup.misk:misk-inject:${Versions.misk}" }
miskJdbc = { module = "com.squareup.misk:misk-jdbc:${Versions.misk}" }
miskJdbcTesting = { module = "com.squareup.misk:misk-jdbc-testing:${Versions.misk}" }
miskJobqueue = { module = "com.squareup.misk:misk-jobqueue:${Versions.misk}" }
miskJobqueueTesting = { module = "com.squareup.misk:misk-jobqueue-testing:${Versions.misk}" }
miskLaunchdarkly = { module = "com.squareup.misk:misk-launchdarkly:${Versions.misk}" }
miskMetrics = { module = "com.squareup.misk:misk-metrics:${Versions.misk}" }
miskPrometheus = { module = "com.squareup.misk:misk-prometheus:${Versions.misk}" }
miskService = { module = "com.squareup.misk:misk-service:${Versions.misk}" }
miskSlack = { module = "com.squareup.misk:misk-slack:${Versions.misk}" }
miskTesting = { module = "com.squareup.misk:misk-testing:${Versions.misk}" }
miskTransactionalJobqueue = { module = "com.squareup.misk:misk-transactional-jobqueue:${Versions.misk}" }
miskZookeeper = { module = "com.squareup.misk:misk-zookeeper:${Versions.misk}" }
miskZookeeperTesting = { module = "com.squareup.misk:misk-zookeeper-testing:${Versions.misk}" }
mockk = { module = "io.mockk:mockk", version = "1.12.0" }
moshiAdapters = { module = "com.squareup.moshi:moshi-adapters:${Versions.moshi}" }
moshiCore = { module = "com.squareup.moshi:moshi:${Versions.moshi}" }
moshiKotlin = { module = "com.squareup.moshi:moshi-kotlin:${Versions.moshi}" }
mustacheCompiler = { module = "com.github.spullara.mustache.java:compiler", version = "0.9.5" }
okio = { module = "com.squareup.okio:okio", version = "3.0.0" }
shadowJarPlugin = { module = "gradle.plugin.com.github.johnrengelman:shadow", version = "7.1.2" }
sqldelightDriverAndroid = { module = "app.cash.sqldelight:android-driver:${Versions.sqldelight}" }
sqldelightDriverJvm = { module = "app.cash.sqldelight:sqlite-driver:${Versions.sqldelight}" }
sqldelightDriverNative = { module = "app.cash.sqldelight:native-driver:${Versions.sqldelight}" }
sqldelightGradle = { module = "app.cash.sqldelight:app.cash.sqldelight.gradle.plugin:${Versions.sqldelight}" }
sqldelightJdbc = { module = "org.xerial:sqlite-jdbc", version = "3.39.3.0" }
sqldelightJdbcDriver = { module = "app.cash.sqldelight:jdbc-driver:${Versions.sqldelight}" }
sqldelightMysqlDialect = { module = "app.cash.sqldelight:mysql-dialect:${Versions.sqldelight}" }
sqldelightPrimitiveAdapters = { module = "app.cash.sqldelight:primitive-adapters:${Versions.sqldelight}" }
wireCompiler = { module = "com.squareup.wire:wire-compiler:${Versions.wire}" }
wireGradlePlugin = { module = "com.squareup.wire:wire-gradle-plugin:${Versions.wire}" }
wireGrpcClient = { module = "com.squareup.wire:wire-grpc-client:${Versions.wire}" }
wireMoshiAdapter = { module = "com.squareup.wire:wire-moshi-adapter:${Versions.wire}" }
wireRuntime = { module = "com.squareup.wire:wire-runtime:${Versions.wire}" }
wireSchema = { module = "com.squareup.wire:wire-schema:${Versions.wire}" }
wispAwsEnvironment = { module = "app.cash.wisp:wisp-aws-environment:${Versions.misk}" }
wispClient = { module = "app.cash.wisp:wisp-client:${Versions.misk}" }
wispConfig = { module = "app.cash.wisp:wisp-config:${Versions.misk}" }
wispContainersTesting = { module = "app.cash.wisp:wisp-containers-testing:${Versions.misk}" }
wispDeployment = { module = "app.cash.wisp:wisp-deployment:${Versions.misk}" }
wispDeploymentTesting = { module = "app.cash.wisp:wisp-deployment-testing:${Versions.misk}" }
wispFeature = { module = "app.cash.wisp:wisp-feature:${Versions.misk}" }
wispFeatureTesting = { module = "app.cash.wisp:wisp-feature-testing:${Versions.misk}" }
wispLaunchDarkly = { module = "app.cash.wisp:wisp-launchdarkly:${Versions.misk}" }
wispLease = { module = "app.cash.wisp:wisp-lease:${Versions.misk}" }
wispLeaseTesting = { module = "app.cash.wisp:wisp-lease-testing:${Versions.misk}" }
wispLogging = { module = "app.cash.wisp:wisp-logging:${Versions.misk}" }
wispLoggingTesting = { module = "app.cash.wisp:wisp-logging-testing:${Versions.misk}" }
wispMoshi = { module = "app.cash.wisp:wisp-moshi:${Versions.misk}" }
wispResourceLoader = { module = "app.cash.wisp:wisp-resource-loader:${Versions.misk}" }
wispResourceLoaderTesting = { module = "app.cash.wisp:wisp-resource-loader-testing:${Versions.misk}" }
wispSsl = { module = "app.cash.wisp:wisp-ssl:${Versions.misk}" }
wispTask = { module = "app.cash.wisp:wisp-task:${Versions.misk}" }
wispTimeTesting = { module = "app.cash.wisp:wisp-time-testing:${Versions.misk}" }
wispToken = { module = "app.cash.wisp:wisp-token:${Versions.misk}" }
wispTokenTesting = { module = "app.cash.wisp:wisp-token-testing:${Versions.misk}" }
wispTracing = { module = "app.cash.wisp:wisp-tracing:${Versions.misk}" }
4 changes: 2 additions & 2 deletions hotwire-kt/kotlinx-html-templates/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ plugins {
}

dependencies {
api(Dependencies.kotlinxHtml)
api(Dependencies.miskActions)
api(libs.kotlinxHtml)
api(libs.miskActions)
}
2 changes: 1 addition & 1 deletion hotwire-kt/tailwinds-ui/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ plugins {

dependencies {
api(projects.hotwireKt.kotlinxHtmlTemplates)
implementation(Dependencies.kotlinxHtml)
implementation(libs.kotlinxHtml)
}
12 changes: 12 additions & 0 deletions migrate.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#!/usr/bin/env bash

mkdir -p gradle
rm -f gradle/libs.versions.toml
echo "[versions"] >> gradle/libs.versions.toml
cat buildSrc/src/main/kotlin/Dependencies.kt | grep 'Version = ' | sed -e 's/.* val //' -e 's/Version / /' >> gradle/libs.versions.toml
echo "" >> gradle/libs.versions.toml

echo "[libraries]" >> gradle/libs.versions.toml
cat buildSrc/src/main/kotlin/Dependencies.kt | grep -v 'Version = ' | awk '/ val / { print $2 " = { module = " $4 " }" }' | sed -e 's/:\([0-9]\)/", version = "\1/' >> gradle/libs.versions.toml
git rm -rf buildSrc/src/main/kotlin/Dependencies.kt
git ls-files | grep 'build.gradle.kts' | xargs sed -i "" -e 's/\([^A-Za-z0-9]\)Dependencies./\1libs./'
22 changes: 11 additions & 11 deletions misk-db/feature-sample/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,18 @@ application {
dependencies {
implementation(projects.miskDb.feature)

implementation(Dependencies.logbackClassic)
implementation(Dependencies.misk)
implementation(Dependencies.miskAdmin)
implementation(Dependencies.miskCore)
implementation(Dependencies.miskFeature)
implementation(Dependencies.miskInject)
implementation(Dependencies.wispConfig)
implementation(libs.logbackClassic)
implementation(libs.misk)
implementation(libs.miskAdmin)
implementation(libs.miskCore)
implementation(libs.miskFeature)
implementation(libs.miskInject)
implementation(libs.wispConfig)

// Database
implementation(Dependencies.miskJdbc)
implementation(Dependencies.sqldelightJdbc)
implementation(Dependencies.sqldelightJdbcDriver)
implementation(libs.miskJdbc)
implementation(libs.sqldelightJdbc)
implementation(libs.sqldelightJdbcDriver)
}

wire {
Expand All @@ -50,7 +50,7 @@ wire {
sqldelight {
databases {
create("FlagpoleDatabase") {
dialect(Dependencies.sqldelightMysqlDialect)
dialect(libs.sqldelightMysqlDialect)
packageName.set("misk.db.flagpole.db")
sourceFolders.set(listOf("sqldelight", "resources/db-migrations"))
deriveSchemaFromMigrations.set(true)
Expand Down
40 changes: 20 additions & 20 deletions misk-db/feature/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,20 @@ plugins {

dependencies {
// Basic Misk libraries
api(Dependencies.miskActions)
api(Dependencies.miskAdmin)
api(Dependencies.miskFeature)
api(Dependencies.miskInject)
api(Dependencies.wispDeployment)
api(Dependencies.wispLogging)
api(Dependencies.wispMoshi)
implementation(Dependencies.miskCore)
implementation(Dependencies.miskService)
api(libs.miskActions)
api(libs.miskAdmin)
api(libs.miskFeature)
api(libs.miskInject)
api(libs.wispDeployment)
api(libs.wispLogging)
api(libs.wispMoshi)
implementation(libs.miskCore)
implementation(libs.miskService)

// Database
implementation(Dependencies.miskJdbc)
implementation(Dependencies.sqldelightJdbc)
implementation(Dependencies.sqldelightJdbcDriver)
implementation(libs.miskJdbc)
implementation(libs.sqldelightJdbc)
implementation(libs.sqldelightJdbcDriver)

// ui
api(projects.hotwireKt.kotlinxHtmlTemplates)
Expand All @@ -30,14 +30,14 @@ dependencies {
// testing
testImplementation(projects.miskDb.featureSample)

testImplementation(Dependencies.junitApi)
testImplementation(Dependencies.kotlinTest)
testImplementation(Dependencies.misk)
testImplementation(Dependencies.miskAdmin)
testImplementation(testFixtures(Dependencies.miskJdbc))
testImplementation(Dependencies.miskTesting)
testImplementation(libs.junitApi)
testImplementation(libs.kotlinTest)
testImplementation(libs.misk)
testImplementation(libs.miskAdmin)
testImplementation(testFixtures(libs.miskJdbc))
testImplementation(libs.miskTesting)

testRuntimeOnly(Dependencies.junitEngine)
testRuntimeOnly(libs.junitEngine)
}

sourceSets {
Expand Down Expand Up @@ -74,7 +74,7 @@ wire {
sqldelight {
databases {
create("FeatureDatabase") {
dialect(Dependencies.sqldelightMysqlDialect)
dialect(libs.sqldelightMysqlDialect)
packageName.set("misk.db")
sourceFolders.set(listOf("sqldelight", "sqldelight-migrations"))
deriveSchemaFromMigrations.set(true)
Expand Down

0 comments on commit 5ec123f

Please sign in to comment.