Migrate to libs.versions.toml, upgrade dependencies (#17)

adrw · Jan 13, 2024 · 3678b6f · 3678b6f
1 parent 018440a
commit 3678b6f
Show file tree

Hide file tree

Showing 15 changed files with 102 additions and 181 deletions.
diff --git a/armeria/dashboard-search-table/build.gradle.kts b/armeria/dashboard-search-table/build.gradle.kts
@@ -1,6 +1,4 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-import hotwire_kt.Dependencies
-
 plugins {
   id("org.jetbrains.kotlin.jvm")
   id("com.github.johnrengelman.shadow")
@@ -19,13 +17,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")
 }
 

diff --git a/armeria/full-spec/build.gradle.kts b/armeria/full-spec/build.gradle.kts
@@ -1,6 +1,4 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-import hotwire_kt.Dependencies
-
 plugins {
   id("org.jetbrains.kotlin.jvm")
   id("com.github.johnrengelman.shadow")
@@ -19,12 +17,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")
 }
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -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(libs.kotlinAllOpenPlugin)
+    classpath(libs.kotlinGradlePlugin)
+    classpath(libs.junitGradlePlugin)
+    classpath(libs.shadowJarPlugin)
+    classpath(libs.sqldelightGradle)
+    classpath(libs.wireGradlePlugin)
   }
 }
 

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts
diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -0,0 +1,42 @@
+[versions]
+
+misk = "2023.12.01.175902-d977e5a"
+kotlin = "1.9.20"
+moshi = "1.13.0"
+okio = "3.6.0"
+sqldelight = "2.0.1"
+wire = "4.9.3"
+
+[libraries]
+armeriaBom = { module = "com.linecorp.armeria:armeria-bom", version = "1.11.0" }
+junitApi = { module = "org.junit.jupiter:junit-jupiter-api", version = "5.9.1" }
+junitEngine = { module = "org.junit.jupiter:junit-jupiter-engine", version = "5.9.1" }
+junitGradlePlugin = { module = "org.junit.platform:junit-platform-gradle-plugin", version = "1.2.0" }
+kotlinAllOpenPlugin = { module = "org.jetbrains.kotlin:kotlin-allopen", version.ref = "kotlin" }
+kotlinGradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
+kotlinTest = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
+kotlinxHtml = { module = "org.jetbrains.kotlinx:kotlinx-html-jvm", version = "0.8.1" }
+logbackClassic = { module = "ch.qos.logback:logback-classic", version = "1.4.14" }
+misk = { module = "com.squareup.misk:misk", version.ref = "misk" }
+miskActions = { module = "com.squareup.misk:misk-actions", version.ref = "misk" }
+miskAdmin = { module = "com.squareup.misk:misk-admin", version.ref = "misk" }
+miskCore = { module = "com.squareup.misk:misk-core", version.ref = "misk" }
+miskFeature = { module = "com.squareup.misk:misk-feature", version.ref = "misk" }
+miskInject = { module = "com.squareup.misk:misk-inject", version.ref = "misk" }
+miskJdbc = { module = "com.squareup.misk:misk-jdbc", version.ref = "misk" }
+miskService = { module = "com.squareup.misk:misk-service", version.ref = "misk" }
+miskTesting = { module = "com.squareup.misk:misk-testing", version.ref = "misk" }
+moshiCore = { module = "com.squareup.moshi:moshi", version.ref = "moshi" }
+moshiKotlin = { module = "com.squareup.moshi:moshi-kotlin", version.ref = "moshi" }
+mustacheCompiler = { module = "com.github.spullara.mustache.java:compiler", version = "0.9.5" }
+okio = { module = "com.squareup.okio:okio", version.ref = "okio" }
+shadowJarPlugin = { module = "gradle.plugin.com.github.johnrengelman:shadow", version = "7.1.2" }
+sqldelightGradle = { module = "app.cash.sqldelight:app.cash.sqldelight.gradle.plugin", version.ref = "sqldelight" }
+sqldelightJdbc = { module = "org.xerial:sqlite-jdbc", version = "3.39.3.0" }
+sqldelightJdbcDriver = { module = "app.cash.sqldelight:jdbc-driver", version.ref = "sqldelight" }
+sqldelightMysqlDialect = { module = "app.cash.sqldelight:mysql-dialect", version.ref = "sqldelight" }
+wireGradlePlugin = { module = "com.squareup.wire:wire-gradle-plugin", version.ref = "wire" }
+wispConfig = { module = "app.cash.wisp:wisp-config", version.ref = "misk" }
+wispDeployment = { module = "app.cash.wisp:wisp-deployment", version.ref = "misk" }
+wispLogging = { module = "app.cash.wisp:wisp-logging", version.ref = "misk" }
+wispMoshi = { module = "app.cash.wisp:wisp-moshi", version.ref = "misk" }
diff --git a/hotwire-kt/kotlinx-html-templates/build.gradle.kts b/hotwire-kt/kotlinx-html-templates/build.gradle.kts
@@ -1,11 +1,9 @@
-import hotwire_kt.Dependencies
-
 plugins {
   id("org.jetbrains.kotlin.jvm")
   id("org.jetbrains.kotlin.plugin.allopen")
 }
 
 dependencies {
-  api(Dependencies.kotlinxHtml)
-  api(Dependencies.miskActions)
+  api(libs.kotlinxHtml)
+  api(libs.miskActions)
 }
