From 0109d92aa003375fca0374b60ad3ad6648466e95 Mon Sep 17 00:00:00 2001 From: cd2357 Date: Thu, 20 May 2021 22:56:59 +0200 Subject: [PATCH] Package: Fix issue with raspi build Fix packaging issue which sometimes caused issues with creating the raspi package on Windows (and other environments where a recent ./gradlew :desktop:build was not run recently). --- desktop/package/package.gradle | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/desktop/package/package.gradle b/desktop/package/package.gradle index 32121aac46..ca098794e0 100644 --- a/desktop/package/package.gradle +++ b/desktop/package/package.gradle @@ -169,9 +169,8 @@ task retrieveAndExtractJavaBinaries { task packageInstallers { description 'Call jpackage to prepare platform-specific binaries for this platform' dependsOn 'retrieveAndExtractJavaBinaries' - // Clean all previous artefacts and create a fresh shadowJar for the installers dependsOn rootProject.clean - dependsOn ':desktop:shadowJar' + dependsOn ':desktop:build' // Full build needed for "desktop/build/app/lib", used for raspi package doLast { String jPackageFilePath = retrieveAndExtractJavaBinaries.property('jpackageFilePath') @@ -211,8 +210,7 @@ task packageInstallers { String appVersion = version.replaceAll("-SNAPSHOT", "") println "Packaging Bisq version ${appVersion}" - // zip jar lib for Raspberry Pi only on macOS as there are path issues on Windows and it is only needed once - // for the release + // zip jar lib for Raspberry Pi only on macOS as it is only needed once for the release if (Os.isFamily(Os.FAMILY_MAC)) { println "Zipping jar lib for raspberry pi" ant.zip(basedir: "${project(':desktop').buildDir}/app/lib",