[TAS-239] Replace Deps with Gradle dependency catalog

common/analytics-testfixtures/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("node-module-plugin")
+    alias(libs.plugins.thecodinglove.node.module)
 }
 
 group = "com.gchristov.thecodinglove.common"

common/analytics/build.gradle.kts

@@ -3,8 +3,8 @@ import com.gchristov.thecodinglove.gradleplugins.envSecret
 val packageId = "com.gchristov.thecodinglove.common.analytics"
 
 plugins {
-    id("node-module-plugin")
-    id("build-config-plugin")
+    alias(libs.plugins.thecodinglove.node.module)
+    alias(libs.plugins.thecodinglove.build.config)
 }
 
 group = "com.gchristov.thecodinglove.common"

common/build.gradle.kts

@@ -1,9 +1,3 @@
-allprojects {
-    repositories {
-        mavenCentral()
-    }
-}
-
 val taskNames = listOf("clean", "assemble", "jsTest", "kotlinUpgradeYarnLock")
 taskNames.forEach { taskName ->
     tasks.register("${taskName}All") {

common/firebase/build.gradle.kts

@@ -1,7 +1,5 @@
-import com.gchristov.thecodinglove.gradleplugins.Deps
-
 plugins {
-    id("node-module-plugin")
+    alias(libs.plugins.thecodinglove.node.module)
 }
 
 group = "com.gchristov.thecodinglove.common"
@@ -16,7 +14,8 @@ kotlin {
         }
         val jsMain by getting {
             dependencies {
-                implementation(npm(Deps.Google.firebaseAdmin.name, Deps.Google.firebaseAdmin.version))
+                implementation(npm(libs.npm.firebase.admin.get().name, libs.npm.firebase.admin.get().version!!))
+                implementation(npm(libs.npm.google.firestore.get().name, libs.npm.google.firestore.get().version!!))
             }
         }
     }

common/kotlin-js-store/yarn.lock

@@ -99,7 +99,7 @@
   dependencies:
     tslib "^2.1.0"
 
-"@google-cloud/firestore@^6.8.0":
+"@google-cloud/firestore@6.8.0", "@google-cloud/firestore@^6.8.0":
   version "6.8.0"
   resolved "https://registry.yarnpkg.com/@google-cloud/firestore/-/firestore-6.8.0.tgz#d8c852844c381afaf62592796606c10e178400b5"
   integrity sha512-JRpk06SmZXLGz0pNx1x7yU3YhkUXheKgH5hbDZ4kMsdhtfV5qPLJLRI4wv69K0cZorIk+zTMOwptue7hizo0eA==

common/kotlin/build.gradle.kts

@@ -1,7 +1,5 @@
-import com.gchristov.thecodinglove.gradleplugins.Deps
-
 plugins {
-    id("base-node-plugin")
+    alias(libs.plugins.thecodinglove.base.node)
 }
 
 group = "com.gchristov.thecodinglove.common"
@@ -11,15 +9,15 @@ kotlin {
     sourceSets {
         val commonMain by getting {
             dependencies {
-                api(Deps.Kodein.di)
-                api(Deps.Kermit.logger)
-                api(Deps.Kotlin.coroutinesCore)
-                api(Deps.Kotlin.dateTime)
-                api(Deps.Kotlin.serialization)
-                api(Deps.Uuid.uuid)
-                api(Deps.Arrow.core)
-                api(Deps.Crypto.mac)
-                api(Deps.Crypto.encoding)
+                api(libs.kodein)
+                api(libs.touchlab.kermit)
+                api(libs.kotlinx.coroutines.core)
+                api(libs.kotlinx.datetime)
+                api(libs.kotlinx.serialization.json)
+                api(libs.uuid)
+                api(libs.arrow.core)
+                api(libs.diglol.crypto)
+                api(libs.diglol.encoding)
             }
         }
     }

common/monitoring/build.gradle.kts

@@ -3,8 +3,8 @@ import com.gchristov.thecodinglove.gradleplugins.envSecret
 val packageId = "com.gchristov.thecodinglove.common.monitoring"
 
 plugins {
-    id("node-module-plugin")
-    id("build-config-plugin")
+    alias(libs.plugins.thecodinglove.node.module)
+    alias(libs.plugins.thecodinglove.build.config)
 }
 
 group = "com.gchristov.thecodinglove.common"

common/network-testfixtures/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("node-module-plugin")
+    alias(libs.plugins.thecodinglove.node.module)
 }
 
 group = "com.gchristov.thecodinglove.common"

common/network/build.gradle.kts

@@ -1,7 +1,5 @@
-import com.gchristov.thecodinglove.gradleplugins.Deps
-
 plugins {
-    id("node-module-plugin")
+    alias(libs.plugins.thecodinglove.node.module)
 }
 
 group = "com.gchristov.thecodinglove.common"
@@ -12,16 +10,16 @@ kotlin {
         val commonMain by getting {
             dependencies {
                 implementation(projects.kotlin)
-                api(Deps.Ktor.client)
-                implementation(Deps.Ktor.contentNegotiation)
-                implementation(Deps.Ktor.serialization)
-                implementation(Deps.Ktor.logging)
-                implementation(Deps.Ktor.logback)
+                api(libs.ktor.client.core)
+                implementation(libs.ktor.client.contentNegotiation)
+                implementation(libs.ktor.client.serializationJson)
+                implementation(libs.ktor.client.logging)
+                implementation(libs.logback)
             }
         }
         val jsMain by getting {
             dependencies {
-                implementation(npm(Deps.Node.express.name, Deps.Node.express.version))
+                implementation(npm(libs.npm.express.get().name, libs.npm.express.get().version!!))
             }
         }
     }

common/pubsub-testfixtures/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("node-module-plugin")
+    alias(libs.plugins.thecodinglove.node.module)
 }
 
 group = "com.gchristov.thecodinglove.common"

