build(samples): Prepare the samples to build outside the SDK build

The samples and Android integration tests are about to become their own
builds, which include the SDK build. Several things tie them to the SDK
build today:

- They call buildSrc's Config, which other builds cannot see. They now
  name the coordinates directly, the way a customer's build would.
- Five samples' shadowJar tasks use buildSrc's MergeSpringMetadataAction,
  which only the samples use. It moves to build-logic, which the new
  builds can include.
- They pick the Kotlin stdlib version with KotlinCompilerVersion, a
  compiler-internal class that came from buildSrc's classpath. They now
  use KGP's getKotlinPluginVersion(), which returns the same version.
- AGP came from Config.AGP on the root buildscript classpath. A composite
  build must use a single AGP version, so it now comes from the version
  catalog, and each build's settings applies the AGP matrix job's
  VERSION_AGP override.
- The javac -Xlint:all -Werror flags came from the root allprojects
  block. They move to the io.sentry.jdk-target convention, which every
  subproject already applies and the new builds can apply too.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

Author: runningcode

build-logic/src/main/kotlin/io/sentry/gradle/JdkTargetConvention.kt

@@ -33,9 +33,23 @@ private val PUBLISHED_JAVA_VERSION = JavaVersion.VERSION_1_8
  *   archives are checked for it
  * - published Android modules main code targets Java 1.8
  * - minSdk is set for Android libraries
