Skip to content

Commit 59cb440

Browse files
adinauergetsentry-botmarkushi
authored
Attempt to fix kotlin 2.2 issue (#4603)
* Fix Spring 7 and Spring Boot 4 modules * Attempt to fix kotlin 2.2 issue * Second attempt to fix Kotlin 2.2 (#4610) * Second attempt to fix Kotlin 2.2 * Format code * Third attempt at fixing Kotlin 2.2 compat (#4613) --------- Co-authored-by: Sentry Github Bot <bot+github-bot@sentry.io> * Address compose-related issues * Fix tests for Spring 7 and Spring Boot 4 (#4614) * Second attempt to fix Kotlin 2.2 * Format code * Third attempt at fixing Kotlin 2.2 compat * Fix tests for Spring 7 and Spring Boot 4 * Move Spring 7 and Spring Boot 4 packages (#4615) * Move Spring 7 and Spring Boot 4 packages * Fix class not found due to OTel not supporting spring boot 4 yet (#4616) * Format code * some fixes * change kotlin 1.8 to 1.9 and some cleanup * ignore warnings about api level that is not relevant * fix optional dependencies in SentryAutoConfiguration * Update trace origin * Remove duplicate e2e test config * Update Strings for Spring 7 and Spring Boot 4 * Disable Spring Boot 4 agentless e2e tests for now --------- Co-authored-by: Sentry Github Bot <bot+github-bot@sentry.io> --------- Co-authored-by: Sentry Github Bot <bot+github-bot@sentry.io> Co-authored-by: markushi <markus.hintersteiner@sentry.io>
1 parent 1b6c6e0 commit 59cb440

File tree

243 files changed

+878
-744
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

243 files changed

+878
-744
lines changed

‎.github/workflows/system-tests-backend.yml‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,12 @@ jobs:
5454
- sample: "sentry-samples-console"
5555
agent: "false"
5656
agent-auto-init: "true"
57-
- sample: "sentry-samples-spring-boot-jakarta"
58-
agent: "false"
59-
agent-auto-init: "true"
6057
- sample: "sentry-samples-spring-boot-4-webflux"
6158
agent: "false"
6259
agent-auto-init: "true"
63-
- sample: "sentry-samples-spring-boot-4-opentelemetry-noagent"
64-
agent: "false"
65-
agent-auto-init: "true"
60+
# - sample: "sentry-samples-spring-boot-4-opentelemetry-noagent"
61+
# agent: "false"
62+
# agent-auto-init: "true"
6663
- sample: "sentry-samples-spring-boot-4-opentelemetry"
6764
agent: "true"
6865
agent-auto-init: "true"

‎build.gradle.kts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,14 @@ plugins {
1818
alias(libs.plugins.kover) apply false
1919
alias(libs.plugins.vanniktech.maven.publish) apply false
2020
alias(libs.plugins.kotlin.android) apply false
21+
alias(libs.plugins.kotlin.multiplatform) apply false
22+
alias(libs.plugins.kotlin.jvm) apply false
23+
alias(libs.plugins.kotlin.spring) apply false
2124
alias(libs.plugins.buildconfig) apply false
2225
// dokka is required by gradle-maven-publish-plugin.
2326
alias(libs.plugins.dokka) apply false
2427
alias(libs.plugins.dokka.javadoc) apply false
25-
alias(libs.plugins.compose.compiler) apply false
28+
alias(libs.plugins.kotlin.compose) apply false
2629
alias(libs.plugins.errorprone) apply false
2730
alias(libs.plugins.gradle.versions) apply false
2831
alias(libs.plugins.spring.dependency.management) apply false

‎buildSrc/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ repositories {
99
}
1010

1111
tasks.withType<KotlinCompile>().configureEach {
12-
kotlinOptions.jvmTarget = JavaVersion.VERSION_17.toString()
12+
compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
1313
}

‎buildSrc/src/main/java/Config.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import java.math.BigDecimal
44
object Config {
55
val AGP = System.getenv("VERSION_AGP") ?: "8.6.0"
66
val kotlinStdLib = "stdlib-jdk8"
7+
val kotlinTestJunit = "test-junit"
78

89
object BuildPlugins {
910
val androidGradle = "com.android.tools.build:gradle:$AGP"

‎gradle/libs.versions.toml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ feign = "11.6"
1111
jacoco = "0.8.7"
1212
jackson = "2.18.3"
1313
jetbrainsCompose = "1.6.11"
14-
kotlin = "1.9.24"
14+
kotlin = "2.2.0"
1515
kotlinSpring7 = "2.2.0"
16-
kotlin-compatible-version = "1.6"
16+
kotlin-compatible-version = "1.9"
1717
ktorClient = "3.0.0"
1818
logback = "1.2.9"
1919
log4j2 = "2.20.0"
@@ -41,11 +41,15 @@ spotless = "7.0.4"
4141
[plugins]
4242
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
4343
kotlin-spring = { id = "org.jetbrains.kotlin.plugin.spring", version.ref = "kotlin" }
44+
kotlin-spring7 = { id = "org.jetbrains.kotlin.plugin.spring", version.ref = "kotlinSpring7" }
45+
kotlin-jvm-spring7 = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlinSpring7" }
46+
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
47+
kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
48+
kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
4449
buildconfig = { id = "com.github.gmazzo.buildconfig", version = "5.6.5" }
4550
dokka = { id = "org.jetbrains.dokka", version = "2.0.0" }
4651
dokka-javadoc = { id = "org.jetbrains.dokka-javadoc", version = "2.0.0" }
4752
binary-compatibility-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.13.0" }
48-
compose-compiler = { id = "org.jetbrains.compose", version.ref = "jetbrainsCompose" }
4953
errorprone = { id = "net.ltgt.errorprone", version = "3.0.1" }
5054
gradle-versions = { id = "com.github.ben-manes.versions", version = "0.42.0" }
5155
spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }

‎sentry-android-core/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import org.jetbrains.kotlin.config.KotlinCompilerVersion
33

44
plugins {
55
id("com.android.library")
6-
kotlin("android")
6+
alias(libs.plugins.kotlin.android)
77
jacoco
88
alias(libs.plugins.jacoco.android)
99
alias(libs.plugins.errorprone)
@@ -34,7 +34,7 @@ android {
3434
getByName("release") { consumerProguardFiles("proguard-rules.pro") }
3535
}
3636

37-
kotlinOptions { jvmTarget = JavaVersion.VERSION_1_8.toString() }
37+
kotlin { compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8 }
3838

3939
testOptions {
4040
animationsDisabled = true

‎sentry-android-fragment/build.gradle.kts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import io.gitlab.arturbosch.detekt.Detekt
22

33
plugins {
44
id("com.android.library")
5-
kotlin("android")
5+
alias(libs.plugins.kotlin.android)
66
jacoco
77
alias(libs.plugins.jacoco.android)
88
alias(libs.plugins.gradle.versions)
@@ -25,7 +25,11 @@ android {
2525
getByName("release") { consumerProguardFiles("proguard-rules.pro") }
2626
}
2727

28-
kotlinOptions { jvmTarget = JavaVersion.VERSION_1_8.toString() }
28+
kotlin {
29+
compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8
30+
compilerOptions.languageVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9
31+
compilerOptions.apiVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9
32+
}
2933

3034
testOptions {
3135
animationsDisabled = true

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import net.ltgt.gradle.errorprone.errorprone
33

44
plugins {
55
id("com.android.application")
6-
kotlin("android")
6+
alias(libs.plugins.kotlin.android)
77
alias(libs.plugins.errorprone)
88
alias(libs.plugins.gradle.versions)
99
alias(libs.plugins.detekt)
@@ -76,7 +76,7 @@ android {
7676
}
7777
}
7878

79-
kotlinOptions { jvmTarget = JavaVersion.VERSION_1_8.toString() }
79+
kotlin { compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8 }
8080

8181
lint {
8282
warningsAsErrors = true

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ import io.gitlab.arturbosch.detekt.Detekt
22

33
plugins {
44
id("com.android.application")
5-
kotlin("android")
5+
alias(libs.plugins.kotlin.android)
6+
alias(libs.plugins.kotlin.compose)
67
}
78

89
android {
@@ -30,7 +31,7 @@ android {
3031
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
3132
}
3233
}
33-
kotlinOptions { jvmTarget = JavaVersion.VERSION_1_8.toString() }
34+
kotlin { compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8 }
3435
buildFeatures { compose = true }
3536
composeOptions { kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get() }
3637
androidComponents.beforeVariants {

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ import net.ltgt.gradle.errorprone.errorprone
33

44
plugins {
55
id("com.android.application")
6-
kotlin("android")
6+
alias(libs.plugins.kotlin.android)
7+
alias(libs.plugins.kotlin.compose)
78
alias(libs.plugins.errorprone)
89
alias(libs.plugins.gradle.versions)
910
alias(libs.plugins.detekt)
@@ -68,7 +69,7 @@ android {
6869
}
6970
}
7071

71-
kotlinOptions { jvmTarget = JavaVersion.VERSION_1_8.toString() }
72+
kotlin { compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8 }
7273

7374
lint {
7475
warningsAsErrors = true

0 commit comments

Comments
 (0)