Merge "Revert "Re-enabling checking that tasks are up-to-date after run once"" into androidx-master-dev
diff --git a/buildSrc/src/main/kotlin/androidx/build/TaskUpToDateValidator.kt b/buildSrc/src/main/kotlin/androidx/build/TaskUpToDateValidator.kt
index 1708eb4..14f6658 100644
--- a/buildSrc/src/main/kotlin/androidx/build/TaskUpToDateValidator.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/TaskUpToDateValidator.kt
@@ -33,35 +33,17 @@
// Temporary whitelist of tasks that are known to still be out-of-date after running once
val EXEMPT_TASK_NAMES = setOf(
"buildOnServer",
- "checkExternalLicenses",
"checkSameVersionLibraryGroups",
- "createArchive",
- "createDiffArchiveForAll",
- "createProjectZip",
"desugarPublicDebugFileDependencies",
"desugarTipOfTreeDebugFileDependencies",
- "dist",
"distPublicDokkaDocs",
"dokkaJavaPublicDocs",
"dokkaKotlinPublicDocs",
- "generateMetadataFileForKotlinMultiplatformPublication",
- "generatePomFileForBenchmarkPluginMarkerMavenPublication",
- "generatePomFileForKotlinMultiplatformPublication",
- "generatePomFileForMavenPublication",
- "generatePomFileForPluginMavenPublication",
- "generatePomFileForMetadataPublication",
- "generatePomFileForSafeargsJavaPluginMarkerMavenPublication",
- "generatePomFileForSafeargsKotlinPluginMarkerMavenPublication",
"jacocoPublicDebug",
"jacocoTipOfTreeDebug",
- "lint",
- "lintDebug",
"lintVitalRelease",
- "mergeDexDebug",
- "mergeExtDexDebug",
"mergeExtDexPublicDebug",
"mergeExtDexTipOfTreeDebug",
- "mergeLibDexDebug",
"mergeLibDexPublicDebug",
"mergeProjectDexPublicDebug",
"mergeProjectDexTipOfTreeDebug",
@@ -72,22 +54,16 @@
"mergePublicDebugShaders",
"mergeTipOfTreeDebugAssets",
"mergeTipOfTreeDebugJavaResource",
- "packageDebug",
"packagePublicDebug",
"packageTipOfTreeDebug",
- "partiallyDejetifyArchive",
- "postInstrumentCode",
- "publishBenchmarkPluginMarkerMavenPublicationToMavenRepository",
- "publishMavenPublicationToMavenRepository",
- "publishMetadataPublicationToMavenRepository",
- "publishPluginMavenPublicationToMavenRepository",
- "publishSafeargsJavaPluginMarkerMavenPublicationToMavenRepository",
- "publishSafeargsKotlinPluginMarkerMavenPublicationToMavenRepository",
- "reportLibraryMetrics",
- "stripArchiveForPartialDejetification",
"transformClassesWithDexBuilderForPublicDebug",
"transformClassesWithDexBuilderForTipOfTreeDebug",
- "verifyDependencyVersions"
+ "lint",
+ "reportLibraryMetrics",
+ "verifyDependencyVersions",
+ "lintDebug",
+ "checkExternalLicenses",
+ "dist"
)
class TaskUpToDateValidator {
companion object {
diff --git a/busytown/doAllTheBuild.py b/busytown/doAllTheBuild.py
index 51fea86..67de81a 100644
--- a/busytown/doAllTheBuild.py
+++ b/busytown/doAllTheBuild.py
@@ -48,9 +48,7 @@
def runGradleBuilds():
runCommand(" ".join([preargs + distarg, androidxGradleCommand, postargs]))
- runCommand(" ".join([preargs + distarg, androidxGradleCommand, "-PdisallowExecution", postargs]))
runCommand(" ".join([preargs + distargC, composeGradleCommand, postargs]))
- runCommand(" ".join([preargs + distargC, composeGradleCommand, "-PdisallowExecution", postargs]))
def mergeAggregateBuildInfoFiles() :
androidxBuildInfo = json.load(open("androidx_aggregate_build_info.txt"))["artifacts"]
