From e57787393e5e55a22ac18e02580add763073ef25 Mon Sep 17 00:00:00 2001
From: Skylot <skylot@gmail.com>
Date: Thu, 20 Apr 2023 19:10:44 +0100
Subject: [PATCH] chore(build): fix gradle tasks dependencies

---
 .gitlab-ci.yml        | 4 ++--
 build.gradle          | 6 +++++-
 jadx-gui/build.gradle | 3 ++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 879286740..186bd490c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,9 +11,9 @@ stages:
 java-11:
   stage: test
   image: eclipse-temurin:11
-  script: ./gradlew clean build dist
+  script: ./gradlew clean build dist copyExe
 
 java-17:
   stage: test
   image: eclipse-temurin:17
-  script: ./gradlew clean build dist
+  script: ./gradlew clean build dist copyExe
diff --git a/build.gradle b/build.gradle
index fa16739e2..326b3c0a9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -128,7 +128,10 @@ task pack(type: Zip) {
 task copyExe(type: Copy) {
 	group 'jadx'
 	description = 'Copy exe to build dir'
-	mustRunAfter pack // not needed, but gradle throws warning because of same output dir
+
+	// next task dependencies not needed, but gradle throws warning because of same output dir
+	mustRunAfter jar
+	mustRunAfter pack
 
 	from tasks.getByPath('jadx-gui:createExe')
 	include '*.exe'
@@ -139,6 +142,7 @@ task copyExe(type: Copy) {
 task distWinBundle(type: Copy, dependsOn: 'jadx-gui:distWinWithJre') {
 	group 'jadx'
 	description = 'Copy bundle to build dir'
+	mustRunAfter pack
 	destinationDir buildDir
 	from(tasks.getByPath('jadx-gui:distWinWithJre').outputs) {
 		include '*.zip'
diff --git a/jadx-gui/build.gradle b/jadx-gui/build.gradle
index f58714752..580923c07 100644
--- a/jadx-gui/build.gradle
+++ b/jadx-gui/build.gradle
@@ -99,7 +99,7 @@ startScripts {
 
 launch4j {
 	mainClassName = application.mainClass.get()
-	copyConfigurable = project.tasks.shadowJar.outputs.files
+	copyConfigurable = []
 	jarTask = project.tasks.shadowJar
 	icon = "${projectDir}/src/main/resources/logos/jadx-logo.ico"
 	outfile = "jadx-gui-${version}.exe"
@@ -116,6 +116,7 @@ launch4j {
 	downloadUrl = 'https://www.oracle.com/java/technologies/downloads/#jdk17-windows'
 	bundledJrePath = project.hasProperty("bundleJRE") ? '%EXEDIR%/jre' : '%JAVA_HOME%'
 }
+createExe.dependsOn(jar)
 
 runtime {
 	addOptions('--strip-debug', '--compress', '2', '--no-header-files', '--no-man-pages')