feat(snapshot): Merge snapshot extension into main sentry DSL

Move snapshot configuration from the standalone `sentrySnapshot` plugin
into the main `sentry { snapshots { } }` extension. This consolidates
the DSL surface and auto-detects Paparazzi for test generation.

- Add `SnapshotsExtension` nested under `SentryPluginExtension`
- Move Paparazzi detection and test generation wiring into `SentryPlugin`
- Wire `sentryUploadSnapshots` task to Paparazzi output directory
- Rename generate task to `sentryGenerateSnapshotsTests` for consistency
- Remove standalone `SentrySnapshotPlugin` and `SentrySnapshotExtension`
- Use plural "snapshots" naming consistently

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

Author: runningcode

plugin-build/build.gradle.kts

@@ -164,10 +164,6 @@ gradlePlugin {
       id = "io.sentry.jvm.gradle"
       implementationClass = "io.sentry.jvm.gradle.SentryJvmPlugin"
     }
-    register("sentrySnapshotPlugin") {
-      id = "io.sentry.android.snapshot"
-      implementationClass = "io.sentry.android.gradle.snapshot.SentrySnapshotPlugin"
-    }
     register("sentrySnapshotMetadataPlugin") {
       id = "io.sentry.android.snapshot.metadata"
       implementationClass =

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

@@ -464,18 +464,31 @@ private fun ApplicationVariant.configureSnapshotsTasks(
 ): TaskProvider<SentryUploadSnapshotsTask> {
   val variant = AndroidVariant74(this)
   val sentryProps = getPropertiesFilePath(project, variant)
+  val taskSuffix = name.capitalized
 
-  return SentryUploadSnapshotsTask.register(
-    project = project,
-    extension = extension,
-    sentryTelemetryProvider = null,
-    cliExecutable = cliExecutable,
-    sentryOrgOverride = sentryOrg,
-    sentryProjectOverride = sentryProject,
-    applicationId = applicationId,
-    sentryProperties = sentryProps,
-    taskSuffix = name.capitalized,
-  )
+  val uploadTask =
+    SentryUploadSnapshotsTask.register(
+      project = project,
+      extension = extension,
+      sentryTelemetryProvider = null,
+      cliExecutable = cliExecutable,
+      sentryOrgOverride = sentryOrg,
+      sentryProjectOverride = sentryProject,
+      applicationId = applicationId,
+      sentryProperties = sentryProps,
+      taskSuffix = taskSuffix,
+    )
+
+  project.pluginManager.withPlugin("app.cash.paparazzi") {
+    uploadTask.configure { task ->
+      task.snapshotsPath.convention(
+        project.layout.buildDirectory.dir("reports/paparazzi/images")
+      )
+      task.mustRunAfter("recordPaparazzi$taskSuffix")
+    }
+  }
+
+  return uploadTask
 }
 
 /**

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

@@ -1,9 +1,12 @@
 package io.sentry.android.gradle
 
 import com.android.build.api.variant.ApplicationAndroidComponentsExtension
+import com.android.build.api.variant.HostTestBuilder.Companion.UNIT_TEST_TYPE
+import com.android.build.gradle.BaseExtension
 import io.sentry.BuildConfig
 import io.sentry.android.gradle.autoinstall.installDependencies
 import io.sentry.android.gradle.extensions.SentryPluginExtension
+import io.sentry.android.gradle.snapshot.GenerateSnapshotTestsTask
 import io.sentry.android.gradle.util.AgpVersions
 import java.io.File
 import javax.inject.Inject
@@ -66,6 +69,36 @@ constructor(private val buildEvents: BuildEventListenerRegistryInternal) : Plugi
       )
 
       project.installDependencies(extension, true)
+
+      project.pluginManager.withPlugin("app.cash.paparazzi") {
+        val android = project.extensions.getByType(BaseExtension::class.java)
+
+        project.dependencies.add(
+          "testImplementation",
+          "io.github.sergio-sastre.ComposablePreviewScanner:android:0.8.1",
+        )
+
+        androidComponentsExt.onVariants { variant ->
+          val generateTask =
+            GenerateSnapshotTestsTask.register(project, extension.snapshots, android, variant)
+          if (AgpVersions.isAGP90(AgpVersions.CURRENT)) {
+            variant.hostTests[UNIT_TEST_TYPE]?.apply {
+              sources.java?.addGeneratedSourceDirectory(
+                generateTask,
+                GenerateSnapshotTestsTask::outputDir,
+              )
+            }
+          } else {
+            @Suppress("DEPRECATION_ERROR")
+            variant.unitTest?.apply {
+              sources.java?.addGeneratedSourceDirectory(
+                generateTask,
+                GenerateSnapshotTestsTask::outputDir,
+              )
+            }
+          }
+        }
+      }
     }
   }
 

plugin-build/src/main/kotlin/io/sentry/android/gradle/extensions/SentryPluginExtension.kt

@@ -127,6 +127,13 @@ abstract class SentryPluginExtension @Inject constructor(project: Project) {
     vcsInfoAction.execute(vcsInfo)
   }
 
+  val snapshots: SnapshotsExtension = objects.newInstance(SnapshotsExtension::class.java)
+
+  @Experimental
+  fun snapshots(snapshotsAction: Action<SnapshotsExtension>) {
+    snapshotsAction.execute(snapshots)
+  }
+
   /**
    * Disables or enables the reporting of dependencies metadata for Sentry. If enabled the plugin
    * will collect external dependencies and will take care of uploading them to Sentry as part of

…adle/snapshot/SentrySnapshotExtension.kt …/gradle/extensions/SnapshotsExtension.ktplugin-build/src/main/kotlin/io/sentry/android/gradle/snapshot/SentrySnapshotExtension.kt renamed to plugin-build/src/main/kotlin/io/sentry/android/gradle/extensions/SnapshotsExtension.kt plugin-build/src/main/kotlin/io/sentry/android/gradle/snapshot/SentrySnapshotExtension.kt renamed to plugin-build/src/main/kotlin/io/sentry/android/gradle/extensions/SnapshotsExtension.kt

@@ -1,16 +1,13 @@
-package io.sentry.android.gradle.snapshot
+package io.sentry.android.gradle.extensions
 
+import javax.inject.Inject
 import org.gradle.api.model.ObjectFactory
 import org.gradle.api.provider.ListProperty
 import org.gradle.api.provider.Property
 import org.jetbrains.annotations.ApiStatus
 
-/**
- * Experimental extension for configuring Compose @Preview snapshot testing. This API is subject to
- * change and will eventually be merged into the main `sentry` extension.
- */
 @ApiStatus.Experimental
-abstract class SentrySnapshotExtension(objects: ObjectFactory) {
+open class SnapshotsExtension @Inject constructor(objects: ObjectFactory) {
 
   val includePrivatePreviews: Property<Boolean> =
     objects.property(Boolean::class.java).convention(false)

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

@@ -3,6 +3,7 @@ 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 io.sentry.android.gradle.extensions.SnapshotsExtension
 import java.io.File
 import org.gradle.api.DefaultTask
 import org.gradle.api.Project
@@ -58,12 +59,12 @@ abstract class GenerateSnapshotTestsTask : DefaultTask() {
 
     fun register(
       project: Project,
-      extension: SentrySnapshotExtension,
+      extension: SnapshotsExtension,
       android: BaseExtension,
       variant: ApplicationVariant,
     ): TaskProvider<GenerateSnapshotTestsTask> {
       return project.tasks.register(
-        "generateSentrySnapshotTests${variant.name.capitalized}",
+        "sentryGenerateSnapshotsTests${variant.name.capitalized}",
         GenerateSnapshotTestsTask::class.java,
       ) { task ->
         task.includePrivatePreviews.set(extension.includePrivatePreviews)
@@ -75,7 +76,7 @@ abstract class GenerateSnapshotTestsTask : DefaultTask() {
           }
         )
         task.outputDir.set(
-          project.layout.buildDirectory.dir("generated/sentry/snapshotTests/${variant.name}")
+          project.layout.buildDirectory.dir("generated/sentry/snapshotsTests/${variant.name}")
         )
       }
     }