common/pubsub/build.gradle.kts

@@ -1,7 +1,5 @@
-import com.gchristov.thecodinglove.gradleplugins.Deps
-
 plugins {
-    id("node-module-plugin")
+    alias(libs.plugins.thecodinglove.node.module)
 }
 
 group = "com.gchristov.thecodinglove.common"
@@ -17,7 +15,7 @@ kotlin {
         }
         val jsMain by getting {
             dependencies {
-                implementation(npm(Deps.Google.pubSub.name, Deps.Google.pubSub.version))
+                implementation(npm(libs.npm.google.pubsub.get().name, libs.npm.google.pubsub.get().version!!))
             }
         }
     }

common/settings.gradle.kts

@@ -8,6 +8,25 @@ plugins {
     id("com.gradle.develocity") version("3.18.1")
 }
 
+dependencyResolutionManagement {
+    repositories {
+        gradlePluginPortal()
+    }
+    versionCatalogs {
+        create("libs") {
+            from(files("../gradle/libs.versions.toml"))
+        }
+    }
+}
+
+develocity {
+    buildScan {
+        termsOfUseUrl.set("https://gradle.com/help/legal-terms-of-use")
+        termsOfUseAgree.set("yes")
+        publishing.onlyIf { true }
+    }
+}
+
 rootProject.name = "common"
 
 include("analytics")
@@ -19,12 +38,4 @@ include("network")
 include("network-testfixtures")
 include("pubsub")
 include("pubsub-testfixtures")
-include("test")
-
-develocity {
-    buildScan {
-        termsOfUseUrl.set("https://gradle.com/help/legal-terms-of-use")
-        termsOfUseAgree.set("yes")
-        publishing.onlyIf { true }
-    }
-}
+include("test")

common/test/build.gradle.kts

@@ -1,7 +1,5 @@
-import com.gchristov.thecodinglove.gradleplugins.Deps
-
 plugins {
-    id("base-node-plugin")
+    alias(libs.plugins.thecodinglove.base.node)
 }
 
 group = "com.gchristov.thecodinglove.common"
