From c33d2cb0b8338ac866035de097c335e7418e8e93 Mon Sep 17 00:00:00 2001 From: Weimin Yu Date: Thu, 13 Jul 2023 11:30:33 -0400 Subject: [PATCH] Stop invoking npm when formatting Java (#2075) Move console-webapp:(check,apply)Formatting tasks the task graph so that the Java formatting tasks do not have to invoke npm. --- build.gradle | 3 +-- console-webapp/build.gradle | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 97033ba19..3835a6a60 100644 --- a/build.gradle +++ b/build.gradle @@ -516,7 +516,6 @@ task javaIncrementalFormatCheck { println("Omitting format check: not in a git directory.") } } - dependsOn('console-webapp:checkFormatting') } // Shows how modified lines in Java source files will change after formatting. @@ -534,7 +533,6 @@ task javaIncrementalFormatApply { doLast { invokeJavaDiffFormatScript("format") } - dependsOn('console-webapp:applyFormatting') } task javadoc(type: Javadoc) { @@ -561,6 +559,7 @@ tasks.build.dependsOn(tasks.javadoc) // core Nomulus codebase, and runs all presubmits. task coreDev { dependsOn 'javaIncrementalFormatApply' + dependsOn 'console-webapp:applyFormatting' dependsOn 'javadoc' dependsOn 'checkDependenciesDotGradle' dependsOn 'checkLicense' diff --git a/console-webapp/build.gradle b/console-webapp/build.gradle index e293c131c..a5c5a96f6 100644 --- a/console-webapp/build.gradle +++ b/console-webapp/build.gradle @@ -66,3 +66,4 @@ tasks.runConsoleWebappUnitTests.dependsOn(tasks.npmInstallDeps) tasks.buildConsoleWebappProd.dependsOn(tasks.npmInstallDeps) tasks.applyFormatting.dependsOn(tasks.npmInstallDeps) tasks.checkFormatting.dependsOn(tasks.npmInstallDeps) +tasks.build.dependsOn(tasks.checkFormatting)