From 86871e9aa35e7c106b9de81d14431f1eb414eaab Mon Sep 17 00:00:00 2001 From: Alva Swanson Date: Mon, 24 Jun 2024 17:05:14 +0000 Subject: [PATCH] packaging: Only include binaries in copyReleaseBinaries task --- .../gradle/packaging/ReleaseBinariesTaskFactory.kt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/build-logic/packaging/src/main/kotlin/bisq/gradle/packaging/ReleaseBinariesTaskFactory.kt b/build-logic/packaging/src/main/kotlin/bisq/gradle/packaging/ReleaseBinariesTaskFactory.kt index b7b09acdf9..ca24e2bb04 100644 --- a/build-logic/packaging/src/main/kotlin/bisq/gradle/packaging/ReleaseBinariesTaskFactory.kt +++ b/build-logic/packaging/src/main/kotlin/bisq/gradle/packaging/ReleaseBinariesTaskFactory.kt @@ -20,6 +20,7 @@ class ReleaseBinariesTaskFactory(private val project: Project) { val releaseDir: Provider = project.layout.buildDirectory.dir("packaging/release") project.tasks.register("copyReleaseBinaries") { from(inputBinariesProperty) + include("*.dmg", "*.deb", "*.exe", "*.rpm") into(releaseDir) /* Bisq 1: "Bisq-1.9.15.dmg" -> "Bisq-1.9.15.dmg" "bisq_1.9.15-1_amd64.deb" -> "Bisq-64bit-1.9.15.deb" @@ -78,11 +79,14 @@ class ReleaseBinariesTaskFactory(private val project: Project) { fun registerMergeOsSpecificJarHashesTask() { val files = project.files( inputBinariesProperty.map { inputDir -> - "$inputDir/desktop-${PackagingPlugin.APP_VERSION}-all-mac.jar.SHA-256" }, + "$inputDir/desktop-${PackagingPlugin.APP_VERSION}-all-mac.jar.SHA-256" + }, inputBinariesProperty.map { inputDir -> - "$inputDir/desktop-${PackagingPlugin.APP_VERSION}-all-linux.jar.SHA-256" }, + "$inputDir/desktop-${PackagingPlugin.APP_VERSION}-all-linux.jar.SHA-256" + }, inputBinariesProperty.map { inputDir -> - "$inputDir/desktop-${PackagingPlugin.APP_VERSION}-all-windows.jar.SHA-256" } + "$inputDir/desktop-${PackagingPlugin.APP_VERSION}-all-windows.jar.SHA-256" + } ) val mergedShaFile: Provider = project.layout.buildDirectory .file("packaging/release/Bisq-${PackagingPlugin.APP_VERSION}.jar.txt")