Skip to content

Commit ad5342d

Browse files
author
plamen5kov
committed
fixed merging bug with template build.gradle
1 parent 6e498cf commit ad5342d

1 file changed

Lines changed: 2 additions & 19 deletions

File tree

build/project-template-gradle/build.gradle

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -369,20 +369,19 @@ task collectAllJars {
369369
}
370370
}
371371

372-
373372
task buildMetadata (type: JavaExec) {
374373
description "builds metadata with provided jar dependencies"
375374

376375
inputs.files(allJarPaths)
377-
inputs.dir("build/intermediates/classes")
376+
inputs.dir("$buildDir/intermediates/classes")
378377

379378
outputs.files("metadata/output/assets/metadata/treeNodeStream.dat", "metadata/output/assets/metadata/treeStringsStream.dat", "metadata/output/assets/metadata/treeValueStream.dat")
380379

381380
doFirst {
382381
workingDir "build-tools"
383382

384383
main "-jar"
385-
384+
386385
// get compiled classes to pass to metadata generator
387386
// these need to be called after the classes have compiled
388387
def classesDir = "$buildDir/intermediates/classes"
@@ -404,22 +403,6 @@ task buildMetadata (type: JavaExec) {
404403
if (classesDirBuildType.exists()) {
405404
metadataParams.add(classesDirBuildType.getAbsolutePath())
406405
}
407-
}
408-
}
409-
410-
411-
task buildMetadata (type: JavaExec) {
412-
description "builds metadata with provided jar dependencies"
413-
414-
inputs.files(allJarPaths)
415-
inputs.dir("$buildDir/intermediates/classes")
416-
417-
outputs.files("metadata/output/assets/metadata/treeNodeStream.dat", "metadata/output/assets/metadata/treeStringsStream.dat", "metadata/output/assets/metadata/treeValueStream.dat")
418-
419-
doFirst {
420-
workingDir "build-tools"
421-
422-
main "-jar"
423406

424407
args metadataParams.toArray()
425408
}

0 commit comments

Comments
 (0)