Configure Environment with local and library resource paths

cashapp · May 12, 2023 · 4ff82ec · 4ff82ec
1 parent 11bea27
commit 4ff82ec
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 12 deletions.
diff --git a/paparazzi/paparazzi-gradle-plugin/src/main/java/app/cash/paparazzi/gradle/PaparazziPlugin.kt b/paparazzi/paparazzi-gradle-plugin/src/main/java/app/cash/paparazzi/gradle/PaparazziPlugin.kt
@@ -92,12 +92,12 @@ class PaparazziPlugin : Plugin<Project> {
       val snapshotOutputDir = project.layout.projectDirectory.dir("src/test/snapshots")
 
       // local resources
-      val localResourceFiles = project
+      val localResourceDirs = project
         .files(variant.sourceSets.flatMap { it.resDirectories })
 
       // library resources
       // https://android.googlesource.com/platform/tools/base/+/96015063acd3455a76cdf1cc71b23b0828c0907f/build-system/gradle-core/src/main/java/com/android/build/gradle/tasks/MergeResources.kt#875
-      val libraryResourceFiles = variant.runtimeConfiguration
+      val libraryResourceDirs = variant.runtimeConfiguration
         .artifactsFor(ArtifactType.ANDROID_RES.type)
         .artifactFiles
 
@@ -120,8 +120,8 @@ class PaparazziPlugin : Plugin<Project> {
         task.targetSdkVersion.set(android.targetSdkVersion())
         task.compileSdkVersion.set(android.compileSdkVersion())
         task.mergeAssetsOutputDir.set(buildDirectory.asRelativePathString(mergeAssetsOutputDir))
-        task.localResourceFiles.from(localResourceFiles)
-        task.libraryResourceFiles.from(libraryResourceFiles)
+        task.localResourceDirs.from(localResourceDirs)
+        task.libraryResourceDirs.from(libraryResourceDirs)
         task.paparazziResources.set(buildDirectory.file("intermediates/paparazzi/${variant.name}/resources.txt"))
       }
 

diff --git a/...i/paparazzi-gradle-plugin/src/main/java/app/cash/paparazzi/gradle/PrepareResourcesTask.kt b/...i/paparazzi-gradle-plugin/src/main/java/app/cash/paparazzi/gradle/PrepareResourcesTask.kt
@@ -44,11 +44,11 @@ abstract class PrepareResourcesTask : DefaultTask() {
 
   @get:InputFiles
   @get:PathSensitive(PathSensitivity.NONE)
-  abstract val localResourceFiles: ConfigurableFileCollection
+  abstract val localResourceDirs: ConfigurableFileCollection
 
   @get:InputFiles
   @get:PathSensitive(PathSensitivity.NONE)
-  abstract val libraryResourceFiles: ConfigurableFileCollection
+  abstract val libraryResourceDirs: ConfigurableFileCollection
 
   @get:Input
   abstract val mergeAssetsOutputDir: Property<String>
@@ -99,9 +99,9 @@ abstract class PrepareResourcesTask : DefaultTask() {
         it.newLine()
         it.write(resourcePackageNames)
         it.newLine()
-        it.write(localResourceFiles.joinFiles(projectDirectory))
+        it.write(localResourceDirs.joinFiles(projectDirectory))
         it.newLine()
-        it.write(libraryResourceFiles.joinFiles(projectDirectory))
+        it.write(libraryResourceDirs.joinFiles(projectDirectory))
         it.newLine()
       }
   }

diff --git a/...zi/paparazzi-gradle-plugin/src/test/java/app/cash/paparazzi/gradle/PaparazziPluginTest.kt b/...zi/paparazzi-gradle-plugin/src/test/java/app/cash/paparazzi/gradle/PaparazziPluginTest.kt
@@ -751,7 +751,7 @@ class PaparazziPluginTest {
     assertThat(resourceFileContents[4]).isEqualTo("intermediates/assets/debug")
     assertThat(resourceFileContents[5]).isEqualTo("app.cash.paparazzi.plugin.test")
     assertThat(resourceFileContents[6]).isEqualTo("src/main/res,src/debug/res")
-    assertThat(resourceFileContents[7]).isEqualTo("../../../../build/tmp/test/work/.gradle-test-kit/caches/transforms-3/57296c8dafa8e42375ba5dc0569953b4/transformed/external/res")
+    assertThat(resourceFileContents[7]).isEqualTo("../../../../build/tmp/test/work/.gradle-test-kit/caches/transforms-3/05b86fef7254f66e4a9c0b458c40632f/transformed/external/res")
   }
 
   @Test
@@ -773,7 +773,7 @@ class PaparazziPluginTest {
     assertThat(resourceFileContents[4]).isEqualTo("intermediates/assets/debug")
     assertThat(resourceFileContents[5]).isEqualTo("app.cash.paparazzi.plugin.test")
     assertThat(resourceFileContents[6]).isEqualTo("src/main/res,src/debug/res")
-    assertThat(resourceFileContents[7]).isEqualTo("../../../../build/tmp/test/work/.gradle-test-kit/caches/transforms-3/57296c8dafa8e42375ba5dc0569953b4/transformed/external/res")
+    assertThat(resourceFileContents[7]).isEqualTo("../../../../build/tmp/test/work/.gradle-test-kit/caches/transforms-3/05b86fef7254f66e4a9c0b458c40632f/transformed/external/res")
   }
 
   @Test

diff --git a/paparazzi/paparazzi/build.gradle b/paparazzi/paparazzi/build.gradle
@@ -104,6 +104,8 @@ def generateTestConfig = tasks.register("generateTestConfig") {
       writer.writeLine("platforms/android-31/")
       writer.writeLine(".")
       writer.writeLine("app.cash.paparazzi")
+      writer.writeLine("")
+      writer.writeLine("")
     }
   }
 }

diff --git a/paparazzi/paparazzi/src/main/java/app/cash/paparazzi/Environment.kt b/paparazzi/paparazzi/src/main/java/app/cash/paparazzi/Environment.kt
@@ -29,7 +29,9 @@ data class Environment(
   val assetsDir: String,
   val packageName: String,
   val compileSdkVersion: Int,
-  val resourcePackageNames: List<String>
+  val resourcePackageNames: List<String>,
+  val localResourceDirs: List<String>,
+  val libraryResourceDirs: List<String>
 ) {
   init {
     val platformDirPath = Path.of(platformDir)
@@ -62,7 +64,9 @@ fun detectEnvironment(): Environment {
     assetsDir = appTestDir.resolve(configLines[4]).toString(),
     packageName = configLines[0],
     compileSdkVersion = configLines[2].toInt(),
-    resourcePackageNames = configLines[5].split(",")
+    resourcePackageNames = configLines[5].split(","),
+    localResourceDirs = configLines[6].split(","),
+    libraryResourceDirs = configLines[7].split(",")
   )
 }