Use more plugin aliases.

build-logic/build.gradle.kts

@@ -1,16 +1,12 @@
-import org.gradle.kotlin.dsl.extra
+plugins {
+  alias(libs.plugins.jetbrains.kotlin.jvm) apply false
+}
 
 buildscript {
-    val kotlinVersion by extra("1.9.20")
-
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
-    }
+  repositories {
+    google()
+    mavenCentral()
+  }
 }
 
 apply(from = "${rootDir}/../constants.gradle.kts")

build-logic/plugins/build.gradle.kts

@@ -2,8 +2,8 @@ import org.gradle.kotlin.dsl.extra
 
 plugins {
   `kotlin-dsl`
+  alias(libs.plugins.ktlint)
   id("groovy-gradle-plugin")
-  id("org.jlleitschuh.gradle.ktlint") version "12.1.1"
 }
 
 val signalJavaVersion: JavaVersion by rootProject.extra
@@ -24,8 +24,8 @@ dependencies {
   implementation(libs.kotlin.gradle.plugin)
   implementation(libs.android.library)
   implementation(libs.android.application)
-  implementation(project(":tools"))
   implementation(libs.ktlint)
+  implementation(project(":tools"))
 
   // These allow us to reference the dependency catalog inside of our compiled plugins
   implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location))

build-logic/plugins/src/main/java/signal-library.gradle.kts

@@ -16,6 +16,8 @@ val signalJavaVersion: JavaVersion by rootProject.extra
 val signalKotlinJvmTarget: String by rootProject.extra
 
 plugins {
+  // We cannot use the version catalog in the plugins block in convention plugins (it's not supported).
+  // Instead, plugin versions are controlled through the dependencies block in the build.gradle.kts.
   id("com.android.library")
   id("kotlin-android")
   id("ktlint")

build-logic/plugins/src/main/java/signal-sample-app.gradle.kts

@@ -18,6 +18,8 @@ val signalJavaVersion: JavaVersion by rootProject.extra
 val signalKotlinJvmTarget: String by rootProject.extra
 
 plugins {
+  // We cannot use the version catalog in the plugins block in convention plugins (it's not supported).
+  // Instead, plugin versions are controlled through the dependencies block in the build.gradle.kts.
   id("com.android.application")
   id("kotlin-android")
   id("ktlint")

build-logic/tools/build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
-  id("org.jetbrains.kotlin.jvm")
+  alias(libs.plugins.jetbrains.kotlin.jvm)
   id("java-library")
-  id("org.jlleitschuh.gradle.ktlint") version "12.1.1"
+  alias(libs.plugins.ktlint)
 }
 
 val signalJavaVersion: JavaVersion by rootProject.extra