Migrate to version catalog (#167)

hfhbd · web-flow · commit 34af41f80289 · 2023-05-08T09:05:57.000Z
Co-authored-by: hfhbd &lt;hfhbd@users.noreply.github.com&gt;
diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts
@@ -3,13 +3,13 @@ plugins {
 }
 
 dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.21")
-    implementation("com.alecstrong:grammar-kit-composer:0.1.12")
-    implementation("io.github.gradle-nexus:publish-plugin:1.1.0")
-    implementation("org.jetbrains.kotlinx:binary-compatibility-validator:0.13.1")
-    implementation("app.cash.sqldelight:gradle-plugin:2.0.0-alpha05")
-    implementation("app.cash.licensee:licensee-gradle-plugin:1.6.0")
-    implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.8.10")
+    implementation(libs.kotlin.gradlePlugin)
+    implementation(libs.grammarKit.gradlePlugin)
+    implementation(libs.publish.gradlePlugin)
+    implementation(libs.binary.gradlePlugin)
+    implementation(libs.sqldelight.gradlePlugin)
+    implementation(libs.licensee.gradlePlugin)
+    implementation(libs.dokka.gradlePlugin)
 }
 
 kotlin.jvmToolchain(17)
diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts
@@ -4,6 +4,9 @@ dependencyResolutionManagement {
         mavenCentral()
         gradlePluginPortal()
     }
+    versionCatalogs.register("libs") {
+        from(files("../gradle/libs.versions.toml"))
+    }
 }
 
 rootProject.name = "build-logic"
diff --git a/build-logic/src/main/kotlin/publish.gradle.kts b/build-logic/src/main/kotlin/publish.gradle.kts
@@ -4,8 +4,8 @@ import org.gradle.kotlin.dsl.*
 import java.util.*
 
 plugins {
-    `maven-publish`
-    signing
+    id("maven-publish")
+    id("signing")
 }
 
 val emptyJar by tasks.registering(Jar::class) { }
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
-    io.github.`gradle-nexus`.`publish-plugin`
-    org.jetbrains.dokka
+    id("io.github.gradle-nexus.publish-plugin")
+    id("org.jetbrains.dokka")
 }
 
 tasks.dokkaHtmlMultiModule {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -0,0 +1,24 @@
+[versions]
+sqldelight = "2.0.0-alpha05"
+idea = "222.4459.24"
+coroutines = "1.6.4"
+
+[libraries]
+kotlin-gradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version = "1.8.21" }
+grammarKit-gradlePlugin = { module = "com.alecstrong:grammar-kit-composer", version = "0.1.12" }
+publish-gradlePlugin = { module = "io.github.gradle-nexus:publish-plugin", version = "1.1.0" }
+binary-gradlePlugin = { module = "org.jetbrains.kotlinx:binary-compatibility-validator", version = "0.13.1" }
+sqldelight-gradlePlugin = { module = "app.cash.sqldelight:gradle-plugin", version.ref = "sqldelight" }
+licensee-gradlePlugin = { module = "app.cash.licensee:licensee-gradle-plugin", version = "1.6.0" }
+dokka-gradlePlugin = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version = "1.8.10" }
+
+sqldelight-runtime = { module = "app.cash.sqldelight:runtime", version.ref = "sqldelight" }
+sqldelight-postgresql-dialect = { module = "app.cash.sqldelight:postgresql-dialect", version.ref = "sqldelight" }
+sqldelight-dialect-api = { module = "app.cash.sqldelight:dialect-api", version.ref = "sqldelight" }
+sqldelight-coroutines = { module = "app.cash.sqldelight:coroutines-extensions", version.ref = "sqldelight" }
+intellij-analysis = { module = "com.jetbrains.intellij.platform:analysis-impl", version.ref = "idea" }
+coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
+coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
+ktor-network = { module = "io.ktor:ktor-network", version = "2.3.0" }
+datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version = "0.4.0" }
+uuid = { module = "app.softwork:kotlinx-uuid-core", version = "0.0.18" }
diff --git a/postgres-native-sqldelight-dialect/build.gradle.kts b/postgres-native-sqldelight-dialect/build.gradle.kts
@@ -1,33 +1,31 @@
 plugins {
     kotlin("jvm")
-    com.alecstrong.grammar.kit.composer
-    org.jetbrains.kotlinx.`binary-compatibility-validator`
-    app.cash.licensee
-    repos
-    publish
-    exclude
+    id("com.alecstrong.grammar.kit.composer")
+    id("org.jetbrains.kotlinx.binary-compatibility-validator")
+    id("app.cash.licensee")
+    id("repos")
+    id("publish")
+    id("exclude")
 }
 
 java {
     withJavadocJar()
     withSourcesJar()
 }
 
