Third attempt at fixing Kotlin 2.2 compat

adinauer · adinauer · commit 8d5bfcf21999 · 2025-08-07T14:56:55.000+02:00
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -11,7 +11,7 @@ feign = "11.6"
 jacoco = "0.8.7"
 jackson = "2.18.3"
 jetbrainsCompose = "1.6.11"
-kotlin = "2.2.0"
+kotlin = "1.9.24"
 kotlinSpring7 = "2.2.0"
 kotlin-compatible-version = "1.9"
 ktorClient = "3.0.0"
diff --git a/sentry-android-integration-tests/sentry-uitest-android-critical/build.gradle.kts b/sentry-android-integration-tests/sentry-uitest-android-critical/build.gradle.kts
@@ -3,7 +3,7 @@ import io.gitlab.arturbosch.detekt.Detekt
 plugins {
   id("com.android.application")
   alias(libs.plugins.kotlin.android)
-  alias(libs.plugins.kotlin.compose)
+  //  alias(libs.plugins.kotlin.compose)
 }
 
 android {
diff --git a/sentry-android-integration-tests/sentry-uitest-android/build.gradle.kts b/sentry-android-integration-tests/sentry-uitest-android/build.gradle.kts
@@ -4,7 +4,7 @@ import net.ltgt.gradle.errorprone.errorprone
 plugins {
   id("com.android.application")
   alias(libs.plugins.kotlin.android)
-  alias(libs.plugins.kotlin.compose)
+  //  alias(libs.plugins.kotlin.compose)
   alias(libs.plugins.errorprone)
   alias(libs.plugins.gradle.versions)
   alias(libs.plugins.detekt)
diff --git a/sentry-android-replay/build.gradle.kts b/sentry-android-replay/build.gradle.kts
@@ -5,7 +5,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
 plugins {
   id("com.android.library")
   alias(libs.plugins.kotlin.android)
-  alias(libs.plugins.kotlin.compose)
+  //  alias(libs.plugins.kotlin.compose)
   jacoco
   alias(libs.plugins.jacoco.android)
   alias(libs.plugins.gradle.versions)
diff --git a/sentry-compose/build.gradle.kts b/sentry-compose/build.gradle.kts
@@ -19,10 +19,10 @@ kotlin {
 
   androidTarget {
     publishLibraryVariants("release")
-    compilerOptions { jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.fromTarget("1.8")) }
+    compilations.all { kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString() }
   }
   jvm("desktop") {
-    compilerOptions { jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.fromTarget("1.8")) }
+    compilations.all { kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString() }
   }
 
   sourceSets.all {
diff --git a/sentry-samples/sentry-samples-android/build.gradle.kts b/sentry-samples/sentry-samples-android/build.gradle.kts
@@ -6,7 +6,7 @@ import org.gradle.internal.extensions.stdlib.capitalized
 plugins {
   id("com.android.application")
   alias(libs.plugins.kotlin.android)
-  alias(libs.plugins.kotlin.compose)
+  //  alias(libs.plugins.kotlin.compose)
 }
 
 android {
diff --git a/sentry-samples/sentry-samples-spring-7/build.gradle.kts b/sentry-samples/sentry-samples-spring-7/build.gradle.kts
@@ -46,7 +46,12 @@ tasks.withType<Test>().configureEach { useJUnitPlatform() }
 
 tasks.withType<KotlinCompile>().configureEach {
   kotlin {
-    compilerOptions.freeCompilerArgs = listOf("-Xjsr305=strict")
+    explicitApi()
+    // skip metadata version check, as Spring 7 / Spring Boot 4 is
+    // compiled against a newer version of Kotlin
+    compilerOptions.freeCompilerArgs = listOf("-Xjsr305=strict", "-Xskip-metadata-version-check")
     compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
+    compilerOptions.languageVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9
+    compilerOptions.apiVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9
   }
 }
diff --git a/sentry-samples/sentry-samples-spring-7/src/main/java/io/sentry/samples/spring/jakarta/SecurityConfiguration.java b/sentry-samples/sentry-samples-spring-7/src/main/java/io/sentry/samples/spring/jakarta/SecurityConfiguration.java
@@ -20,9 +20,10 @@ public class SecurityConfiguration {
   @SuppressWarnings({"lgtm[java/spring-disabled-csrf-protection]", "removal"})
   @Bean
   public SecurityFilterChain filterChain(final @NotNull HttpSecurity http) throws Exception {
-    http.csrf().disable().authorizeHttpRequests().anyRequest().authenticated().and().httpBasic();
-
-    return http.build();
+    return http.csrf((csrf) -> csrf.disable())
+        .authorizeHttpRequests((r) -> r.anyRequest().authenticated())
+        .httpBasic((h) -> {})
+        .build();
   }
 
   @Bean
diff --git a/sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/build.gradle.kts
@@ -24,10 +24,14 @@ configure<JavaPluginExtension> {
 }
 
 tasks.withType<KotlinCompile>().configureEach {
-  compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
   kotlin {
-    compilerOptions.freeCompilerArgs = listOf("-Xjsr305=strict")
+    explicitApi()
+    // skip metadata version check, as Spring 7 / Spring Boot 4 is
+    // compiled against a newer version of Kotlin
+    compilerOptions.freeCompilerArgs = listOf("-Xjsr305=strict", "-Xskip-metadata-version-check")
     compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
+    compilerOptions.languageVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9
+    compilerOptions.apiVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9
   }
 }
 
@@ -42,6 +46,7 @@ dependencies {
   implementation(libs.springboot4.starter.web)
   implementation(libs.springboot4.starter.webflux)
   implementation(libs.springboot4.starter.websocket)
+  implementation(libs.springboot4.starter.restclient)
   implementation(Config.Libs.aspectj)
   implementation(Config.Libs.kotlinReflect)
   implementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
diff --git a/sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/src/main/java/io/sentry/samples/spring/boot/jakarta/SecurityConfiguration.java b/sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/src/main/java/io/sentry/samples/spring/boot/jakarta/SecurityConfiguration.java
@@ -18,9 +18,10 @@ public class SecurityConfiguration {
   @SuppressWarnings({"lgtm[java/spring-disabled-csrf-protection]", "removal"})
   @Bean
   public SecurityFilterChain filterChain(final @NotNull HttpSecurity http) throws Exception {
-    http.csrf().disable().authorizeHttpRequests().anyRequest().authenticated().and().httpBasic();
-
-    return http.build();
+    return http.csrf((csrf) -> csrf.disable())
+        .authorizeHttpRequests((r) -> r.anyRequest().authenticated())
+        .httpBasic((h) -> {})
+        .build();
   }
 
   @Bean
diff --git a/sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/src/main/java/io/sentry/samples/spring/boot/jakarta/SentryDemoApplication.java b/sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/src/main/java/io/sentry/samples/spring/boot/jakarta/SentryDemoApplication.java
@@ -10,7 +10,7 @@
 import org.quartz.SimpleTrigger;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.web.client.RestTemplateBuilder;
+import org.springframework.boot.restclient.RestTemplateBuilder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.quartz.CronTriggerFactoryBean;
diff --git a/sentry-samples/sentry-samples-spring-boot-4-opentelemetry/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot-4-opentelemetry/build.gradle.kts
@@ -24,14 +24,15 @@ configure<JavaPluginExtension> {
   targetCompatibility = JavaVersion.VERSION_17
 }
 
-tasks.withType<KotlinCompile>().configureEach {
-  compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
-}
-
 tasks.withType<KotlinCompile>().configureEach {
   kotlin {
-    compilerOptions.freeCompilerArgs = listOf("-Xjsr305=strict")
+    explicitApi()
+    // skip metadata version check, as Spring 7 / Spring Boot 4 is
+    // compiled against a newer version of Kotlin
+    compilerOptions.freeCompilerArgs = listOf("-Xjsr305=strict", "-Xskip-metadata-version-check")
     compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
+    compilerOptions.languageVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9
+    compilerOptions.apiVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9
   }
 }
 
@@ -46,6 +47,7 @@ dependencies {
   implementation(libs.springboot4.starter.web)
   implementation(libs.springboot4.starter.webflux)
   implementation(libs.springboot4.starter.websocket)
+  implementation(libs.springboot4.starter.restclient)
   implementation(Config.Libs.aspectj)
   implementation(Config.Libs.kotlinReflect)
   implementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
diff --git a/sentry-samples/sentry-samples-spring-boot-4-opentelemetry/src/main/java/io/sentry/samples/spring/boot/jakarta/SecurityConfiguration.java b/sentry-samples/sentry-samples-spring-boot-4-opentelemetry/src/main/java/io/sentry/samples/spring/boot/jakarta/SecurityConfiguration.java
@@ -18,9 +18,10 @@ public class SecurityConfiguration {
   @SuppressWarnings({"lgtm[java/spring-disabled-csrf-protection]", "removal"})
   @Bean
   public SecurityFilterChain filterChain(final @NotNull HttpSecurity http) throws Exception {
-    http.csrf().disable().authorizeHttpRequests().anyRequest().authenticated().and().httpBasic();
-
-    return http.build();
+    return http.csrf((csrf) -> csrf.disable())
+        .authorizeHttpRequests((r) -> r.anyRequest().authenticated())
+        .httpBasic((h) -> {})
+        .build();
   }
 
   @Bean
diff --git a/sentry-samples/sentry-samples-spring-boot-4-opentelemetry/src/main/java/io/sentry/samples/spring/boot/jakarta/SentryDemoApplication.java b/sentry-samples/sentry-samples-spring-boot-4-opentelemetry/src/main/java/io/sentry/samples/spring/boot/jakarta/SentryDemoApplication.java
@@ -10,7 +10,7 @@
 import org.quartz.SimpleTrigger;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.web.client.RestTemplateBuilder;
+import org.springframework.boot.restclient.RestTemplateBuilder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.quartz.CronTriggerFactoryBean;
diff --git a/sentry-samples/sentry-samples-spring-boot-4-webflux/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot-4-webflux/build.gradle.kts
@@ -46,8 +46,13 @@ configure<SourceSetContainer> { test { java.srcDir("src/test/java") } }
 
 tasks.withType<KotlinCompile>().configureEach {
   kotlin {
-    compilerOptions.freeCompilerArgs = listOf("-Xjsr305=strict")
+    explicitApi()
+    // skip metadata version check, as Spring 7 / Spring Boot 4 is
+    // compiled against a newer version of Kotlin
+    compilerOptions.freeCompilerArgs = listOf("-Xjsr305=strict", "-Xskip-metadata-version-check")
     compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
+    compilerOptions.languageVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9
+    compilerOptions.apiVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9
   }
 }
 
diff --git a/sentry-samples/sentry-samples-spring-boot-4/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot-4/build.gradle.kts
@@ -23,14 +23,15 @@ configure<JavaPluginExtension> {
   targetCompatibility = JavaVersion.VERSION_17
 }
 
-tasks.withType<KotlinCompile>().configureEach {
-  compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
-}
-
 tasks.withType<KotlinCompile>().configureEach {
   kotlin {
-    compilerOptions.freeCompilerArgs = listOf("-Xjsr305=strict")
+    explicitApi()
+    // skip metadata version check, as Spring 7 / Spring Boot 4 is
+    // compiled against a newer version of Kotlin
+    compilerOptions.freeCompilerArgs = listOf("-Xjsr305=strict", "-Xskip-metadata-version-check")
     compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
+    compilerOptions.languageVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9
+    compilerOptions.apiVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9
   }
 }
 
@@ -45,6 +46,7 @@ dependencies {
   implementation(libs.springboot4.starter.web)
   implementation(libs.springboot4.starter.webflux)
   implementation(libs.springboot4.starter.websocket)
+  implementation(libs.springboot4.starter.restclient)
   implementation(Config.Libs.aspectj)
   implementation(Config.Libs.kotlinReflect)
   implementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
diff --git a/sentry-samples/sentry-samples-spring-boot-4/src/main/java/io/sentry/samples/spring/boot/jakarta/SecurityConfiguration.java b/sentry-samples/sentry-samples-spring-boot-4/src/main/java/io/sentry/samples/spring/boot/jakarta/SecurityConfiguration.java
@@ -18,9 +18,10 @@ public class SecurityConfiguration {
   @SuppressWarnings({"lgtm[java/spring-disabled-csrf-protection]", "removal"})
   @Bean
   public SecurityFilterChain filterChain(final @NotNull HttpSecurity http) throws Exception {
-    http.csrf().disable().authorizeHttpRequests().anyRequest().authenticated().and().httpBasic();
-
-    return http.build();
+    return http.csrf((csrf) -> csrf.disable())
+        .authorizeHttpRequests((r) -> r.anyRequest().authenticated())
+        .httpBasic((h) -> {})
+        .build();
   }
 
   @Bean
diff --git a/sentry-samples/sentry-samples-spring-boot-4/src/main/java/io/sentry/samples/spring/boot/jakarta/SentryDemoApplication.java b/sentry-samples/sentry-samples-spring-boot-4/src/main/java/io/sentry/samples/spring/boot/jakarta/SentryDemoApplication.java
@@ -8,7 +8,7 @@
 import org.quartz.SimpleTrigger;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.web.client.RestTemplateBuilder;
+import org.springframework.boot.restclient.RestTemplateBuilder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.quartz.CronTriggerFactoryBean;
diff --git a/sentry-servlet-jakarta/src/test/kotlin/io/sentry/servlet/jakarta/SentryRequestHttpServletRequestProcessorTest.kt b/sentry-servlet-jakarta/src/test/kotlin/io/sentry/servlet/jakarta/SentryRequestHttpServletRequestProcessorTest.kt
@@ -145,7 +145,7 @@ fun toRequestUrl(uri: URI): StringBuffer? {
     url.append(':').append(port)
   }
 
-  if (uri?.isNotBlank()) {
+  if (uri.isNotBlank()) {
     url.append(uri)
   }
   return url
diff --git a/sentry-spring-7/build.gradle.kts b/sentry-spring-7/build.gradle.kts
@@ -57,11 +57,11 @@ dependencies {
   // tests
   testImplementation(projects.sentryTestSupport)
   testImplementation(projects.sentryGraphql)
-  testImplementation(kotlin(Config.kotlinStdLib, "2.2.0"))
+  testImplementation(kotlin(Config.kotlinStdLib))
   testImplementation(libs.awaitility.kotlin.spring7)
   testImplementation(libs.context.propagation)
   testImplementation(libs.graphql.java24)
-  testImplementation(kotlin(Config.kotlinTestJunit, "2.2.0"))
+  testImplementation(libs.kotlin.test.junit)
   testImplementation(libs.mockito.kotlin.spring7)
   testImplementation(libs.mockito.inline)
   testImplementation(libs.springboot4.starter.aop)
@@ -70,6 +70,8 @@ dependencies {
   testImplementation(libs.springboot4.starter.test)
   testImplementation(libs.springboot4.starter.web)
   testImplementation(libs.springboot4.starter.webflux)
+  testImplementation(libs.springboot4.starter.restclient)
+  testImplementation(libs.springboot4.starter.webclient)
   testImplementation(projects.sentryReactor)
 }
 
@@ -129,8 +131,8 @@ tasks.jar {
 kotlin {
   explicitApi()
   compilerOptions {
-    // skip metadata version check, as androidx.sqlite:sqlite is compiled against a newer version of
-    // Kotlin
+    // skip metadata version check, as Spring 7 / Spring Boot 4 is
+    // compiled against a newer version of Kotlin
     freeCompilerArgs.add("-Xskip-metadata-version-check")
   }
 }
diff --git a/sentry-spring-boot-4/build.gradle.kts b/sentry-spring-boot-4/build.gradle.kts
@@ -7,8 +7,8 @@ plugins {
   id("io.sentry.javadoc")
   //  alias(libs.plugins.kotlin.jvm)
   jacoco
-  alias(libs.plugins.kotlin.jvm.spring7)
-  alias(libs.plugins.kotlin.spring7)
+  alias(libs.plugins.kotlin.jvm)
+  alias(libs.plugins.kotlin.spring)
   alias(libs.plugins.errorprone)
   alias(libs.plugins.gradle.versions)
   alias(libs.plugins.buildconfig)
@@ -23,7 +23,7 @@ configure<JavaPluginExtension> {
 tasks.withType<KotlinCompile>().configureEach {
   compilerOptions {
     jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)
-    languageVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_1)
+    languageVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9)
     freeCompilerArgs.add("-Xjsr305=strict")
   }
 }
@@ -94,6 +94,8 @@ dependencies {
   testImplementation(libs.springboot4.starter.test)
   testImplementation(libs.springboot4.starter.web)
   testImplementation(libs.springboot4.starter.webflux)
+  testImplementation(libs.springboot4.starter.restclient)
+  testImplementation(libs.springboot4.starter.webclient)
 }
 
 configure<SourceSetContainer> { test { java.srcDir("src/test/java") } }
@@ -152,8 +154,8 @@ tasks.jar {
 kotlin {
   explicitApi()
   compilerOptions {
-    // skip metadata version check, as androidx.sqlite:sqlite is compiled against a newer version of
-    // Kotlin
+    // skip metadata version check, as Spring 7 / Spring Boot 4 is
+    // compiled against a newer version of Kotlin
     freeCompilerArgs.add("-Xskip-metadata-version-check")
   }
 }
diff --git a/sentry-spring-boot-4/src/test/kotlin/io/sentry/spring/boot/jakarta/SentryAutoConfigurationTest.kt b/sentry-spring-boot-4/src/test/kotlin/io/sentry/spring/boot/jakarta/SentryAutoConfigurationTest.kt
@@ -24,6 +24,7 @@ import io.sentry.opentelemetry.agent.AgentMarker
 import io.sentry.protocol.SentryTransaction
 import io.sentry.protocol.User
 import io.sentry.quartz.SentryJobListener
+import io.sentry.spring.boot4.BuildConfig
 import io.sentry.spring.jakarta.ContextTagsEventProcessor
 import io.sentry.spring.jakarta.HttpServletRequestSentryUserProvider
 import io.sentry.spring.jakarta.SentryExceptionResolver
@@ -58,15 +59,15 @@ import org.quartz.core.QuartzScheduler
 import org.slf4j.MDC
 import org.springframework.aop.support.NameMatchMethodPointcut
 import org.springframework.boot.autoconfigure.AutoConfigurations
-import org.springframework.boot.autoconfigure.quartz.QuartzAutoConfiguration
-import org.springframework.boot.autoconfigure.quartz.SchedulerFactoryBeanCustomizer
-import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration
 import org.springframework.boot.context.annotation.UserConfigurations
 import org.springframework.boot.info.GitProperties
+import org.springframework.boot.quartz.autoconfigure.QuartzAutoConfiguration
+import org.springframework.boot.quartz.autoconfigure.SchedulerFactoryBeanCustomizer
 import org.springframework.boot.test.context.FilteredClassLoader
 import org.springframework.boot.test.context.assertj.ApplicationContextAssert
 import org.springframework.boot.test.context.runner.WebApplicationContextRunner
 import org.springframework.boot.web.servlet.FilterRegistrationBean
+import org.springframework.boot.webmvc.autoconfigure.WebMvcAutoConfiguration
 import org.springframework.context.ApplicationContext
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
@@ -317,7 +318,7 @@ class SentryAutoConfigurationTest {
               assertThat(event.sdk).isNotNull
               val sdk = event.sdk!!
               assertThat(sdk.version).isEqualTo(BuildConfig.VERSION_NAME)
-              assertThat(sdk.name).isEqualTo(BuildConfig.SENTRY_SPRING_BOOT_JAKARTA_SDK_NAME)
+              assertThat(sdk.name).isEqualTo(BuildConfig.SENTRY_SPRING_BOOT_4_SDK_NAME)
               assertThat(sdk.packageSet).anyMatch { pkg ->
                 pkg.name == "maven:io.sentry:sentry-spring-boot-starter-jakarta" &&
                   pkg.version == BuildConfig.VERSION_NAME
diff --git a/sentry-spring-boot-4/src/test/kotlin/io/sentry/spring/boot/jakarta/SentrySpanRestTemplateCustomizerTest.kt b/sentry-spring-boot-4/src/test/kotlin/io/sentry/spring/boot/jakarta/SentrySpanRestTemplateCustomizerTest.kt
@@ -30,7 +30,7 @@ import org.mockito.kotlin.doAnswer
 import org.mockito.kotlin.mock
 import org.mockito.kotlin.verify
 import org.mockito.kotlin.whenever
-import org.springframework.boot.web.client.RestTemplateBuilder
+import org.springframework.boot.restclient.RestTemplateBuilder
 import org.springframework.http.HttpEntity
 import org.springframework.http.HttpHeaders
 import org.springframework.http.HttpMethod
@@ -43,8 +43,8 @@ class SentrySpanRestTemplateCustomizerTest {
     val scopes = mock<IScopes>()
     val restTemplate =
       RestTemplateBuilder()
-        .setConnectTimeout(Duration.ofSeconds(2))
-        .setReadTimeout(Duration.ofSeconds(2))
+        .connectTimeout(Duration.ofSeconds(2))
+        .readTimeout(Duration.ofSeconds(2))
         .build()
     var mockServer = MockWebServer()
     val transaction: SentryTracer
diff --git a/sentry-spring-boot-4/src/test/kotlin/io/sentry/spring/boot/jakarta/SentryWebfluxAutoConfigurationTest.kt b/sentry-spring-boot-4/src/test/kotlin/io/sentry/spring/boot/jakarta/SentryWebfluxAutoConfigurationTest.kt
diff --git a/sentry-spring-boot-4/src/test/kotlin/io/sentry/spring/boot/jakarta/it/SentrySpringIntegrationTest.kt b/sentry-spring-boot-4/src/test/kotlin/io/sentry/spring/boot/jakarta/it/SentrySpringIntegrationTest.kt

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ import io.gitlab.arturbosch.detekt.Detekt`
`3`	`3`	`plugins {`
`4`	`4`	`id("com.android.application")`
`5`	`5`	`alias(libs.plugins.kotlin.android)`
`6`		`- alias(libs.plugins.kotlin.compose)`
	`6`	`+ // alias(libs.plugins.kotlin.compose)`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`android {`
Original file line number	Diff line number	Diff line change
`@@ -19,10 +19,10 @@ kotlin {`
`19`	`19`
`20`	`20`	`androidTarget {`
`21`	`21`	`publishLibraryVariants("release")`
`22`		`- compilerOptions { jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.fromTarget("1.8")) }`
	`22`	`+ compilations.all { kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString() }`
`23`	`23`	`}`
`24`	`24`	`jvm("desktop") {`
`25`		`- compilerOptions { jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.fromTarget("1.8")) }`
	`25`	`+ compilations.all { kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString() }`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`sourceSets.all {`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import org.gradle.internal.extensions.stdlib.capitalized`
`6`	`6`	`plugins {`
`7`	`7`	`id("com.android.application")`
`8`	`8`	`alias(libs.plugins.kotlin.android)`
`9`		`- alias(libs.plugins.kotlin.compose)`
	`9`	`+ // alias(libs.plugins.kotlin.compose)`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`android {`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,12 @@ tasks.withType<Test>().configureEach { useJUnitPlatform() }`
`46`	`46`
`47`	`47`	`tasks.withType<KotlinCompile>().configureEach {`
`48`	`48`	`kotlin {`
`49`		`- compilerOptions.freeCompilerArgs = listOf("-Xjsr305=strict")`
	`49`	`+ explicitApi()`
	`50`	`+ // skip metadata version check, as Spring 7 / Spring Boot 4 is`
	`51`	`+ // compiled against a newer version of Kotlin`
	`52`	`+ compilerOptions.freeCompilerArgs = listOf("-Xjsr305=strict", "-Xskip-metadata-version-check")`
`50`	`53`	`compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17`
	`54`	`+ compilerOptions.languageVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9`
	`55`	`+ compilerOptions.apiVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9`
`51`	`56`	`}`
`52`	`57`	`}`