diff --git a/hotwire-kt/tailwinds-ui/build.gradle.kts b/hotwire-kt/tailwinds-ui/build.gradle.kts
@@ -1,11 +1,9 @@
-import hotwire_kt.Dependencies
-
 plugins {
   id("org.jetbrains.kotlin.jvm")
   id("org.jetbrains.kotlin.plugin.allopen")
 }
 
 dependencies {
   api(projects.hotwireKt.kotlinxHtmlTemplates)
-  implementation(Dependencies.kotlinxHtml)
+  implementation(libs.kotlinxHtml)
 }
diff --git a/misk-db/feature-sample/build.gradle.kts b/misk-db/feature-sample/build.gradle.kts
@@ -1,5 +1,3 @@
-import hotwire_kt.Dependencies
-
 plugins {
   id("app.cash.sqldelight")
   id("com.squareup.wire")
@@ -15,18 +13,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 {
@@ -50,9 +48,9 @@ wire {
 sqldelight {
   databases {
     create("FlagpoleDatabase") {
-      dialect(Dependencies.sqldelightMysqlDialect)
+      dialect(libs.sqldelightMysqlDialect)
       packageName.set("misk.db.flagpole.db")
-      sourceFolders.set(listOf("sqldelight", "resources/db-migrations"))
+      srcDirs(listOf("src/main/sqldelight", "src/main/resources/db-migrations"))
       deriveSchemaFromMigrations.set(true)
       migrationOutputDirectory.set(file("$buildDir/resources/main/db-migrations"))
     }

diff --git a/misk-db/feature-sample/src/main/kotlin/misk/db/flagpole/FlagpoleService.kt b/misk-db/feature-sample/src/main/kotlin/misk/db/flagpole/FlagpoleService.kt
@@ -22,7 +22,7 @@ private const val SERVICE_NAME = "flagpole"
 
 fun main(args: Array<String>) {
   val deployment = DEVELOPMENT
-//  FlagpoleLogging.configure()
+  FlagpoleLogging.configure()
   val config = MiskConfig.load<FlagpoleConfig>(SERVICE_NAME, deployment)
   MiskApplication(
     MiskRealServiceModule(),

diff --git a/.../feature-sample/src/main/kotlin/misk/db/flagpole/persistence/FlagpolePersistenceModule.kt b/.../feature-sample/src/main/kotlin/misk/db/flagpole/persistence/FlagpolePersistenceModule.kt
@@ -43,13 +43,13 @@ class FlagpolePersistenceModule(
         return connection
       }
 
-      override fun notifyListeners(queryKeys: Array<String>) {
+      override fun notifyListeners(vararg queryKeys: String) {
       }
 
-      override fun removeListener(listener: Query.Listener, queryKeys: Array<String>) {
+      override fun removeListener(vararg queryKeys: String, listener: Query.Listener) {
       }
 
-      override fun addListener(listener: Query.Listener, queryKeys: Array<String>) {
+      override fun addListener(vararg queryKeys: String, listener: Query.Listener) {
       }
 
       override fun closeConnection(connection: Connection) {

diff --git a/misk-db/feature/build.gradle.kts b/misk-db/feature/build.gradle.kts
@@ -1,5 +1,3 @@
-import hotwire_kt.Dependencies
-
 plugins {
   `java-library`
   id("app.cash.sqldelight")
@@ -8,20 +6,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)
@@ -30,14 +28,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 {
@@ -74,9 +72,9 @@ wire {
 sqldelight {
   databases {
     create("FeatureDatabase") {
-      dialect(Dependencies.sqldelightMysqlDialect)
+      dialect(libs.sqldelightMysqlDialect)
       packageName.set("misk.db")
-      sourceFolders.set(listOf("sqldelight", "sqldelight-migrations"))
+      srcDirs(listOf("src/main/sqldelight", "src/main/sqldelight-migrations"))
       deriveSchemaFromMigrations.set(true)
     }
   }