Use Kotlin stdlib 1.9.24 dependency for Android modules (#4707)

* Use Kotlin stdlib 1.9.24 dependency for Android modules

* Limit Kotlin 1.9.24 dependency to published Android modules only

* Let UI tests use bundled kotlin version

* Update Changelog

Author: markushi

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## Unreleased
+
+### Fixes
+
+- Use Kotlin stdlib 1.9.24 dependency instead of 2.2.0 for all Android modules ([#4707](https://github.com/getsentry/sentry-java/pull/4707))
+  - This fixes compile time issues if your app is using Kotlin < 2.x
+
 ## 8.21.0
 
 ### Fixes

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-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-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)

sentry-ktor-client/build.gradle.kts

@@ -1,5 +1,4 @@
 import net.ltgt.gradle.errorprone.errorprone
-import org.jetbrains.kotlin.config.KotlinCompilerVersion
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
@@ -23,7 +22,7 @@ kotlin { explicitApi() }
 dependencies {
   api(projects.sentry)
 
-  implementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
+  implementation(kotlin(Config.kotlinStdLib, Config.kotlinStdLibVersionAndroid))
   api(projects.sentryKotlinExtensions)
 
   compileOnly(libs.jetbrains.annotations)

sentry-okhttp/build.gradle.kts

@@ -1,5 +1,4 @@
 import net.ltgt.gradle.errorprone.errorprone
-import org.jetbrains.kotlin.config.KotlinCompilerVersion
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
@@ -23,7 +22,7 @@ kotlin { explicitApi() }
 dependencies {
   api(projects.sentry)
 
-  implementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
+  implementation(kotlin(Config.kotlinStdLib, Config.kotlinStdLibVersionAndroid))
 
   compileOnly(libs.jetbrains.annotations)
   compileOnly(libs.nopen.annotations)