+ * - javac warnings fail the build
  */
 class JdkTargetConvention : Plugin<Project> {
   override fun apply(project: Project) {
+    project.tasks.withType(JavaCompile::class.java).configureEach {
+      options.compilerArgs.addAll(
+        listOf(
+          "-Xlint:all",
+          "-Werror",
+          "-Xlint:-classfile",
+          "-Xlint:-processing",
+          "-Xlint:-try",
+          "-Xlint:-options",
+        )
+      )
+    }
+
     project.plugins.withType(JavaBasePlugin::class.java) {
       project.extensions.getByType(JavaPluginExtension::class.java).toolchain {
         languageVersion.set(BUILD_JDK)

…c/main/java/MergeSpringMetadataAction.kt …ntry/gradle/MergeSpringMetadataAction.ktbuildSrc/src/main/java/MergeSpringMetadataAction.kt renamed to build-logic/src/main/kotlin/io/sentry/gradle/MergeSpringMetadataAction.kt buildSrc/src/main/java/MergeSpringMetadataAction.kt renamed to build-logic/src/main/kotlin/io/sentry/gradle/MergeSpringMetadataAction.kt

@@ -1,3 +1,5 @@
+package io.sentry.gradle
+
 import java.net.URI
 import java.nio.file.FileSystems
 import java.nio.file.Files

build.gradle.kts

@@ -27,15 +27,14 @@ plugins {
     alias(libs.plugins.spring.dependency.management) apply false
     id("io.sentry.javadoc.aggregate")
     alias(libs.plugins.sentry) apply false
+    alias(libs.plugins.android.application) apply false
 }
 
 buildscript {
     repositories {
         google()
     }
     dependencies {
-        classpath(Config.BuildPlugins.androidGradle)
-
         // add classpath of sentry android gradle plugin
         // classpath("io.sentry:sentry-android-gradle-plugin:{version}")
 
@@ -102,9 +101,6 @@ allprojects {
                 TestLogEvent.FAILED
             )
         }
-        withType<JavaCompile>().configureEach {
-            options.compilerArgs.addAll(arrayOf("-Xlint:all", "-Werror", "-Xlint:-classfile", "-Xlint:-processing", "-Xlint:-try", "-Xlint:-options"))
-        }
     }
 }
 

buildSrc/src/main/java/Config.kt

@@ -1,14 +1,9 @@
 
 object Config {
-    val AGP = System.getenv("VERSION_AGP") ?: "9.4.0"
     val kotlinStdLib = "stdlib-jdk8"
     val kotlinStdLibVersionAndroid = "1.9.24"
     val kotlinTestJunit = "test-junit"
 
-    object BuildPlugins {
-        val androidGradle = "com.android.tools.build:gradle:$AGP"
-    }
-
     object Android {
         val abiFilters = listOf("x86", "armeabi-v7a", "x86_64", "arm64-v8a")
 

gradle/libs.versions.toml

@@ -38,8 +38,7 @@ retrofit = "2.9.0"
 room2 = "2.8.4"
 room3 = "3.0.0-rc01"
 sagp = "6.13.0"
-# Compile-time only, for the AGP types the build-logic convention plugins use. The AGP that
-# actually runs the build comes from the root buildscript (Config.AGP, overridable via VERSION_AGP).
+# The AGP matrix job overrides this with the VERSION_AGP env var, through each build's settings.
 agp = "9.4.0"
 sqlite = "2.6.2"
 sqliteRc = "2.7.0-rc01" # Required by Room3 3.0.0-rc*
@@ -59,7 +58,8 @@ compileSdkMinor = "2"
 minSdk = "21"
 
 [plugins]
-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+android-application = { id = "com.android.application", version.ref = "agp" }
+kotlin-android ={ id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlin-spring = { id = "org.jetbrains.kotlin.plugin.spring", version.ref = "kotlin" }
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }

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

@@ -1,4 +1,5 @@
 import io.gitlab.arturbosch.detekt.Detekt
+import org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion
 
 plugins {
   id("com.android.application")
@@ -35,14 +36,12 @@ android {
   buildFeatures { compose = true }
   composeOptions { kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get() }
   androidComponents.beforeVariants {
-    it.enable = !Config.Android.shouldSkipDebugVariant(it.buildType)
+    it.enable = it.buildType != "debug"
   }
 }
 
 dependencies {
-  implementation(
-    kotlin(Config.kotlinStdLib, org.jetbrains.kotlin.config.KotlinCompilerVersion.VERSION)
-  )
+  implementation(kotlin("stdlib-jdk8", getKotlinPluginVersion()))
   implementation(libs.androidx.activity.compose)
   implementation(libs.androidx.compose.foundation)
   implementation(libs.androidx.compose.material3)

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

@@ -1,5 +1,6 @@
 import io.gitlab.arturbosch.detekt.Detekt
 import net.ltgt.gradle.errorprone.errorprone
+import org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion
 
 plugins {
   id("com.android.application")
@@ -86,9 +87,7 @@ if (applySentryIntegrations) {
 }
 
 dependencies {
-  implementation(
-    kotlin(Config.kotlinStdLib, org.jetbrains.kotlin.config.KotlinCompilerVersion.VERSION)
-  )
+  implementation(kotlin("stdlib-jdk8", getKotlinPluginVersion()))
 
   if (applySentryIntegrations) {
     implementation(projects.sentryAndroid)

sentry-android-integration-tests/test-app-size/build.gradle.kts

@@ -31,7 +31,7 @@ android {
     targetCompatibility = JavaVersion.VERSION_17
   }
   androidComponents.beforeVariants {
-    it.enable = !Config.Android.shouldSkipDebugVariant(it.buildType)
+    it.enable = it.buildType != "debug"
   }
 }
 

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

@@ -5,6 +5,7 @@ import io.sentry.android.gradle.extensions.InstrumentationFeature
 import io.sentry.android.gradle.extensions.SentryPluginExtension
 import org.apache.tools.ant.taskdefs.condition.Os
 import org.gradle.internal.extensions.stdlib.capitalized
+import org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion
 
 plugins {
   id("com.android.application")
@@ -64,7 +65,7 @@ android {
       }
     }
 
-    ndk { abiFilters.addAll(Config.Android.abiFilters) }
+    ndk { abiFilters.addAll(listOf("x86", "armeabi-v7a", "x86_64", "arm64-v8a")) }
   }
 
   lint {
@@ -172,9 +173,7 @@ sqldelight {
 }
 
 dependencies {
-  implementation(
-    kotlin(Config.kotlinStdLib, org.jetbrains.kotlin.config.KotlinCompilerVersion.VERSION)
-  )
+  implementation(kotlin("stdlib-jdk8", getKotlinPluginVersion()))
 
   implementation(projects.sentryAndroid)
   implementation(projects.sentryAndroidFragment)

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

@@ -1,4 +1,5 @@
-import org.jetbrains.kotlin.config.KotlinCompilerVersion
+import io.sentry.gradle.MergeSpringMetadataAction
+import org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
@@ -22,8 +23,8 @@ java.targetCompatibility = JavaVersion.VERSION_1_8
 dependencies {
   implementation(platform(libs.springboot2.bom))
   implementation(libs.springboot.starter.web)
-  implementation(Config.Libs.kotlinReflect)
-  implementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
+  implementation("org.jetbrains.kotlin:kotlin-reflect")
+  implementation(kotlin("stdlib-jdk8", getKotlinPluginVersion()))
   implementation(projects.sentrySpringBootStarter)
   implementation(projects.sentryGraphql)
   implementation(platform("com.netflix.graphql.dgs:graphql-dgs-platform-dependencies:4.9.2"))