Compare commits

...

4 commits

Author SHA1 Message Date
2ec02c7940
Revert "Do not use non-ASCII charaters in Java source code, yet"
All checks were successful
Build / build (push) Successful in 13s
This reverts commit 9dee4993f1.
2025-04-11 12:23:53 +02:00
ee7d543811
Merge branch 'main' into renovate/major-jetty-packages 2025-04-11 11:49:05 +02:00
6b88318bcd
Fix regression of Java sources not being processed before compiling
All checks were successful
Build / build (push) Successful in 11s
2025-04-11 11:48:32 +02:00
9dee4993f1
Do not use non-ASCII charaters in Java source code, yet
All checks were successful
Build / build (push) Successful in 8s
2025-04-11 00:05:54 +02:00

View file

@ -148,9 +148,11 @@ installDist {
dependsOn build dependsOn build
} }
tasks.register('processSource', Sync) { def processSource = tasks.register('processSource', Sync) {
def gitOutput = new ByteArrayOutputStream() def gitOutput = new ByteArrayOutputStream()
outputs.dir "${project.buildDir}/src"
exec { exec {
commandLine 'git', 'rev-parse', '--short', 'HEAD' commandLine 'git', 'rev-parse', '--short', 'HEAD'
standardOutput = gitOutput standardOutput = gitOutput
@ -165,9 +167,11 @@ tasks.register('processSource', Sync) {
.replaceAll('__builddate__', new Date().format("d MMM yyyy")) .replaceAll('__builddate__', new Date().format("d MMM yyyy"))
.replaceAll('__commithash__', gitOutput.toString().trim()) .replaceAll('__commithash__', gitOutput.toString().trim())
.replaceAll('__version__', version) .replaceAll('__version__', version)
} into "${project.buildDir}/src" } into outputs.files.singleFile
} }
tasks.compileJava.source = processSource.map { it.outputs.files }
tasks.register('update') { tasks.register('update') {
dependsOn installDist dependsOn installDist