From fffedf9a70854fc7306d464bbdf5a4d932b6cfbf Mon Sep 17 00:00:00 2001
From: yairm210 <yairm210@hotmail.com>
Date: Sun, 22 Aug 2021 22:49:49 +0300
Subject: [PATCH] MacOS release!

---
 .github/workflows/buildAndDeploy.yml |  5 ++++-
 desktop/build.gradle.kts             | 10 +++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/buildAndDeploy.yml b/.github/workflows/buildAndDeploy.yml
index f4a0172956..6842ee1523 100644
--- a/.github/workflows/buildAndDeploy.yml
+++ b/.github/workflows/buildAndDeploy.yml
@@ -31,7 +31,6 @@ jobs:
       - uses: actions/checkout@v2
 
       - uses: actions/setup-java@v1
-        # Don't upgrade to java 11 until you've managed to run packr with it.
         with:
           java-version: '11'
 
@@ -127,6 +126,10 @@ jobs:
           ./gradlew desktop:packrWindows32
           ./butler push deploy/Unciv-Windows32.zip yairm210/unciv:Windows32 --userversion ${{steps.tag.outputs.tag}}
 
+          wget -q -O jre-macOS.tar.gz https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_x64_mac_hotspot_11.0.11_9.tar.gz
+          ./gradlew desktop:packrMacOS
+          ./butler push deploy/Unciv-MacOS.zip yairm210/unciv:MacOS --userversion ${{steps.tag.outputs.tag}}
+
           wget -q -O jdk-windows-64.zip https://github.com/ojdkbuild/ojdkbuild/releases/download/java-1.8.0-openjdk-1.8.0.232-1.b09/java-1.8.0-openjdk-1.8.0.232-1.b09.ojdkbuild.windows.x86_64.zip
           ./gradlew desktop:packrWindows64
           ./butler push deploy/Unciv-Windows64.zip yairm210/unciv:Windows64 --userversion ${{steps.tag.outputs.tag}}
diff --git a/desktop/build.gradle.kts b/desktop/build.gradle.kts
index 3e53982362..168860cc30 100644
--- a/desktop/build.gradle.kts
+++ b/desktop/build.gradle.kts
@@ -119,10 +119,14 @@ for(platform in PackrConfig.Platform.values()) {
             if (config.outDir.exists()) delete(config.outDir)
 
             // Requires that both packr and the linux jre are downloaded, as per buildAndDeploy.yml, "Upload to itch.io"
-            if (platform == PackrConfig.Platform.Linux64) {
+            if (platform == PackrConfig.Platform.Linux64 || platform == PackrConfig.Platform.MacOS) {
+                val jdkFile = if (platform == PackrConfig.Platform.Linux64) "jre-linux-64.tar.gz"
+                else "jre-macOS.tar.gz"
+                val platformNameForPackrCmd =  if (platform == PackrConfig.Platform.Linux64) "linux64"
+                else "mac"
                 val command = "java -jar $rootDir/packr-all-4.0.0.jar" +
-                        " --platform linux64" +
-                        " --jdk jre-linux-64.tar.gz" +
+                        " --platform $platformNameForPackrCmd" +
+                        " --jdk $jdkFile" +
                         " --executable Unciv" +
                         " --classpath $jarFile" +
                         " --mainclass $mainClassName" +