Update jpackage to release 64 (#955)

Existing version was deleted
WPIRoboticsProjects · Oct 30, 2019 · 6f2a252 · 6f2a252
1 parent 8923d10
commit 6f2a252
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -22,7 +22,7 @@ jobs:
       - script: |
           $ProgressPreference = 'SilentlyContinue'
           mkdir build
-          wget "https://download.java.net/java/early_access/jpackage/1/openjdk-14-jpackage+1-49_linux-x64_bin.tar.gz" -O "build/jdk-14.tar.gz"
+          wget "https://download.java.net/java/early_access/jpackage/1/openjdk-14-jpackage+1-64_linux-x64_bin.tar.gz" -O "build/jdk-14.tar.gz"
           sudo mkdir /opt/java
           sudo tar -xzvf build/jdk-14.tar.gz -C /opt/java
         displayName: 'Download JDK 14'
@@ -76,7 +76,7 @@ jobs:
         displayName: 'Download JDK'
       - powershell: |
           $ProgressPreference = 'SilentlyContinue'
-          wget "https://download.java.net/java/early_access/jpackage/1/openjdk-14-jpackage+1-49_windows-x64_bin.zip" -O "build\jdk-14.zip"
+          wget "https://download.java.net/java/early_access/jpackage/1/openjdk-14-jpackage+1-64_windows-x64_bin.zip" -O "build\jdk-14.zip"
           Expand-Archive build\jdk-14.zip -DestinationPath build
         displayName: 'Download JDK 14'
       - task: JavaToolInstaller@0
@@ -130,7 +130,7 @@ jobs:
         displayName: 'Download JDK'
       - powershell: |
           $ProgressPreference = 'SilentlyContinue'
-          wget "https://download.java.net/java/early_access/jpackage/1/openjdk-14-jpackage+1-49_windows-x64_bin.zip" -O "build\jdk-14.zip"
+          wget "https://download.java.net/java/early_access/jpackage/1/openjdk-14-jpackage+1-64_windows-x64_bin.zip" -O "build\jdk-14.zip"
           Expand-Archive build\jdk-14.zip -DestinationPath build
         displayName: 'Download JDK 14'
       - task: JavaToolInstaller@0
@@ -173,7 +173,7 @@ jobs:
       - script: |
           mkdir build
           wget "https://download.java.net/java/ga/jdk11/openjdk-11_osx-x64_bin.tar.gz" -O "build/jdk.tar.gz"
-          wget "https://download.java.net/java/early_access/jpackage/1/openjdk-14-jpackage+1-49_osx-x64_bin.tar.gz" -O "build/jdk-14.tar.gz"
+          wget "https://download.java.net/java/early_access/jpackage/1/openjdk-14-jpackage+1-64_osx-x64_bin.tar.gz" -O "build/jdk-14.tar.gz"
           sudo tar xzvf build/jdk-14.tar.gz -C /Library/Java/JavaVirtualMachines/
           sudo tar xvzf build/jdk.tar.gz -C /Library/Java/JavaVirtualMachines/
           export JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk-11.jdk/Contents/Home/

diff --git a/ui/ui.gradle.kts b/ui/ui.gradle.kts
@@ -338,8 +338,7 @@ fun JpackageExec.configureForCurrentOs() {
         OperatingSystem.LINUX -> {
             val installerFileDir = installerFilesBaseDir.resolve("linux")
             resourceDir.set(installerFileDir)
-            // Skip icon on linux, causing build to break
-            //icon.set(installerFileDir.resolve("GRIP.png"))
+            icon.set(installerFileDir.resolve("GRIP.png"))
             installerType.set("deb")
         }
     }