Skip to content

Commit 4594b7a

Browse files
authored
Stop resolving dependencies at configuration time (#1291)
1 parent 468f599 commit 4594b7a

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,10 +140,10 @@ public class PaparazziPlugin : Plugin<Project> {
140140
task.nonTransitiveRClassEnabled.set(nonTransitiveRClassEnabled)
141141
task.targetSdkVersion.set(android.targetSdkVersion())
142142
task.compileSdkVersion.set(android.compileSdkVersion())
143-
task.projectResourceDirs.set(localResourceDirs.relativize(projectDirectory))
144-
task.moduleResourceDirs.set(moduleResourceDirs.relativize(projectDirectory))
143+
task.projectResourceDirs.set(project.provider { localResourceDirs.relativize(projectDirectory) })
144+
task.moduleResourceDirs.set(project.provider { moduleResourceDirs.relativize(projectDirectory) })
145145
task.aarExplodedDirs.from(aarExplodedDirs)
146-
task.projectAssetDirs.set(localAssetDirs.plus(moduleAssetDirs).relativize(projectDirectory))
146+
task.projectAssetDirs.set(project.provider { localAssetDirs.plus(moduleAssetDirs).relativize(projectDirectory) })
147147
task.aarAssetDirs.from(aarAssetDirs)
148148
task.paparazziResources.set(buildDirectory.file("intermediates/paparazzi/${variant.name}/resources.json"))
149149
}

paparazzi-gradle-plugin/src/test/java/app/cash/paparazzi/gradle/PaparazziPluginTest.kt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1729,7 +1729,12 @@ class PaparazziPluginTest {
17291729

17301730
if (!gradleProperties.exists()) {
17311731
gradleProperties.createNewFile()
1732-
gradleProperties.writeText("android.useAndroidX=true")
1732+
gradleProperties.writeText(
1733+
"""
1734+
|android.useAndroidX=true
1735+
|android.dependencyResolutionAtConfigurationTime.disallow=true
1736+
""".trimMargin()
1737+
)
17331738
generatedGradleProperties = true
17341739
}
17351740

0 commit comments

Comments
 (0)