fix(build): remove Spring Boot 2 Gradle plugin for Gradle 9 compatibility

build.gradle.kts

@@ -87,7 +87,9 @@ apiValidation {
             "test-app-sentry",
             "test-app-size",
             "sentry-samples-netflix-dgs",
-            "sentry-samples-console-otlp"
+            "sentry-samples-console-otlp",
+            "sentry-test-support",
+            "sentry-system-test-support"
         )
     )
 }

gradle/libs.versions.toml

@@ -61,14 +61,13 @@ detekt = { id = "io.gitlab.arturbosch.detekt", version = "1.23.8" }
 jacoco-android = { id = "com.mxalbert.gradle.jacoco-android", version = "0.2.0" }
 kover = { id = "org.jetbrains.kotlinx.kover", version = "0.7.3" }
 vanniktech-maven-publish = { id = "com.vanniktech.maven.publish", version = "0.30.0" }
-springboot2 = { id = "org.springframework.boot", version.ref = "springboot2" }
 springboot3 = { id = "org.springframework.boot", version.ref = "springboot3" }
 springboot4 = { id = "org.springframework.boot", version.ref = "springboot4" }
 spring-dependency-management = { id = "io.spring.dependency-management", version = "1.1.7" }
 gretty = { id = "org.gretty", version = "4.0.0" }
 animalsniffer = { id = "ru.vyarus.animalsniffer", version = "2.0.1" }
 sentry = { id = "io.sentry.android.gradle", version = "6.0.0-alpha.6"}
-shadow = { id = "com.gradleup.shadow", version = "8.3.6" }
+shadow = { id = "com.gradleup.shadow", version = "9.4.1" }
 
 [libraries]
 apache-httpclient = { module = "org.apache.httpcomponents.client5:httpclient5", version = "5.0.4" }
@@ -159,6 +158,7 @@ slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
 slf4j-jdk14 = { module = "org.slf4j:slf4j-jdk14", version.ref = "slf4j" }
 slf4j2-api = { module = "org.slf4j:slf4j-api", version = "2.0.5" }
 spotlessLib = { module = "com.diffplug.spotless:com.diffplug.spotless.gradle.plugin", version.ref = "spotless"}
+springboot2-bom = { module = "org.springframework.boot:spring-boot-dependencies", version.ref = "springboot2" }
 springboot-starter = { module = "org.springframework.boot:spring-boot-starter", version.ref = "springboot2" }
 springboot-starter-graphql = { module = "org.springframework.boot:spring-boot-starter-graphql", version.ref = "springboot2" }
 springboot-starter-quartz = { module = "org.springframework.boot:spring-boot-starter-quartz", version.ref = "springboot2" }

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