@@ -11,9 +9,9 @@ kotlin {
     sourceSets {
         val commonMain by getting {
             dependencies {
-                implementation(Deps.Kermit.logger)
-                implementation(Deps.Kotlin.coroutinesCore)
-                api(Deps.Kotlin.test)
+                implementation(libs.touchlab.kermit)
+                implementation(libs.kotlinx.coroutines.core)
+                api(libs.kotlin.test)
             }
         }
     }

gradle-plugins/build.gradle.kts

@@ -1,44 +1,3 @@
-plugins {
-    `kotlin-dsl`
-}
-
-gradlePlugin {
-    plugins.register("base-node-plugin") {
-        id = "base-node-plugin"
-        implementationClass = "com.gchristov.thecodinglove.gradleplugins.BaseNodePlugin"
-    }
-    plugins.register("base-browser-plugin") {
-        id = "base-browser-plugin"
-        implementationClass = "com.gchristov.thecodinglove.gradleplugins.BaseBrowserPlugin"
-    }
-    plugins.register("node-module-plugin") {
-        id = "node-module-plugin"
-        implementationClass = "com.gchristov.thecodinglove.gradleplugins.NodeModulePlugin"
-    }
-    plugins.register("build-config-plugin") {
-        id = "build-config-plugin"
-        implementationClass = "com.gchristov.thecodinglove.gradleplugins.BuildConfigPlugin"
-    }
-    plugins.register("browser-binary-plugin") {
-        id = "browser-binary-plugin"
-        implementationClass = "com.gchristov.thecodinglove.gradleplugins.BrowserBinaryPlugin"
-    }
-    plugins.register("node-binary-plugin") {
-        id = "node-binary-plugin"
-        implementationClass = "com.gchristov.thecodinglove.gradleplugins.NodeBinaryPlugin"
-    }
-}
-
-repositories {
-    mavenCentral()
-}
-
-dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21")
-    implementation("org.jetbrains.kotlin:kotlin-serialization:1.9.21")
-    implementation("com.codingfeline.buildkonfig:buildkonfig-gradle-plugin:0.15.0")
-}
-
 val taskNames = listOf("clean", "assemble", "jsTest", "kotlinUpgradeYarnLock")
 taskNames.forEach { taskName ->
     tasks.register("${taskName}All") {

gradle-plugins/conventions/build.gradle.kts

@@ -0,0 +1,37 @@
+plugins {
+    `kotlin-dsl`
+}
+
+gradlePlugin {
+    plugins.register("base-node-plugin") {
+        id = "base-node-plugin"
+        implementationClass = "com.gchristov.thecodinglove.gradleplugins.BaseNodePlugin"
+    }
+    plugins.register("base-browser-plugin") {
+        id = "base-browser-plugin"
+        implementationClass = "com.gchristov.thecodinglove.gradleplugins.BaseBrowserPlugin"
+    }
+    plugins.register("node-module-plugin") {
+        id = "node-module-plugin"
+        implementationClass = "com.gchristov.thecodinglove.gradleplugins.NodeModulePlugin"
+    }
+    plugins.register("build-config-plugin") {
+        id = "build-config-plugin"
+        implementationClass = "com.gchristov.thecodinglove.gradleplugins.BuildConfigPlugin"
+    }
+    plugins.register("browser-binary-plugin") {
+        id = "browser-binary-plugin"
+        implementationClass = "com.gchristov.thecodinglove.gradleplugins.BrowserBinaryPlugin"
+    }
+    plugins.register("node-binary-plugin") {
+        id = "node-binary-plugin"
+        implementationClass = "com.gchristov.thecodinglove.gradleplugins.NodeBinaryPlugin"
+    }
+}
+
+dependencies {
+    compileOnly(libs.kotlin.gradlePlugin)
+    // Allows these to be available and applied in the pre-compiled conventions plugin
+    implementation(libs.kotlin.serialization.gradlePlugin)
+    implementation(libs.buildKonfig.gradlePlugin)
+}

gradle-plugins/src/main/kotlin/com/gchristov/thecodinglove/gradleplugins/BasePlugin.kt → gradle-plugins/conventions/src/main/kotlin/com/gchristov/thecodinglove/gradleplugins/BasePlugin.kt

@@ -2,12 +2,9 @@ package com.gchristov.thecodinglove.gradleplugins
 
 import org.gradle.api.Plugin
 import org.gradle.api.Project
-import org.gradle.api.file.Directory
 import org.gradle.kotlin.dsl.assign
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalDistributionDsl
-import java.io.FileInputStream
-import java.util.*
 
 abstract class BaseMultiplatformPlugin : Plugin<Project> {
     override fun apply(target: Project) {

gradle-plugins/src/main/kotlin/com/gchristov/thecodinglove/gradleplugins/BinaryPlugin.kt → gradle-plugins/conventions/src/main/kotlin/com/gchristov/thecodinglove/gradleplugins/BinaryPlugin.kt

@@ -7,7 +7,7 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 class NodeBinaryPlugin : Plugin<Project> {
     override fun apply(target: Project) {
         target.run {
-            plugins.apply("node-module-plugin")
+            plugins.apply(libs.findPlugin("thecodinglove-node-module").get().get().pluginId)
             extensions.configure(KotlinMultiplatformExtension::class.java) {
                 js(IR) {
                     binaries.library()
@@ -33,7 +33,7 @@ class NodeBinaryPlugin : Plugin<Project> {
 class BrowserBinaryPlugin : Plugin<Project> {
     override fun apply(target: Project) {
         target.run {
-            plugins.apply("base-browser-plugin")
+            plugins.apply(libs.findPlugin("thecodinglove-base-browser").get().get().pluginId)
             extensions.configure(KotlinMultiplatformExtension::class.java) {
                 js(IR) {
                     binaries.executable()

gradle-plugins/src/main/kotlin/com/gchristov/thecodinglove/gradleplugins/ModulePlugin.kt → gradle-plugins/conventions/src/main/kotlin/com/gchristov/thecodinglove/gradleplugins/ModulePlugin.kt

@@ -7,11 +7,11 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 class NodeModulePlugin : Plugin<Project> {
     override fun apply(target: Project) {
         target.run {
-            plugins.apply("base-node-plugin")
+            plugins.apply(libs.findPlugin("thecodinglove-base-node").get().get().pluginId)
             plugins.apply("org.jetbrains.kotlin.plugin.serialization")
             extensions.configure(KotlinMultiplatformExtension::class.java) {
                 sourceSets.maybeCreate("commonTest").dependencies {
-                    api(Deps.Kotlin.coroutinesTest)
+                    api(libs.findLibrary("kotlinx-coroutines-test").get())
                 }
             }
         }

gradle-plugins/src/main/kotlin/com/gchristov/thecodinglove/gradleplugins/ProjectExt.kt → gradle-plugins/conventions/src/main/kotlin/com/gchristov/thecodinglove/gradleplugins/ProjectExt.kt

@@ -1,10 +1,16 @@
 package com.gchristov.thecodinglove.gradleplugins
 
 import org.gradle.api.Project
+import org.gradle.api.artifacts.VersionCatalog
+import org.gradle.api.artifacts.VersionCatalogsExtension
+import org.gradle.kotlin.dsl.getByType
 import org.gradle.api.file.Directory
 import java.io.FileInputStream
 import java.util.*
 
+internal val Project.libs
+    get(): VersionCatalog = extensions.getByType<VersionCatalogsExtension>().named("libs")
+
 fun Project.binaryRootDirectory(): Directory = layout.buildDirectory.dir("dist/js").get()
 
 fun Project.envSecret(key: String): String {

gradle-plugins/gradle.properties

@@ -1,6 +1,7 @@
 #Gradle
 org.gradle.jvmargs=-Xmx4g "-XX:MaxMetaspaceSize=2g"
 org.gradle.caching=true
+org.gradle.configuration-cache=true
 org.gradle.parallel=true
 
 #Kotlin