From 19837c235aad833d3bd3bba1d9f1265fa5cb0769 Mon Sep 17 00:00:00 2001
From: yairm210 <yairm210@hotmail.com>
Date: Fri, 10 Sep 2021 12:39:15 +0300
Subject: [PATCH] 3.16.13-windows64NewPackrTest

---
 desktop/build.gradle.kts | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/desktop/build.gradle.kts b/desktop/build.gradle.kts
index 6b656634a3..9829f183c7 100644
--- a/desktop/build.gradle.kts
+++ b/desktop/build.gradle.kts
@@ -68,6 +68,21 @@ for (platform in PackrConfig.Platform.values()) {
     tasks.create("packr${platformName}") {
         dependsOn(tasks.getByName("dist"))
 
+        // Needs to be here and not in doLast because the zip task depends on the outDir
+        val jarFile = "$rootDir/desktop/build/libs/${BuildConfig.appName}.jar"
+        val config = PackrConfig()
+        config.platform = platform
+
+        config.apply {
+            executable = "Unciv"
+            classpath = listOf(jarFile)
+            removePlatformLibs = config.classpath
+            mainClass = mainClassName
+            vmArgs = listOf("Xmx1G")
+            minimizeJre = "desktop/packrConfig.json"
+            outDir = file("packr")
+        }
+
 
         doLast {
             //  https://gist.github.com/seanf/58b76e278f4b7ec0a2920d8e5870eed6
@@ -89,20 +104,6 @@ for (platform in PackrConfig.Platform.values()) {
             }
 
 
-            val jarFile = "$rootDir/desktop/build/libs/${BuildConfig.appName}.jar"
-            val config = PackrConfig()
-            config.platform = platform
-
-            config.apply {
-                executable = "Unciv"
-                classpath = listOf(jarFile)
-                removePlatformLibs = config.classpath
-                mainClass = mainClassName
-                vmArgs = listOf("Xmx1G")
-                minimizeJre = "desktop/packrConfig.json"
-                outDir = file("packr")
-            }
-
             if (config.outDir.exists()) delete(config.outDir)
 
             // Requires that both packr and the jre are downloaded, as per buildAndDeploy.yml, "Upload to itch.io"