Updating to use toml file for all plugins.

Author: AdamMc331

app/build.gradle.kts

@@ -1,10 +1,10 @@
 plugins {
-    id("app.cash.paparazzi")
-    id("com.android.application")
-    id("com.google.dagger.hilt.android")
-    id("com.google.devtools.ksp")
-    id("kotlin-android")
+    alias(libs.plugins.android.application)
+    alias(libs.plugins.cash.paparazzi)
     alias(libs.plugins.compose.compiler)
+    alias(libs.plugins.google.dagger.hilt)
+    alias(libs.plugins.google.ksp)
+    alias(libs.plugins.kotlin.android)
 }
 
 android {
@@ -53,12 +53,6 @@ android {
 }
 
 dependencies {
-    ksp(libs.androidx.room.compiler)
-    ksp(libs.hilt.compiler)
-    ksp(libs.square.moshi.kotlin.codegen)
-
-    kspAndroidTest(libs.hilt.android.compiler)
-
     implementation(platform(libs.compose.bom))
     implementation(libs.android.material)
     implementation(libs.androidx.activity.compose)
@@ -91,6 +85,12 @@ dependencies {
     androidTestImplementation(libs.androidx.test.junit)
     androidTestImplementation(libs.compose.ui.test.junit)
     androidTestImplementation(libs.hilt.android.testing)
+
+    ksp(libs.androidx.room.compiler)
+    ksp(libs.hilt.compiler)
+    ksp(libs.square.moshi.kotlin.codegen)
+
+    kspAndroidTest(libs.hilt.android.compiler)
 }
 
 tasks.formatKotlinMain {

build.gradle.kts

@@ -1,31 +1,16 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
-buildscript {
-
-    repositories {
-        google()
-        mavenCentral()
-        maven(url = "https://plugins.gradle.org/m2/")
-    }
-
-    dependencies {
-        classpath(libs.detekt.gradle.plugin)
-        classpath(libs.gradle)
-        classpath(libs.gradle.versions.plugin)
-        classpath(libs.kotlin.gradle.plugin)
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
-    }
-}
 
 plugins {
-    id("app.cash.paparazzi").version(libs.versions.paparazzi).apply(false)
-    id("com.google.dagger.hilt.android").version(libs.versions.hilt).apply(false)
-    id("com.google.devtools.ksp").version(libs.versions.ksp).apply(false)
-    id("com.squareup.sort-dependencies").version(libs.versions.sortDependencies).apply(false)
-    id("io.gitlab.arturbosch.detekt").version(libs.versions.detektGradlePlugin)
-    id("org.jmailen.kotlinter").version(libs.versions.kotlinter).apply(false)
+    alias(libs.plugins.android.application).apply(false)
+    alias(libs.plugins.benmanes.versions).apply(false)
+    alias(libs.plugins.cash.paparazzi).apply(false)
     alias(libs.plugins.compose.compiler).apply(false)
+    alias(libs.plugins.detekt).apply(true) // Needs to be applied at the root, unlike others.
+    alias(libs.plugins.google.dagger.hilt).apply(false)
+    alias(libs.plugins.google.ksp).apply(false)
+    alias(libs.plugins.kotlin.android).apply(false)
+    alias(libs.plugins.kotlinter).apply(false)
+    alias(libs.plugins.square.sort.dependencies).apply(false)
 }
 
 apply(from = "buildscripts/githooks.gradle")

gradle/libs.versions.toml

@@ -1,13 +1,13 @@
 [versions]
 activityCompose = "1.9.3"
+agp = "8.7.3"
 androidxTest = "1.2.1"
 appCompat = "1.7.0"
 coil = "3.0.4"
 compileSdk = "35"
 composeBom = "2024.12.01"
 detektGradlePlugin = "1.23.7"
 espresso = "3.6.1"
-gradle = "8.7.3"
 gradleVersionsPlugin = "0.51.0"
 hilt = "2.53.1"
 junit = "4.13.2"
@@ -23,7 +23,7 @@ moshi = "1.15.2"
 paparazzi = "1.3.5"
 retrofit = "2.11.0"
 room = "2.6.1"
-sortDependencies = "0.8"
+sortDependencies = "0.13"
 
 [libraries]
 android-material = { module = "com.google.android.material:material", version.ref = "material" }
@@ -44,10 +44,8 @@ compose-ui = { group = "androidx.compose.ui", name = "ui" }
 compose-ui-test-junit = { group = "androidx.compose.ui", name = "ui-test-junit4" }
 compose-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
 compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
-compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
-compose-ui-util = { group = "androidx.compose.ui", name = "ui-util" }
 detekt-gradle-plugin = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "detektGradlePlugin" }
-gradle = { module = "com.android.tools.build:gradle", version.ref = "gradle" }
+gradle = { module = "com.android.tools.build:gradle", version.ref = "agp" }
 gradle-versions-plugin = { module = "com.github.ben-manes:gradle-versions-plugin", version.ref = "gradleVersionsPlugin" }
 hilt-android = { module = "com.google.dagger:hilt-android", version.ref = "hilt" }
 hilt-android-compiler = { module = "com.google.dagger:hilt-android-compiler", version.ref = "hilt" }
@@ -62,4 +60,13 @@ square-retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref = "r
 square-retrofit-converter-moshi = { module = "com.squareup.retrofit2:converter-moshi", version.ref = "retrofit"}
 
 [plugins]
-compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
+android-application = { id = "com.android.application", version.ref = "agp" }
+benmanes-versions = { id = "com.github.ben-manes.versions", version.ref = "gradleVersionsPlugin" }
+cash-paparazzi = { id = "app.cash.paparazzi", version.ref = "paparazzi" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
+detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detektGradlePlugin" }
+google-dagger-hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
+google-ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
+kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+kotlinter = { id = "org.jmailen.kotlinter", version.ref = "kotlinter" }
+square-sort-dependencies = { id = "com.squareup.sort-dependencies", version.ref = "sortDependencies" }

settings.gradle.kts

@@ -1,3 +1,10 @@
+pluginManagement {
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
 dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
     repositories {