avoid searching task via name

cashapp · Feb 28, 2024 · 92deaaf · 92deaaf
1 parent fa7fe38
commit 92deaaf
Showing 1 changed file with 6 additions and 6 deletions.
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
@@ -40,7 +40,6 @@ import org.gradle.api.logging.LogLevel.LIFECYCLE
 import org.gradle.api.plugins.JavaBasePlugin
 import org.gradle.api.reporting.ReportingExtension
 import org.gradle.api.tasks.PathSensitivity
-import org.gradle.api.tasks.TaskProvider
 import org.gradle.api.tasks.options.Option
 import org.gradle.api.tasks.testing.Test
 import org.gradle.internal.os.OperatingSystem
@@ -142,11 +141,12 @@ public class PaparazziPlugin : Plugin<Project> {
         task.nonTransitiveRClassEnabled.set(nonTransitiveRClassEnabled)
         task.targetSdkVersion.set(android.targetSdkVersion())
         task.compileSdkVersion.set(android.compileSdkVersion())
-        task.projectResourceDirs.set(project.provider {
-          val generateResValuesProvider = project.tasks.named("generate${variantSlug}ResValues") as TaskProvider<GenerateResValues>
-          val generateResValuesOutputDir = generateResValuesProvider.map { it.resOutputDir }
-          localResourceDirs.relativize(projectDirectory) + projectDirectory.relativize(generateResValuesOutputDir.get())
-        })
+        task.projectResourceDirs.set(
+          project.provider {
+            val generateResValuesDirs = project.tasks.withType(GenerateResValues::class.java).filter { it.variantName == variant.name }.map { it.resOutputDir }
+            localResourceDirs.relativize(projectDirectory) + generateResValuesDirs.map(projectDirectory::relativize)
+          }
+        )
         task.moduleResourceDirs.set(project.provider { moduleResourceDirs.relativize(projectDirectory) })
         task.aarExplodedDirs.from(aarExplodedDirs)
         task.projectAssetDirs.set(project.provider { localAssetDirs.plus(moduleAssetDirs).relativize(projectDirectory) })