Version catalog adoption (#4415)

Continue adopting version catalog

Author: runningcode

build.gradle.kts

@@ -14,11 +14,18 @@ plugins {
     jacoco
     id(Config.QualityPlugins.detekt) version Config.QualityPlugins.detektVersion
     `maven-publish`
-    id(Config.QualityPlugins.binaryCompatibilityValidator) version Config.QualityPlugins.binaryCompatibilityValidatorVersion
+    alias(libs.plugins.binary.compatibility.validator)
     id(Config.QualityPlugins.jacocoAndroid) version Config.QualityPlugins.jacocoAndroidVersion apply false
     id(Config.QualityPlugins.kover) version Config.QualityPlugins.koverVersion apply false
     id(Config.BuildPlugins.gradleMavenPublishPlugin) version Config.BuildPlugins.gradleMavenPublishPluginVersion apply false
     alias(libs.plugins.kotlin.android) apply false
+    alias(libs.plugins.buildconfig) apply false
+    // dokka is required by gradle-maven-publish-plugin.
+    alias(libs.plugins.dokka) apply false
+    alias(libs.plugins.dokka.javadoc) apply false
+    alias(libs.plugins.compose.compiler) apply false
+    alias(libs.plugins.errorprone) apply false
+    alias(libs.plugins.gradle.versions) apply false
 }
 
 buildscript {
@@ -27,16 +34,10 @@ buildscript {
     }
     dependencies {
         classpath(Config.BuildPlugins.androidGradle)
-        // dokka is required by gradle-maven-publish-plugin.
-        classpath(Config.BuildPlugins.dokkaPlugin)
-        classpath(Config.QualityPlugins.errorpronePlugin)
-        classpath(Config.QualityPlugins.gradleVersionsPlugin)
 
         // add classpath of sentry android gradle plugin
         // classpath("io.sentry:sentry-android-gradle-plugin:{version}")
 
-        classpath(Config.QualityPlugins.binaryCompatibilityValidatorPlugin)
-        classpath(Config.BuildPlugins.composeGradlePlugin)
         classpath(Config.BuildPlugins.commonsCompressOverride)
     }
 }

buildSrc/src/main/java/Config.kt

@@ -9,26 +9,17 @@ object Config {
     val springBoot3Version = "3.4.2"
     val kotlinCompatibleLanguageVersion = "1.6"
 
-    // see https://www.jetbrains.com/help/kotlin-multiplatform-dev/compose-compatibility-and-versioning.html#kotlin-compatibility
-    // see https://developer.android.com/jetpack/androidx/releases/compose-kotlin
-    val composeVersion = "1.6.11"
     val androidComposeCompilerVersion = "1.5.14"
 
     object BuildPlugins {
         val androidGradle = "com.android.tools.build:gradle:$AGP"
-        val buildConfig = "com.github.gmazzo.buildconfig"
-        val buildConfigVersion = "5.6.5"
         val springBoot = "org.springframework.boot"
         val springDependencyManagement = "io.spring.dependency-management"
         val springDependencyManagementVersion = "1.0.11.RELEASE"
         val gretty = "org.gretty"
         val grettyVersion = "4.0.0"
         val gradleMavenPublishPlugin = "com.vanniktech.maven.publish"
         val gradleMavenPublishPluginVersion = "0.30.0"
-        val dokkaPlugin = "org.jetbrains.dokka:dokka-gradle-plugin:2.0.0"
-        val dokkaPluginAlias = "org.jetbrains.dokka"
-        val dokkaPluginJavadocAlias = "org.jetbrains.dokka-javadoc"
-        val composeGradlePlugin = "org.jetbrains.compose:compose-gradle-plugin:$composeVersion"
         val commonsCompressOverride = "org.apache.commons:commons-compress:1.25.0"
     }
 
@@ -225,16 +216,10 @@ object Config {
         }
         val spotless = "com.diffplug.spotless"
         val spotlessVersion = "6.11.0"
-        val errorProne = "net.ltgt.errorprone"
-        val errorpronePlugin = "net.ltgt.gradle:gradle-errorprone-plugin:3.0.1"
-        val gradleVersionsPlugin = "com.github.ben-manes:gradle-versions-plugin:0.42.0"
-        val gradleVersions = "com.github.ben-manes.versions"
+
         val detekt = "io.gitlab.arturbosch.detekt"
         val detektVersion = "1.23.8"
         val detektPlugin = "io.gitlab.arturbosch.detekt"
-        val binaryCompatibilityValidatorVersion = "0.13.0"
-        val binaryCompatibilityValidatorPlugin = "org.jetbrains.kotlinx:binary-compatibility-validator:$binaryCompatibilityValidatorVersion"
-        val binaryCompatibilityValidator = "org.jetbrains.kotlinx.binary-compatibility-validator"
         val jacocoAndroid = "com.mxalbert.gradle.jacoco-android"
         val jacocoAndroidVersion = "0.2.0"
         val kover = "org.jetbrains.kotlinx.kover"

gradle/libs.versions.toml

@@ -1,9 +1,19 @@
 [versions]
 kotlin = "1.9.24"
+# see https://www.jetbrains.com/help/kotlin-multiplatform-dev/compose-compatibility-and-versioning.html#kotlin-compatibility
+# see https://developer.android.com/jetpack/androidx/releases/compose-kotlin
+composeVersion = "1.6.11"
 
 [plugins]
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlin-spring = { id = "org.jetbrains.kotlin.plugin.spring", version.ref = "kotlin" }
+buildconfig = { id = "com.github.gmazzo.buildconfig", version = "5.6.5" }
+dokka = { id = "org.jetbrains.dokka", version = "2.0.0" }
+dokka-javadoc = { id = "org.jetbrains.dokka-javadoc", version = "2.0.0" }
+binary-compatibility-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.13.0" }
+compose-compiler = { id = "org.jetbrains.compose", version.ref = "composeVersion" }
+errorprone = { id = "net.ltgt.errorprone", version = "3.0.1" }
+gradle-versions = {id = "com.github.ben-manes.versions", version = "0.42.0" }
 
 [libraries]
 kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }

sentry-android-core/build.gradle.kts

@@ -6,8 +6,8 @@ plugins {
     kotlin("android")
     jacoco
     id(Config.QualityPlugins.jacocoAndroid)
-    id(Config.QualityPlugins.errorProne)
-    id(Config.QualityPlugins.gradleVersions)
+    alias(libs.plugins.errorprone)
+    alias(libs.plugins.gradle.versions)
 }
 
 android {

sentry-android-fragment/build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
     kotlin("android")
     jacoco
     id(Config.QualityPlugins.jacocoAndroid)
-    id(Config.QualityPlugins.gradleVersions)
+    alias(libs.plugins.gradle.versions)
     id(Config.QualityPlugins.detektPlugin)
 }
 

sentry-android-integration-tests/sentry-uitest-android-benchmark/build.gradle.kts

@@ -4,8 +4,8 @@ import net.ltgt.gradle.errorprone.errorprone
 plugins {
     id("com.android.application")
     kotlin("android")
-    id(Config.QualityPlugins.errorProne)
-    id(Config.QualityPlugins.gradleVersions)
+    alias(libs.plugins.errorprone)
+    alias(libs.plugins.gradle.versions)
     id(Config.QualityPlugins.detektPlugin)
 }
 

sentry-android-integration-tests/sentry-uitest-android/build.gradle.kts

@@ -4,8 +4,8 @@ import net.ltgt.gradle.errorprone.errorprone
 plugins {
     id("com.android.application")
     kotlin("android")
-    id(Config.QualityPlugins.errorProne)
-    id(Config.QualityPlugins.gradleVersions)
+    alias(libs.plugins.errorprone)
+    alias(libs.plugins.gradle.versions)
     id(Config.QualityPlugins.detektPlugin)
 }
 

sentry-android-navigation/build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
     kotlin("android")
     jacoco
     id(Config.QualityPlugins.jacocoAndroid)
-    id(Config.QualityPlugins.gradleVersions)
+    alias(libs.plugins.gradle.versions)
     id(Config.QualityPlugins.detektPlugin)
 }
 

sentry-android-ndk/build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
     kotlin("android")
     jacoco
     id(Config.QualityPlugins.jacocoAndroid)
-    id(Config.QualityPlugins.gradleVersions)
+    alias(libs.plugins.gradle.versions)
 }
 
 android {

sentry-android-replay/build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
     kotlin("android")
     jacoco
     id(Config.QualityPlugins.jacocoAndroid)
-    id(Config.QualityPlugins.gradleVersions)
+    alias(libs.plugins.gradle.versions)
     // TODO: enable it later
 //    id(Config.QualityPlugins.detektPlugin)
 }