Use Kotlin stdlib 1.9.24 dependency for Android modules

Author: markushi

buildSrc/src/main/java/Config.kt

@@ -4,6 +4,7 @@ import java.math.BigDecimal
 object Config {
     val AGP = System.getenv("VERSION_AGP") ?: "8.6.0"
     val kotlinStdLib = "stdlib-jdk8"
+    val kotlinStdLibVersionAndroid = "1.9.24"
     val kotlinTestJunit = "test-junit"
 
     object BuildPlugins {

sentry-android-core/build.gradle.kts

@@ -1,5 +1,4 @@
 import net.ltgt.gradle.errorprone.errorprone
-import org.jetbrains.kotlin.config.KotlinCompilerVersion
 
 plugins {
   id("com.android.library")
@@ -88,7 +87,7 @@ dependencies {
   errorprone(libs.nullaway)
 
   // tests
-  testImplementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
+  testImplementation(kotlin(Config.kotlinStdLib, Config.kotlinStdLibVersionAndroid))
   testImplementation(libs.roboelectric)
   testImplementation(libs.kotlin.test.junit)
   testImplementation(libs.androidx.core.ktx)

sentry-android-distribution/build.gradle.kts

@@ -1,4 +1,3 @@
-import org.jetbrains.kotlin.config.KotlinCompilerVersion
 import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 
 plugins {
@@ -26,5 +25,5 @@ androidComponents.beforeVariants {
 
 dependencies {
   implementation(projects.sentry)
-  implementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
+  implementation(kotlin(Config.kotlinStdLib, Config.kotlinStdLibVersionAndroid))
 }

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

@@ -92,9 +92,7 @@ android {
 }
 
 dependencies {
-  implementation(
-    kotlin(Config.kotlinStdLib, org.jetbrains.kotlin.config.KotlinCompilerVersion.VERSION)
-  )
+  implementation(kotlin(Config.kotlinStdLib, Config.kotlinStdLibVersionAndroid))
   implementation(projects.sentryAndroid)
   implementation(libs.androidx.appcompat)
   implementation(libs.androidx.constraintlayout)

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

@@ -40,9 +40,7 @@ android {
 }
 
 dependencies {
-  implementation(
-    kotlin(Config.kotlinStdLib, org.jetbrains.kotlin.config.KotlinCompilerVersion.VERSION)
-  )
+  implementation(kotlin(Config.kotlinStdLib, Config.kotlinStdLibVersionAndroid))
   implementation(libs.androidx.activity.compose)
   implementation(libs.androidx.compose.foundation)
   implementation(libs.androidx.compose.material3)

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

@@ -87,9 +87,7 @@ android {
 val applySentryIntegrations = System.getenv("APPLY_SENTRY_INTEGRATIONS")?.toBoolean() ?: true
 
 dependencies {
-  implementation(
-    kotlin(Config.kotlinStdLib, org.jetbrains.kotlin.config.KotlinCompilerVersion.VERSION)
-  )
+  implementation(kotlin(Config.kotlinStdLib, Config.kotlinStdLibVersionAndroid))
 
   if (applySentryIntegrations) {
     implementation(projects.sentryAndroid)

sentry-android-ndk/build.gradle.kts

@@ -1,5 +1,3 @@
-import org.jetbrains.kotlin.config.KotlinCompilerVersion
-
 plugins {
   id("com.android.library")
   alias(libs.plugins.kotlin.android)
@@ -70,7 +68,7 @@ dependencies {
 
   implementation(libs.sentry.native.ndk)
 
-  testImplementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
+  testImplementation(kotlin(Config.kotlinStdLib, Config.kotlinStdLibVersionAndroid))
   testImplementation(libs.kotlin.test.junit)
   testImplementation(libs.mockito.kotlin)
   testImplementation(projects.sentryTestSupport)

sentry-android-replay/build.gradle.kts

@@ -1,5 +1,4 @@
 import io.gitlab.arturbosch.detekt.Detekt
-import org.jetbrains.kotlin.config.KotlinCompilerVersion
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
 
 plugins {
@@ -73,8 +72,7 @@ dependencies {
   api(projects.sentry)
 
   compileOnly(libs.androidx.compose.ui.replay)
-  implementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
-
+  implementation(kotlin(Config.kotlinStdLib, Config.kotlinStdLibVersionAndroid))
   // tests
   testImplementation(projects.sentryTestSupport)
   testImplementation(projects.sentryAndroidCore)

sentry-android-sqlite/build.gradle.kts

@@ -1,5 +1,4 @@
 import io.gitlab.arturbosch.detekt.Detekt
-import org.jetbrains.kotlin.config.KotlinCompilerVersion
 
 plugins {
   id("com.android.library")
@@ -69,7 +68,7 @@ dependencies {
 
   compileOnly(libs.androidx.sqlite)
 
-  implementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
+  implementation(kotlin(Config.kotlinStdLib, Config.kotlinStdLibVersionAndroid))
 
   // tests
   testImplementation(libs.androidx.sqlite)

sentry-android-timber/build.gradle.kts

@@ -1,5 +1,4 @@
 import io.gitlab.arturbosch.detekt.Detekt
-import org.jetbrains.kotlin.config.KotlinCompilerVersion
 
 plugins {
   id("com.android.library")
@@ -69,7 +68,7 @@ dependencies {
 
   compileOnly(libs.timber)
 
-  implementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
+  implementation(kotlin(Config.kotlinStdLib, Config.kotlinStdLibVersionAndroid))
 
   // tests
   testImplementation(libs.timber)