-val idea = "222.4459.24"
-
 grammarKit {
-    intellijRelease.set(idea)
+    intellijRelease.set(libs.versions.idea)
 }
 
 dependencies {
-    api("app.cash.sqldelight:postgresql-dialect:2.0.0-alpha05")
+    api(libs.sqldelight.postgresql.dialect)
 
-    api("app.cash.sqldelight:dialect-api:2.0.0-alpha05")
+    api(libs.sqldelight.dialect.api)
 
-    compileOnly("com.jetbrains.intellij.platform:analysis-impl:$idea")
+    compileOnly(libs.intellij.analysis)
 
-    testImplementation("com.jetbrains.intellij.platform:analysis-impl:$idea")
     testImplementation(kotlin("test"))
+    testImplementation(libs.intellij.analysis)
 }
 
 kotlin {
diff --git a/postgres-native-sqldelight-driver/build.gradle.kts b/postgres-native-sqldelight-driver/build.gradle.kts
@@ -2,10 +2,10 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.*
 
 plugins {
     kotlin("multiplatform")
-    app.cash.licensee
-    repos
-    publish
-    org.jetbrains.dokka
+    id("app.cash.licensee")
+    id("repos")
+    id("publish")
+    id("org.jetbrains.dokka")
 }
 
 kotlin {
@@ -34,11 +34,11 @@ kotlin {
     sourceSets {
         commonMain {
             dependencies {
-                implementation("io.ktor:ktor-network:2.3.0")
-                api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
-                api("app.cash.sqldelight:runtime:2.0.0-alpha05")
-                api("org.jetbrains.kotlinx:kotlinx-datetime:0.4.0")
-                api("app.softwork:kotlinx-uuid-core:0.0.18")
+                implementation(libs.ktor.network)
+                api(libs.coroutines.core)
+                api(libs.sqldelight.runtime)
+                api(libs.datetime)
+                api(libs.uuid)
             }
         }
         commonTest {
diff --git a/testing-sqldelight/build.gradle.kts b/testing-sqldelight/build.gradle.kts
@@ -2,8 +2,8 @@ import org.jetbrains.kotlin.konan.target.*
 
 plugins {
     kotlin("multiplatform")
-    app.cash.sqldelight
-    repos
+    id("app.cash.sqldelight")
+    id("repos")
 }
 
 kotlin {
@@ -19,13 +19,13 @@ kotlin {
         commonMain {
             dependencies {
                 implementation(projects.postgresNativeSqldelightDriver)
-                implementation("app.cash.sqldelight:coroutines-extensions:2.0.0-alpha05")
+                implementation(libs.sqldelight.coroutines)
             }
         }
         commonTest {
             dependencies {
                 implementation(kotlin("test"))
-                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4")
+                implementation(libs.coroutines.test)
             }
         }
     }
diff --git a/testing/build.gradle.kts b/testing/build.gradle.kts
@@ -2,11 +2,10 @@ import org.jetbrains.kotlin.konan.target.*
 
 plugins {
     kotlin("multiplatform")
-    repos
+    id("repos")
 }
 
 kotlin {
-
     when (HostManager.host) {
         KonanTarget.LINUX_X64 -> linuxX64()
         KonanTarget.MACOS_ARM64 -> macosArm64()
@@ -19,7 +18,7 @@ kotlin {
             dependencies {
                 implementation(projects.postgresNativeSqldelightDriver)
                 implementation(kotlin("test"))
-                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4")
+                implementation(libs.coroutines.test)
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,9 @@ dependencyResolutionManagement {`
`4`	`4`	`mavenCentral()`
`5`	`5`	`gradlePluginPortal()`
`6`	`6`	`}`
	`7`	`+ versionCatalogs.register("libs") {`
	`8`	`+ from(files("../gradle/libs.versions.toml"))`
	`9`	`+ }`
`7`	`10`	`}`
`8`	`11`
`9`	`12`	`rootProject.name = "build-logic"`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@ import org.gradle.kotlin.dsl.*`
`4`	`4`	`import java.util.*`
`5`	`5`
`6`	`6`	`plugins {`
`7`		- `maven-publish`
`8`		`- signing`
	`7`	`+ id("maven-publish")`
	`8`	`+ id("signing")`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`val emptyJar by tasks.registering(Jar::class) { }`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`plugins {`
`2`		- io.github.`gradle-nexus`.`publish-plugin`
`3`		`- org.jetbrains.dokka`
	`2`	`+ id("io.github.gradle-nexus.publish-plugin")`
	`3`	`+ id("org.jetbrains.dokka")`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`tasks.dokkaHtmlMultiModule {`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@ import org.jetbrains.kotlin.konan.target.*`
`2`	`2`
`3`	`3`	`plugins {`
`4`	`4`	`kotlin("multiplatform")`
`5`		`- app.cash.sqldelight`
`6`		`- repos`
	`5`	`+ id("app.cash.sqldelight")`
	`6`	`+ id("repos")`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`kotlin {`
`@@ -19,13 +19,13 @@ kotlin {`
`19`	`19`	`commonMain {`
`20`	`20`	`dependencies {`
`21`	`21`	`implementation(projects.postgresNativeSqldelightDriver)`
`22`		`- implementation("app.cash.sqldelight:coroutines-extensions:2.0.0-alpha05")`
	`22`	`+ implementation(libs.sqldelight.coroutines)`
`23`	`23`	`}`
`24`	`24`	`}`
`25`	`25`	`commonTest {`
`26`	`26`	`dependencies {`
`27`	`27`	`implementation(kotlin("test"))`
`28`		`- implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4")`
	`28`	`+ implementation(libs.coroutines.test)`
`29`	`29`	`}`
`30`	`30`	`}`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,11 +2,10 @@ import org.jetbrains.kotlin.konan.target.*`
`2`	`2`
`3`	`3`	`plugins {`
`4`	`4`	`kotlin("multiplatform")`
`5`		`- repos`
	`5`	`+ id("repos")`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`kotlin {`
`9`		`-`
`10`	`9`	`when (HostManager.host) {`
`11`	`10`	`KonanTarget.LINUX_X64 -> linuxX64()`
`12`	`11`	`KonanTarget.MACOS_ARM64 -> macosArm64()`
`@@ -19,7 +18,7 @@ kotlin {`
`19`	`18`	`dependencies {`
`20`	`19`	`implementation(projects.postgresNativeSqldelightDriver)`
`21`	`20`	`implementation(kotlin("test"))`
`22`		`- implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4")`
	`21`	`+ implementation(libs.coroutines.test)`
`23`	`22`	`}`
`24`	`23`	`}`
`25`	`24`	`}`