@@ -81,6 +81,8 @@ android {
   lint {
     warningsAsErrors = true
     checkDependencies = true
+    // Suppress OldTargetApi: lint 8.13.1 expects API 37 but we target 36
+    disable += "OldTargetApi"
 
     // We run a full lint analysis as build part in CI, so skip vital checks for assemble tasks.
     checkReleaseBuilds = false

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

@@ -74,6 +74,8 @@ android {
   lint {
     warningsAsErrors = true
     checkDependencies = true
+    // Suppress OldTargetApi: lint 8.13.1 expects API 37 but we target 36
+    disable += "OldTargetApi"
 
     // We run a full lint analysis as build part in CI, so skip vital checks for assemble tasks.
     checkReleaseBuilds = false

sentry-opentelemetry/sentry-opentelemetry-agent/build.gradle.kts

@@ -150,9 +150,22 @@ tasks {
 
     archiveClassifier.set("")
 
-    duplicatesStrategy = DuplicatesStrategy.FAIL
-
-    mergeServiceFiles { include("inst/META-INF/services/*") }
+    // INCLUDE is required so that mergeServiceFiles can see duplicates from both the
+    // upstream agent JAR and the isolated distro libs before they are deduplicated.
+    // Shadow 9.x enforces duplicatesStrategy before transformers run, so FAIL/EXCLUDE
+    // would prevent service file merging.
+    duplicatesStrategy = DuplicatesStrategy.INCLUDE
+
+    // Shadow 9.x only applies relocations to service files handled by a ServiceFileTransformer.
+    // We need two mergeServiceFiles calls:
+    // 1. Default path (META-INF/services) — ensures bootstrap service files get relocated
+    //    (e.g., ContextStorageProvider → shaded path). Without this, Shadow 9.x skips
+    //    relocation for service file names/contents not claimed by a transformer.
+    // 2. inst/ path — merges isolated agent service files from both the upstream agent
+    //    and the distro libs. Uses `path` instead of `include` filter because Shadow 9.x's
+    //    include() strips the `inst/` prefix on output.
+    mergeServiceFiles()
+    mergeServiceFiles { path = "inst/META-INF/services" }
     exclude("**/module-info.class")
     relocatePackages(this)
 

sentry-samples/sentry-samples-console-opentelemetry-noagent/build.gradle.kts

@@ -48,6 +48,7 @@ dependencies {
 tasks.shadowJar {
   manifest { attributes["Main-Class"] = "io.sentry.samples.console.Main" }
   archiveClassifier.set("") // Remove the classifier so it replaces the regular JAR
+  duplicatesStrategy = DuplicatesStrategy.INCLUDE
   mergeServiceFiles()
 }
 
@@ -66,6 +67,10 @@ tasks.register<Test>("systemTest").configure {
   group = "verification"
   description = "Runs the System tests"
 
+  val test = project.extensions.getByType<SourceSetContainer>()["test"]
+  testClassesDirs = test.output.classesDirs
+  classpath = test.runtimeClasspath
+
   outputs.upToDateWhen { false }
 
   maxParallelForks = 1

sentry-samples/sentry-samples-console-otlp/build.gradle.kts

@@ -51,6 +51,7 @@ dependencies {
 tasks.shadowJar {
   manifest { attributes["Main-Class"] = "io.sentry.samples.console.Main" }
   archiveClassifier.set("") // Remove the classifier so it replaces the regular JAR
+  duplicatesStrategy = DuplicatesStrategy.INCLUDE
   mergeServiceFiles()
 }
 
@@ -69,6 +70,10 @@ tasks.register<Test>("systemTest").configure {
   group = "verification"
   description = "Runs the System tests"
 
+  val test = project.extensions.getByType<SourceSetContainer>()["test"]
+  testClassesDirs = test.output.classesDirs
+  classpath = test.runtimeClasspath
+
   outputs.upToDateWhen { false }
 
   maxParallelForks = 1

sentry-samples/sentry-samples-console/build.gradle.kts

@@ -69,6 +69,10 @@ tasks.register<Test>("systemTest").configure {
   group = "verification"
   description = "Runs the System tests"
 
+  val test = project.extensions.getByType<SourceSetContainer>()["test"]
+  testClassesDirs = test.output.classesDirs
+  classpath = test.runtimeClasspath
+
   outputs.upToDateWhen { false }
 
   maxParallelForks = 1

sentry-samples/sentry-samples-jul/build.gradle.kts

@@ -62,6 +62,10 @@ tasks.register<Test>("systemTest").configure {
   group = "verification"
   description = "Runs the System tests"
 
+  val test = project.extensions.getByType<SourceSetContainer>()["test"]
+  testClassesDirs = test.output.classesDirs
+  classpath = test.runtimeClasspath
+
   outputs.upToDateWhen { false }
 
   maxParallelForks = 1

sentry-samples/sentry-samples-log4j2/build.gradle.kts

@@ -45,6 +45,7 @@ dependencies {
 tasks.shadowJar {
   manifest { attributes["Main-Class"] = "io.sentry.samples.log4j2.Main" }
   archiveClassifier.set("") // Remove the classifier so it replaces the regular JAR
+  duplicatesStrategy = DuplicatesStrategy.INCLUDE
   mergeServiceFiles()
   // Use Log4j2 cache transformer to properly handle plugin files
   transform(
@@ -67,6 +68,10 @@ tasks.register<Test>("systemTest").configure {
   group = "verification"
   description = "Runs the System tests"
 
+  val test = project.extensions.getByType<SourceSetContainer>()["test"]
+  testClassesDirs = test.output.classesDirs
+  classpath = test.runtimeClasspath
+
   outputs.upToDateWhen { false }
 
   maxParallelForks = 1

sentry-samples/sentry-samples-logback/build.gradle.kts

@@ -62,6 +62,10 @@ tasks.register<Test>("systemTest").configure {
   group = "verification"
   description = "Runs the System tests"
 
+  val test = project.extensions.getByType<SourceSetContainer>()["test"]
+  testClassesDirs = test.output.classesDirs
+  classpath = test.runtimeClasspath
+
   outputs.upToDateWhen { false }
 
   maxParallelForks = 1

sentry-samples/sentry-samples-netflix-dgs/build.gradle.kts

@@ -1,13 +1,20 @@
+import java.net.URI
+import java.nio.file.FileSystems
+import java.nio.file.Files
+import java.util.zip.ZipFile
 import org.jetbrains.kotlin.config.KotlinCompilerVersion
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-  alias(libs.plugins.springboot2)
-  alias(libs.plugins.spring.dependency.management)
+  java
+  application
+  alias(libs.plugins.shadow)
   alias(libs.plugins.kotlin.jvm)
   alias(libs.plugins.kotlin.spring)
 }
 
+application { mainClass.set("io.sentry.samples.netflix.dgs.NetlixDgsApplication") }
+
 group = "io.sentry.sample.spring-boot"
 
 version = "0.0.1-SNAPSHOT"
@@ -19,6 +26,7 @@ java.targetCompatibility = JavaVersion.VERSION_1_8
 repositories { mavenCentral() }
 
 dependencies {
+  implementation(platform(libs.springboot2.bom))
   implementation(libs.springboot.starter.web)
   implementation(Config.Libs.kotlinReflect)
   implementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
@@ -32,6 +40,62 @@ dependencies {
   }
 }
 
+// Configure the Shadow JAR (executable JAR with all dependencies)
+tasks.shadowJar {
+  manifest { attributes["Main-Class"] = "io.sentry.samples.netflix.dgs.NetlixDgsApplication" }
+  archiveClassifier.set("")
+  mergeServiceFiles()
+
+  val springMetadataFiles =
+    listOf(
+      "META-INF/spring.factories",
+      "META-INF/spring.handlers",
+      "META-INF/spring.schemas",
+      "META-INF/spring-autoconfigure-metadata.properties",
+      "META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports",
+      "META-INF/spring/org.springframework.boot.actuate.autoconfigure.web.ManagementContextConfiguration.imports",
+    )
+
+  doLast {
+    val jar = archiveFile.get().asFile
+    val runtimeJars =
+      project.configurations.getByName("runtimeClasspath").resolve().filter {
+        it.name.endsWith(".jar")
+      }
+    val uri = URI.create("jar:${jar.toURI()}")
+    FileSystems.newFileSystem(uri, mapOf("create" to "false")).use { fs ->
+      springMetadataFiles.forEach { entryPath ->
+        val merged = StringBuilder()
+        runtimeJars.forEach { depJar ->
+          try {
+            val zip = ZipFile(depJar)
+            val entry = zip.getEntry(entryPath)
+            if (entry != null) {
+              merged.append(zip.getInputStream(entry).bufferedReader().readText())
+              if (!merged.endsWith("\n")) merged.append("\n")
+            }
+            zip.close()
+          } catch (e: Exception) {
+            /* skip non-zip files */
+          }
+        }
+        if (merged.isNotEmpty()) {
+          val target = fs.getPath(entryPath)
+          if (target.parent != null) Files.createDirectories(target.parent)
+          Files.write(target, merged.toString().toByteArray())
+        }
+      }
+    }
+  }
+}
+
+tasks.jar {
+  enabled = false
+  dependsOn(tasks.shadowJar)
+}
+
+tasks.startScripts { dependsOn(tasks.shadowJar) }
+
 tasks.withType<Test>().configureEach { useJUnitPlatform() }
 
 tasks.withType<KotlinCompile>().configureEach {

sentry-samples/sentry-samples-spring-7/build.gradle.kts

@@ -73,6 +73,10 @@ tasks.register<Test>("systemTest").configure {
   group = "verification"
   description = "Runs the System tests"
 
+  val test = project.extensions.getByType<SourceSetContainer>()["test"]
+  testClassesDirs = test.output.classesDirs
+  classpath = test.runtimeClasspath
+
   outputs.upToDateWhen { false }
 
   maxParallelForks = 1

sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/build.gradle.kts

@@ -82,6 +82,10 @@ tasks.register<Test>("systemTest").configure {
   group = "verification"
   description = "Runs the System tests"
 
+  val test = project.extensions.getByType<SourceSetContainer>()["test"]
+  testClassesDirs = test.output.classesDirs
+  classpath = test.runtimeClasspath
+
   outputs.upToDateWhen { false }
 
   maxParallelForks = 1

sentry-samples/sentry-samples-spring-boot-4-opentelemetry/build.gradle.kts

@@ -110,6 +110,10 @@ tasks.register<Test>("systemTest").configure {
   group = "verification"
   description = "Runs the System tests"
 
+  val test = project.extensions.getByType<SourceSetContainer>()["test"]
+  testClassesDirs = test.output.classesDirs
+  classpath = test.runtimeClasspath
+
   outputs.upToDateWhen { false }
 
   maxParallelForks = 1

sentry-samples/sentry-samples-spring-boot-4-otlp/build.gradle.kts

@@ -87,6 +87,10 @@ tasks.register<Test>("systemTest").configure {
   group = "verification"
   description = "Runs the System tests"
 
+  val test = project.extensions.getByType<SourceSetContainer>()["test"]
+  testClassesDirs = test.output.classesDirs
+  classpath = test.runtimeClasspath
+
   outputs.upToDateWhen { false }
 
   maxParallelForks = 1

sentry-samples/sentry-samples-spring-boot-4-webflux/build.gradle.kts

@@ -66,6 +66,10 @@ tasks.register<Test>("systemTest").configure {
   group = "verification"
   description = "Runs the System tests"
 
+  val test = project.extensions.getByType<SourceSetContainer>()["test"]
+  testClassesDirs = test.output.classesDirs
+  classpath = test.runtimeClasspath
+
   outputs.upToDateWhen { false }
 
   maxParallelForks = 1

sentry-samples/sentry-samples-spring-boot-4/build.gradle.kts

@@ -84,6 +84,10 @@ tasks.register<Test>("systemTest").configure {
   group = "verification"
   description = "Runs the System tests"
 
+  val test = project.extensions.getByType<SourceSetContainer>()["test"]
+  testClassesDirs = test.output.classesDirs
+  classpath = test.runtimeClasspath
+
   outputs.upToDateWhen { false }
 
   maxParallelForks = 1

sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry-noagent/build.gradle.kts

@@ -18,6 +18,9 @@ java.targetCompatibility = JavaVersion.VERSION_17
 
 repositories { mavenCentral() }
 
+// Apollo 4.x requires coroutines 1.9.0+, override Spring Boot's managed version
+extra["kotlin-coroutines.version"] = "1.9.0"
+
 configure<JavaPluginExtension> {
   sourceCompatibility = JavaVersion.VERSION_17
   targetCompatibility = JavaVersion.VERSION_17
@@ -80,6 +83,10 @@ tasks.register<Test>("systemTest").configure {
   group = "verification"
   description = "Runs the System tests"
 
+  val test = project.extensions.getByType<SourceSetContainer>()["test"]
+  testClassesDirs = test.output.classesDirs
+  classpath = test.runtimeClasspath
+
   outputs.upToDateWhen { false }
 
   maxParallelForks = 1

sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry/build.gradle.kts

@@ -19,6 +19,9 @@ java.targetCompatibility = JavaVersion.VERSION_17
 
 repositories { mavenCentral() }
 
+// Apollo 4.x requires coroutines 1.9.0+, override Spring Boot's managed version
+extra["kotlin-coroutines.version"] = "1.9.0"
+
 configure<JavaPluginExtension> {
   sourceCompatibility = JavaVersion.VERSION_17
   targetCompatibility = JavaVersion.VERSION_17
@@ -114,6 +117,10 @@ tasks.register<Test>("systemTest").configure {
   group = "verification"
   description = "Runs the System tests"
 
+  val test = project.extensions.getByType<SourceSetContainer>()["test"]
+  testClassesDirs = test.output.classesDirs
+  classpath = test.runtimeClasspath
+
   outputs.upToDateWhen { false }
 
   maxParallelForks = 1

sentry-samples/sentry-samples-spring-boot-jakarta/build.gradle.kts

@@ -18,6 +18,9 @@ java.targetCompatibility = JavaVersion.VERSION_17
 
 repositories { mavenCentral() }
 
+// Apollo 4.x requires coroutines 1.9.0+, override Spring Boot's managed version
+extra["kotlin-coroutines.version"] = "1.9.0"
+
 configure<JavaPluginExtension> {
   sourceCompatibility = JavaVersion.VERSION_17
   targetCompatibility = JavaVersion.VERSION_17
@@ -69,7 +72,6 @@ dependencies {
   testImplementation(kotlin(Config.kotlinStdLib))
   testImplementation(projects.sentry)
   testImplementation(projects.sentrySystemTestSupport)
-  testImplementation(libs.apollo3.kotlin)
   testImplementation(libs.kotlin.test.junit)
   testImplementation(libs.slf4j2.api)
   testImplementation(libs.springboot3.starter.test) {
@@ -85,6 +87,10 @@ tasks.register<Test>("systemTest").configure {
   group = "verification"
   description = "Runs the System tests"
 
+  val test = project.extensions.getByType<SourceSetContainer>()["test"]
+  testClassesDirs = test.output.classesDirs
+  classpath = test.runtimeClasspath
+
   outputs.upToDateWhen { false }
 
   maxParallelForks = 1