diff --git a/CHANGELOG.md b/CHANGELOG.md index 262a8471b01..a57ee1611b0 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/buildSrc/src/main/java/Config.kt b/buildSrc/src/main/java/Config.kt index b620979232f..8f373df14dd 100644 --- a/buildSrc/src/main/java/Config.kt +++ b/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 { diff --git a/sentry-android-distribution/build.gradle.kts b/sentry-android-distribution/build.gradle.kts index fa869097c2d..aff4a7b9230 100644 --- a/sentry-android-distribution/build.gradle.kts +++ b/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)) } diff --git a/sentry-android-replay/build.gradle.kts b/sentry-android-replay/build.gradle.kts index 30afc911910..60d38c0ae0a 100644 --- a/sentry-android-replay/build.gradle.kts +++ b/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) diff --git a/sentry-android-sqlite/build.gradle.kts b/sentry-android-sqlite/build.gradle.kts index 58e19ee54f8..07fa7ad343f 100644 --- a/sentry-android-sqlite/build.gradle.kts +++ b/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) diff --git a/sentry-android-timber/build.gradle.kts b/sentry-android-timber/build.gradle.kts index 11be26e8936..16083b43f1b 100644 --- a/sentry-android-timber/build.gradle.kts +++ b/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) diff --git a/sentry-ktor-client/build.gradle.kts b/sentry-ktor-client/build.gradle.kts index 1c989d012fe..1fb3e98f126 100644 --- a/sentry-ktor-client/build.gradle.kts +++ b/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) diff --git a/sentry-okhttp/build.gradle.kts b/sentry-okhttp/build.gradle.kts index 783b578e3c1..e2c10ffc5a1 100644 --- a/sentry-okhttp/build.gradle.kts +++ b/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)