Migrate to libs.versions.toml, upgrade dependencies

adrw · Jan 13, 2024 · 6d83993 · 6d83993
1 parent 018440a
commit 6d83993
Show file tree

Hide file tree

Showing 15 changed files with 260 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