Cleanup

Author: geoff-powell

paparazzi-gradle-plugin/src/main/java/app/cash/paparazzi/gradle/PaparazziPlugin.kt

@@ -53,6 +53,8 @@ import org.gradle.internal.os.OperatingSystem
 import org.gradle.language.base.plugins.LifecycleBasePlugin.VERIFICATION_GROUP
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinAndroidTarget
+import org.jetbrains.kotlin.gradle.plugin.sources.android.findAndroidSourceSet
+import org.jetbrains.kotlin.gradle.targets.jvm.KotlinJvmTarget
 import java.io.File
 import java.util.Locale
 import javax.inject.Inject
@@ -99,12 +101,15 @@ public class PaparazziPlugin @Inject constructor(
     val layoutlibNativeRuntimeFileCollection = project.setupLayoutlibRuntimeDependency()
     val layoutlibResourcesFileCollection = project.setupLayoutlibResourcesDependency()
     val testSourceSetProvider = project.objects.directoryProperty()
-    testSourceSetProvider.set(project.layout.projectDirectory.dir("src/test"))
+
+    val defaultUnitTestDir = project.layout.projectDirectory.dir("src/test")
+    testSourceSetProvider.set(defaultUnitTestDir)
 
     project.plugins.withId("org.jetbrains.kotlin.multiplatform") {
       val kmpExtension = project.extensions.getByType(KotlinMultiplatformExtension::class.java)
-      kmpExtension.sourceSets.all { sourceSet ->
-        if (sourceSet.name == "androidUnitTest" || sourceSet.name == "androidTest") {
+      kmpExtension.sourceSets.configureEach { sourceSet ->
+        // TODO: Should we allow snapshots held in commonTest dir?
+        if (sourceSet.name == "androidUnitTest") {
           testSourceSetProvider.set(
             sourceSet.kotlin.srcDirs.map {
               File(it.parent)
@@ -114,7 +119,6 @@ public class PaparazziPlugin @Inject constructor(
       }
     }
 
-    val defaultUnitTestDir = project.layout.projectDirectory.dir("src/test")
     val snapshotOutputDir = testSourceSetProvider.map {
       if (it.asFile.exists() && !defaultUnitTestDir.asFile.exists()) {
         it.dir("snapshots")

paparazzi-gradle-plugin/src/test/projects/multiplatform-plugin-with-android/build.gradle

@@ -8,11 +8,13 @@ kotlin {
   androidTarget()
 
   sourceSets {
-    androidMain {
+    commonMain {
       dependencies {
         implementation 'androidx.appcompat:appcompat:1.7.0'
       }
     }
+    androidMain {
+    }
   }
 }
 

paparazzi-gradle-plugin/src/test/projects/multiplatform-plugin-with-android/src/androidUnitTest/snapshots/images/app.cash.paparazzi.plugin.test_SampleCommonTest_test.png

@@ -0,0 +1,16 @@
+package app.cash.paparazzi.plugin.test
+
+import android.widget.TextView
+import app.cash.paparazzi.Paparazzi
+import org.junit.Rule
+import org.junit.Test
+
+class SampleCommonTest {
+  @get:Rule
+  val paparazzi = Paparazzi()
+
+  @Test
+  fun test() {
+    paparazzi.snapshot(TextView(paparazzi.context).apply { text = "Hello, Paparazzi!" })
+  }
+}