From bf1c159477e039b41b56ad7a5156de28536bbbef Mon Sep 17 00:00:00 2001
From: Alva Swanson <alvasw@protonmail.com>
Date: Mon, 11 Sep 2023 00:34:28 +0200
Subject: [PATCH 1/2] Don't remove start scripts from root directory

---
 build.gradle | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/build.gradle b/build.gradle
index e658103fdf..d142e1256e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,16 +6,6 @@ buildscript {
     }
 }
 
-configure(rootProject) {
-
-    // remove the 'bisq-*' scripts and 'lib' dir generated by the 'installDist' task
-    task clean {
-        doLast {
-            delete fileTree(dir: rootProject.projectDir, include: 'bisq-*'), 'lib'
-        }
-    }
-}
-
 if (hasProperty('buildScan')) {
     buildScan {
         termsOfServiceUrl = 'https://gradle.com/terms-of-service'

From 45c4d16a0cc1f01dec248c5dfc5b8b9967ed4c28 Mon Sep 17 00:00:00 2001
From: Alva Swanson <alvasw@protonmail.com>
Date: Mon, 11 Sep 2023 00:48:21 +0200
Subject: [PATCH 2/2] Make build reproducible

---
 .../commons/src/main/groovy/bisq.java-conventions.gradle     | 1 +
 .../commons/src/main/groovy/bisq.reproducible-build.gradle   | 4 ++++
 desktop/build.gradle                                         | 5 -----
 3 files changed, 5 insertions(+), 5 deletions(-)
 create mode 100644 build-logic/commons/src/main/groovy/bisq.reproducible-build.gradle

diff --git a/build-logic/commons/src/main/groovy/bisq.java-conventions.gradle b/build-logic/commons/src/main/groovy/bisq.java-conventions.gradle
index 99e87d2026..73d7f82c63 100644
--- a/build-logic/commons/src/main/groovy/bisq.java-conventions.gradle
+++ b/build-logic/commons/src/main/groovy/bisq.java-conventions.gradle
@@ -1,6 +1,7 @@
 plugins {
     id 'java'
     id 'jacoco'
+    id 'bisq.reproducible-build'
 }
 
 repositories {
diff --git a/build-logic/commons/src/main/groovy/bisq.reproducible-build.gradle b/build-logic/commons/src/main/groovy/bisq.reproducible-build.gradle
new file mode 100644
index 0000000000..e631a165e4
--- /dev/null
+++ b/build-logic/commons/src/main/groovy/bisq.reproducible-build.gradle
@@ -0,0 +1,4 @@
+tasks.withType(AbstractArchiveTask).configureEach {
+    preserveFileTimestamps = false
+    reproducibleFileOrder = true
+}
diff --git a/desktop/build.gradle b/desktop/build.gradle
index d86198d678..c0abdc7c2d 100644
--- a/desktop/build.gradle
+++ b/desktop/build.gradle
@@ -18,11 +18,6 @@ javafx {
 
 mainClassName = 'bisq.desktop.app.BisqAppMain'
 
-jar {
-    preserveFileTimestamps = false
-    reproducibleFileOrder = true
-}
-
 sourceSets.main.resources.srcDirs += ['src/main/java'] // to copy fxml and css files
 
 dependencies {