Start adopting version catalog (#4401)

This just starts the adoption, with just a few entries in the catalog.
The rest will come in separate PRs

Author: runningcode

build.gradle.kts

@@ -18,6 +18,7 @@ plugins {
     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
 }
 
 buildscript {
@@ -26,7 +27,6 @@ buildscript {
     }
     dependencies {
         classpath(Config.BuildPlugins.androidGradle)
-        classpath(kotlin(Config.BuildPlugins.kotlinGradlePlugin, version = Config.kotlinVersion))
         // dokka is required by gradle-maven-publish-plugin.
         classpath(Config.BuildPlugins.dokkaPlugin)
         classpath(Config.QualityPlugins.errorpronePlugin)
@@ -200,7 +200,6 @@ subprojects {
         afterEvaluate {
             apply<MavenPublishPlugin>()
 
-            @Suppress("UnstableApiUsage")
             configure<MavenPublishBaseExtension> {
                 assignAarTypes()
             }

buildSrc/src/main/java/Config.kt

@@ -3,7 +3,6 @@ import java.math.BigDecimal
 
 object Config {
     val AGP = System.getenv("VERSION_AGP") ?: "8.6.0"
-    val kotlinVersion = "1.9.24"
     val kotlinStdLib = "stdlib-jdk8"
 
     val springBootVersion = "2.7.18"
@@ -17,7 +16,6 @@ object Config {
 
     object BuildPlugins {
         val androidGradle = "com.android.tools.build:gradle:$AGP"
-        val kotlinGradlePlugin = "gradle-plugin"
         val buildConfig = "com.github.gmazzo.buildconfig"
         val buildConfigVersion = "5.6.5"
         val springBoot = "org.springframework.boot"
@@ -193,7 +191,6 @@ object Config {
         private val espressoVersion = "3.5.0"
 
         val androidJUnitRunner = "androidx.test.runner.AndroidJUnitRunner"
-        val kotlinTestJunit = "org.jetbrains.kotlin:kotlin-test-junit:$kotlinVersion"
         val androidxCore = "androidx.test:core:1.6.1"
         val androidxRunner = "androidx.test:runner:1.6.2"
         val androidxTestCoreKtx = "androidx.test:core-ktx:1.6.1"

gradle/libs.versions.toml

@@ -0,0 +1,9 @@
+[versions]
+kotlin = "1.9.24"
+
+[plugins]
+kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+kotlin-spring = { id = "org.jetbrains.kotlin.plugin.spring", version.ref = "kotlin" }
+
+[libraries]
+kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }

sentry-android-core/build.gradle.kts

@@ -96,7 +96,7 @@ dependencies {
     // tests
     testImplementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
     testImplementation(Config.TestLibs.robolectric)
-    testImplementation(Config.TestLibs.kotlinTestJunit)
+    testImplementation(libs.kotlin.test.junit)
     testImplementation(Config.TestLibs.androidxCore)
     testImplementation(Config.TestLibs.androidxRunner)
     testImplementation(Config.TestLibs.androidxJunit)

sentry-android-fragment/build.gradle.kts

@@ -69,7 +69,7 @@ dependencies {
 
     // tests
     testImplementation(Config.Libs.fragment)
-    testImplementation(Config.TestLibs.kotlinTestJunit)
+    testImplementation(libs.kotlin.test.junit)
     testImplementation(Config.TestLibs.mockitoKotlin)
     testImplementation(Config.TestLibs.mockitoInline)
 }

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

@@ -100,7 +100,7 @@ dependencies {
     errorprone(Config.CompileOnly.errorProneNullAway)
 
     androidTestImplementation(projects.sentryTestSupport)
-    androidTestImplementation(Config.TestLibs.kotlinTestJunit)
+    androidTestImplementation(libs.kotlin.test.junit)
     androidTestImplementation(Config.TestLibs.espressoCore)
     androidTestImplementation(Config.TestLibs.androidxTestCoreKtx)
     androidTestImplementation(Config.TestLibs.androidxRunner)

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

@@ -116,7 +116,7 @@ dependencies {
     errorprone(Config.CompileOnly.errorProneNullAway)
 
     androidTestImplementation(projects.sentryTestSupport)
-    androidTestImplementation(Config.TestLibs.kotlinTestJunit)
+    androidTestImplementation(libs.kotlin.test.junit)
     androidTestImplementation(Config.TestLibs.espressoCore)
     androidTestImplementation(Config.TestLibs.androidxRunner)
     androidTestImplementation(Config.TestLibs.androidxTestRules)

sentry-android-navigation/build.gradle.kts

@@ -71,7 +71,7 @@ dependencies {
     // tests
     testImplementation(Config.Libs.navigationRuntime)
 
-    testImplementation(Config.TestLibs.kotlinTestJunit)
+    testImplementation(libs.kotlin.test.junit)
     testImplementation(Config.TestLibs.mockitoKotlin)
     testImplementation(Config.TestLibs.mockitoInline)
 

sentry-android-ndk/build.gradle.kts

@@ -88,7 +88,7 @@ dependencies {
     compileOnly(Config.CompileOnly.jetbrainsAnnotations)
 
     testImplementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
-    testImplementation(Config.TestLibs.kotlinTestJunit)
+    testImplementation(libs.kotlin.test.junit)
     testImplementation(Config.TestLibs.mockitoKotlin)
     testImplementation(projects.sentryTestSupport)
 }

sentry-android-replay/build.gradle.kts

@@ -87,7 +87,7 @@ dependencies {
     testImplementation(projects.sentryTestSupport)
     testImplementation(projects.sentryAndroidCore)
     testImplementation(Config.TestLibs.robolectric)
-    testImplementation(Config.TestLibs.kotlinTestJunit)
+    testImplementation(libs.kotlin.test.junit)
     testImplementation(Config.TestLibs.androidxRunner)
     testImplementation(Config.TestLibs.androidxJunit)
     testImplementation(Config.TestLibs.mockitoKotlin)