Updating Gradle's understanding of the output path for jetifier-standalone:dist
so it doesn't duplicate that of buildOnServer
Bug: 149103692
Test: rm ../../out/ -rf && ./gradlew dist && ls ../../out/dist/jetifier-standalone.zip
Test: ./gradlew buildOnServer --dry-run | grep jetifier-standalone:distZip
Test: ./gradlew listTaskOutputs
Test: ./gradlew dist -PverifyUpToDate
Change-Id: I06566b54cdb838eaecda772e48cdb10ecdcf64fc
diff --git a/buildSrc/src/main/kotlin/androidx/build/ListTaskOutputsTask.kt b/buildSrc/src/main/kotlin/androidx/build/ListTaskOutputsTask.kt
index 52c490c..667f6a3 100644
--- a/buildSrc/src/main/kotlin/androidx/build/ListTaskOutputsTask.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/ListTaskOutputsTask.kt
@@ -81,8 +81,6 @@
// TODO(149103692): remove all elements of this set
val taskNamesKnownToDuplicateOutputs = setOf(
- "buildOnServer",
- "dist",
"generateReleaseNotes",
"jarRelease",
"jarDebug",
diff --git a/buildSrc/src/main/kotlin/androidx/build/uptodatedness/TaskUpToDateValidator.kt b/buildSrc/src/main/kotlin/androidx/build/uptodatedness/TaskUpToDateValidator.kt
index 723d674..4a1a43d 100644
--- a/buildSrc/src/main/kotlin/androidx/build/uptodatedness/TaskUpToDateValidator.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/uptodatedness/TaskUpToDateValidator.kt
@@ -41,7 +41,6 @@
"createProjectZip",
"desugarPublicDebugFileDependencies",
"desugarTipOfTreeDebugFileDependencies",
- "dist",
"distPublicDokkaDocs",
"dokkaJavaPublicDocs",
"dokkaKotlinPublicDocs",
diff --git a/jetifier/jetifier/standalone/build.gradle b/jetifier/jetifier/standalone/build.gradle
index 73617fc..644cc33 100644
--- a/jetifier/jetifier/standalone/build.gradle
+++ b/jetifier/jetifier/standalone/build.gradle
@@ -29,9 +29,10 @@
api("commons-cli:commons-cli:1.3.1")
}
-task dist(type: Copy) {
- from project.tasks.findByPath("distZip") // defined by application plugin
-
- destinationDir BuildServerConfigurationKt.getDistributionDirectory(rootProject)
+task dist {
+ dependsOn project.tasks.findByPath("distZip")
}
+tasks["distZip"].configure {
+ destinationDir = BuildServerConfigurationKt.getDistributionDirectory(rootProject)
+}