From 5d32950cd5ce133843c591690143b67e5d6eb64f Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Wed, 15 Apr 2020 12:39:00 +0200 Subject: update gradle to 5.6.4 and update some build steps to this new version --- pdf-as-cli/build.gradle | 55 ++++++++++++++++++++++--------------------------- 1 file changed, 25 insertions(+), 30 deletions(-) (limited to 'pdf-as-cli') diff --git a/pdf-as-cli/build.gradle b/pdf-as-cli/build.gradle index fcde3b78..4f443d40 100644 --- a/pdf-as-cli/build.gradle +++ b/pdf-as-cli/build.gradle @@ -16,9 +16,9 @@ task releases(type: Copy) { } configurations { - pdfBox2Compile - pdfBox1Compile - } + pdfBox2Compile + pdfBox1Compile +} sourceSets{ pdfBox2{ @@ -67,37 +67,32 @@ task pdfbox1Startscript(type: CreateStartScripts) { } distZip { + baseName = archivesBaseName + duplicatesStrategy = DuplicatesStrategy.EXCLUDE - doFirst{ - baseName = archivesBaseName - duplicatesStrategy = DuplicatesStrategy.EXCLUDE - - into("${baseName}-${version}/lib") { - from startScripts.classpath - } - into("${baseName}-${version}/lib") { - from pdfbox1Startscript.classpath - } - into("${baseName}-${version}/bin") { - from pdfbox1Startscript - } - } + into("${baseName}-${version}/lib") { + from startScripts.classpath + } + into("${baseName}-${version}/lib") { + from pdfbox1Startscript.classpath + } + into("${baseName}-${version}/bin") { + from pdfbox1Startscript + } } distTar { - doFirst{ - baseName = archivesBaseName - duplicatesStrategy = DuplicatesStrategy.EXCLUDE - - into("${baseName}-${version}/lib") { - from startScripts.classpath - } - into("${baseName}-${version}/lib") { - from pdfbox1Startscript.classpath - } - into("${baseName}-${version}/bin") { - from pdfbox1Startscript - } + baseName = archivesBaseName + duplicatesStrategy = DuplicatesStrategy.EXCLUDE + + into("${baseName}-${version}/lib") { + from startScripts.classpath + } + into("${baseName}-${version}/lib") { + from pdfbox1Startscript.classpath + } + into("${baseName}-${version}/bin") { + from pdfbox1Startscript } } -- cgit v1.2.3