mirror of
https://github.com/google/nomulus.git
synced 2025-07-23 19:20:44 +02:00
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.
This commit is contained in:
parent
304e7c9726
commit
c33d2cb0b8
2 changed files with 2 additions and 2 deletions
|
@ -516,7 +516,6 @@ task javaIncrementalFormatCheck {
|
||||||
println("Omitting format check: not in a git directory.")
|
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.
|
// Shows how modified lines in Java source files will change after formatting.
|
||||||
|
@ -534,7 +533,6 @@ task javaIncrementalFormatApply {
|
||||||
doLast {
|
doLast {
|
||||||
invokeJavaDiffFormatScript("format")
|
invokeJavaDiffFormatScript("format")
|
||||||
}
|
}
|
||||||
dependsOn('console-webapp:applyFormatting')
|
|
||||||
}
|
}
|
||||||
|
|
||||||
task javadoc(type: Javadoc) {
|
task javadoc(type: Javadoc) {
|
||||||
|
@ -561,6 +559,7 @@ tasks.build.dependsOn(tasks.javadoc)
|
||||||
// core Nomulus codebase, and runs all presubmits.
|
// core Nomulus codebase, and runs all presubmits.
|
||||||
task coreDev {
|
task coreDev {
|
||||||
dependsOn 'javaIncrementalFormatApply'
|
dependsOn 'javaIncrementalFormatApply'
|
||||||
|
dependsOn 'console-webapp:applyFormatting'
|
||||||
dependsOn 'javadoc'
|
dependsOn 'javadoc'
|
||||||
dependsOn 'checkDependenciesDotGradle'
|
dependsOn 'checkDependenciesDotGradle'
|
||||||
dependsOn 'checkLicense'
|
dependsOn 'checkLicense'
|
||||||
|
|
|
@ -66,3 +66,4 @@ tasks.runConsoleWebappUnitTests.dependsOn(tasks.npmInstallDeps)
|
||||||
tasks.buildConsoleWebappProd.dependsOn(tasks.npmInstallDeps)
|
tasks.buildConsoleWebappProd.dependsOn(tasks.npmInstallDeps)
|
||||||
tasks.applyFormatting.dependsOn(tasks.npmInstallDeps)
|
tasks.applyFormatting.dependsOn(tasks.npmInstallDeps)
|
||||||
tasks.checkFormatting.dependsOn(tasks.npmInstallDeps)
|
tasks.checkFormatting.dependsOn(tasks.npmInstallDeps)
|
||||||
|
tasks.build.dependsOn(tasks.checkFormatting)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue