Inline reversed into AndroidVariantSources

cashapp · Jun 17, 2024 · ca848e9 · ca848e9
1 parent fb6a557
commit ca848e9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/paparazzi-gradle-plugin/src/main/java/app/cash/paparazzi/gradle/AndroidVariantSources.kt b/paparazzi-gradle-plugin/src/main/java/app/cash/paparazzi/gradle/AndroidVariantSources.kt
@@ -15,7 +15,7 @@ internal class AndroidVariantSources(
   private val variant: Variant
 ) {
   val localResourceDirs: Provider<List<Directory>>? by lazy {
-    variant.sources.res?.all?.map { layers -> layers.flatten() }
+    variant.sources.res?.all?.map { layers -> layers.flatten() }?.map { it.asReversed() }
   }
 
   // https://android.googlesource.com/platform/tools/base/+/96015063acd3455a76cdf1cc71b23b0828c0907f/build-system/gradle-core/src/main/java/com/android/build/gradle/tasks/MergeResources.kt#875
@@ -32,7 +32,7 @@ internal class AndroidVariantSources(
   }
 
   val localAssetDirs: Provider<List<Directory>>? by lazy {
-    variant.sources.assets?.all?.map { layers -> layers.flatten() }
+    variant.sources.assets?.all?.map { layers -> layers.flatten() }?.map { it.asReversed() }
   }
 
   // https://android.googlesource.com/platform/tools/base/+/96015063acd3455a76cdf1cc71b23b0828c0907f/build-system/gradle-core/src/main/java/com/android/build/gradle/tasks/MergeResources.kt#875

diff --git a/paparazzi-gradle-plugin/src/main/java/app/cash/paparazzi/gradle/PaparazziPlugin.kt b/paparazzi-gradle-plugin/src/main/java/app/cash/paparazzi/gradle/PaparazziPlugin.kt
@@ -133,13 +133,11 @@ public class PaparazziPlugin : Plugin<Project> {
         task.artifactFiles.from(sources.packageAwareArtifactFiles)
         task.nonTransitiveRClassEnabled.set(nonTransitiveRClassEnabled)
         task.targetSdkVersion.set(android.targetSdkVersion())
-        task.projectResourceDirs.set(
-          sources.localResourceDirs.relativize(projectDirectory).reversed()
-        )
+        task.projectResourceDirs.set(sources.localResourceDirs.relativize(projectDirectory))
         task.moduleResourceDirs.set(sources.moduleResourceDirs.relativize(projectDirectory))
         task.aarExplodedDirs.set(sources.aarExplodedDirs.relativize(gradleHomeDir))
         task.projectAssetDirs.set(
-          sources.localAssetDirs.relativize(projectDirectory).reversed()
+          sources.localAssetDirs.relativize(projectDirectory)
             .zip(sources.moduleAssetDirs.relativize(projectDirectory), List<String>::plus)
         )
         task.aarAssetDirs.set(sources.aarAssetDirs.relativize(gradleHomeDir))
@@ -304,8 +302,6 @@ public class PaparazziPlugin : Plugin<Project> {
   private fun Provider<List<Directory>>?.relativize(directory: Directory): Provider<List<String>> =
     this?.map { dirs -> dirs.map { directory.relativize(it.asFile) } }
       ?: providerFactory.provider { emptyList() }
-
-  private fun <T> Provider<List<T>>.reversed(): Provider<List<T>> = this.map { it.asReversed() }
 }
 
 private const val DEFAULT_COMPILE_SDK_VERSION = 34