Skip to content

Use Kotlin stdlib 1.9.24 dependency for Android modules #4707

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Sep 9, 2025
Merged

Use Kotlin stdlib 1.9.24 dependency for Android modules #4707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5714c9f
Use Kotlin stdlib 1.9.24 dependency for Android modules
markushi Sep 9, 2025
6d9afec
Limit Kotlin 1.9.24 dependency to published Android modules only
markushi Sep 9, 2025
9062af4
Let UI tests use bundled kotlin version
markushi Sep 9, 2025
52914dd
Update Changelog
markushi Sep 9, 2025
59862ca
Merge branch 'main' into markushi/fix/kotlin-stdlib-dependency
markushi Sep 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions buildSrc/src/main/java/Config.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
3 changes: 1 addition & 2 deletions sentry-android-distribution/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import org.jetbrains.kotlin.config.KotlinCompilerVersion
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion

plugins {
Expand Down Expand Up @@ -26,5 +25,5 @@ androidComponents.beforeVariants {

dependencies {
implementation(projects.sentry)
implementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
implementation(kotlin(Config.kotlinStdLib, Config.kotlinStdLibVersionAndroid))
}
4 changes: 1 addition & 3 deletions sentry-android-replay/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import io.gitlab.arturbosch.detekt.Detekt
import org.jetbrains.kotlin.config.KotlinCompilerVersion
import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask

plugins {
Expand Down Expand Up @@ -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)
Expand Down
3 changes: 1 addition & 2 deletions sentry-android-sqlite/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import io.gitlab.arturbosch.detekt.Detekt
import org.jetbrains.kotlin.config.KotlinCompilerVersion

plugins {
id("com.android.library")
Expand Down Expand Up @@ -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)
Expand Down
3 changes: 1 addition & 2 deletions sentry-android-timber/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import io.gitlab.arturbosch.detekt.Detekt
import org.jetbrains.kotlin.config.KotlinCompilerVersion

plugins {
id("com.android.library")
Expand Down Expand Up @@ -69,7 +68,7 @@ dependencies {

compileOnly(libs.timber)

implementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
implementation(kotlin(Config.kotlinStdLib, Config.kotlinStdLibVersionAndroid))

// tests
testImplementation(libs.timber)
Expand Down
3 changes: 1 addition & 2 deletions sentry-ktor-client/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import net.ltgt.gradle.errorprone.errorprone
import org.jetbrains.kotlin.config.KotlinCompilerVersion
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
Expand All @@ -23,7 +22,7 @@ kotlin { explicitApi() }
dependencies {
api(projects.sentry)

implementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
implementation(kotlin(Config.kotlinStdLib, Config.kotlinStdLibVersionAndroid))
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bug: Incorrect Android Kotlin Stdlib in JVM Modules

The sentry-ktor-client and sentry-okhttp modules are JVM-only libraries (using java-library and kotlin.jvm plugins), but they're now using Config.kotlinStdLibVersionAndroid. This Android-specific Kotlin stdlib version appears to be incorrectly applied to these non-Android modules, which could lead to compatibility issues and contradicts the PR's stated intent.

Additional Locations (1)

Fix in Cursor Fix in Web

api(projects.sentryKotlinExtensions)

compileOnly(libs.jetbrains.annotations)
Expand Down
3 changes: 1 addition & 2 deletions sentry-okhttp/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import net.ltgt.gradle.errorprone.errorprone
import org.jetbrains.kotlin.config.KotlinCompilerVersion
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
Expand All @@ -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)
Expand Down
Loading