ref(snapshot): Use AGP addGeneratedSourceDirectory API (#1117)

* ref(snapshot): Use AGP addGeneratedSourceDirectory API

Replace manual source set wiring and regex-based task dependency
matching with the proper AGP `addGeneratedSourceDirectory` API.
This lets AGP handle the source directory registration and task
dependency setup automatically per variant.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* fix(snapshot): Use per-variant task and java sources API

The previous approach used a single task and `sources.kotlin` which is
broken in AGP (https://issuetracker.google.com/issues/268248348).
Switch to `sources.java` and register a per-variant task so each
variant's unit test compilation gets its own generated source directory.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* ref(snapshot): Apply spotless formatting

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* fix(snapshot): Use per-variant output directory

Each variant's task was writing to the same output path, causing
overlapping-output errors and build cache corruption.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* fix(snapshot): Use AGP 9.0 hostTests API for source registration

AGP 9.0 deprecated `variant.unitTest` in favor of `variant.hostTests`.
Use the new API when running on AGP 9.0+ while keeping the old path
for older versions.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* fix(snapshot): Suppress deprecation error for unitTest on older AGP

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* ref(snapshot): Apply spotless formatting

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* Release: 6.2.0

---------

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: runningcode

plugin-build/src/main/kotlin/io/sentry/android/gradle/snapshot/GenerateSnapshotTestsTask.kt

@@ -1,5 +1,8 @@
 package io.sentry.android.gradle.snapshot
 
+import com.android.build.api.variant.ApplicationVariant
+import com.android.build.gradle.BaseExtension
+import io.sentry.android.gradle.SentryTasksProvider.capitalized
 import java.io.File
 import org.gradle.api.DefaultTask
 import org.gradle.api.Project
@@ -52,10 +55,11 @@ abstract class GenerateSnapshotTestsTask : DefaultTask() {
     fun register(
       project: Project,
       extension: SentrySnapshotExtension,
-      android: com.android.build.gradle.BaseExtension,
+      android: BaseExtension,
+      variant: ApplicationVariant,
     ): TaskProvider<GenerateSnapshotTestsTask> {
       return project.tasks.register(
-        "generateSnapshotTests",
+        "generateSentrySnapshotTests${variant.name.capitalized}",
         GenerateSnapshotTestsTask::class.java,
       ) { task ->
         task.includePrivatePreviews.set(extension.includePrivatePreviews)
@@ -65,7 +69,9 @@ abstract class GenerateSnapshotTestsTask : DefaultTask() {
             packages.ifEmpty { listOf(android.namespace!!) }
           }
         )
-        task.outputDir.set(project.layout.buildDirectory.dir("generated/sentry/snapshotTests"))
+        task.outputDir.set(
+          project.layout.buildDirectory.dir("generated/sentry/snapshotTests/${variant.name}")
+        )
       }
     }
 

plugin-build/src/main/kotlin/io/sentry/android/gradle/snapshot/SentrySnapshotPlugin.kt

@@ -1,6 +1,10 @@
 package io.sentry.android.gradle.snapshot
 
+import com.android.build.api.variant.ApplicationAndroidComponentsExtension
+import com.android.build.api.variant.HostTestBuilder
 import com.android.build.gradle.BaseExtension
+import io.sentry.android.gradle.util.AgpVersions
+import kotlin.jvm.java
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 
@@ -17,20 +21,33 @@ class SentrySnapshotPlugin : Plugin<Project> {
     project.pluginManager.withPlugin("app.cash.paparazzi") {
       val android = project.extensions.getByType(BaseExtension::class.java)
 
-      val generateTask = GenerateSnapshotTestsTask.register(project, extension, android)
-
       project.dependencies.add(
         "testImplementation",
         "io.github.sergio-sastre.ComposablePreviewScanner:android:0.8.1",
       )
 
-      // Wire source set and task dependencies eagerly — afterEvaluate is too late
-      // for the Kotlin compiler to pick up the generated sources.
-      android.sourceSets.getByName("test").kotlin.srcDir(generateTask.flatMap { it.outputDir })
+      val androidComponents =
+        project.extensions.getByType(ApplicationAndroidComponentsExtension::class.java)
 
-      project.tasks.configureEach { task ->
-        if (task.name.matches(Regex("(compile|ksp).*UnitTestKotlin"))) {
-          task.dependsOn(generateTask)
+      androidComponents.onVariants { variant ->
+        val generateTask = GenerateSnapshotTestsTask.register(project, extension, android, variant)
+        if (AgpVersions.isAGP90(AgpVersions.CURRENT)) {
+          // Right now it seems we only have HostTestBuilder.UNIT_TEST_TYPE as the key but we are
+          // creating screenshot tests like HostTestBuilder.SCREENSHOT_TEST_TYPE
+          // We should adjust this once the API is stable and documented.
+          variant.hostTests[HostTestBuilder.UNIT_TEST_TYPE]
+            // Using `sources?.kotlin` is broken so we have to use sources?.java:
+            // https://issuetracker.google.com/issues/268248348
+            ?.sources
+            ?.java
+            ?.addGeneratedSourceDirectory(generateTask, GenerateSnapshotTestsTask::outputDir)
+        } else {
+          // `unitTest` is deprecated, the replacement above is complex
+          @Suppress("DEPRECATION_ERROR")
+          variant.unitTest
+            ?.sources
+            ?.java
+            ?.addGeneratedSourceDirectory(generateTask, GenerateSnapshotTestsTask::outputDir)
         }
       }
     }

plugin-build/src/main/kotlin/io/sentry/android/gradle/util/Versions.kt

@@ -8,10 +8,13 @@ internal object AgpVersions {
   val CURRENT: SemVer = SemVer.parse(Version.ANDROID_GRADLE_PLUGIN_VERSION)
   val VERSION_7_4_0: SemVer = SemVer.parse("7.4.0-rc01")
   val VERSION_8_3_0: SemVer = SemVer.parse("8.3.0")
+  val VERSION_9_0_0: SemVer = SemVer.parse("9.0.0")
 
   fun isAGP74(current: SemVer) = current >= VERSION_7_4_0
 
   fun isAGP83(current: SemVer) = current >= VERSION_8_3_0
+
+  fun isAGP90(current: SemVer) = current >= VERSION_9_0_0
 }
 
 internal object GradleVersions {