Skip to content

Commit 6f2a252

Browse files
ThadHouseAustinShalit
authored andcommitted
Update jpackage to release 64 (#955)
Existing version was deleted
1 parent 8923d10 commit 6f2a252

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

azure-pipelines.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- script: |
2323
$ProgressPreference = 'SilentlyContinue'
2424
mkdir build
25-
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"
25+
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"
2626
sudo mkdir /opt/java
2727
sudo tar -xzvf build/jdk-14.tar.gz -C /opt/java
2828
displayName: 'Download JDK 14'
@@ -76,7 +76,7 @@ jobs:
7676
displayName: 'Download JDK'
7777
- powershell: |
7878
$ProgressPreference = 'SilentlyContinue'
79-
wget "https://download.java.net/java/early_access/jpackage/1/openjdk-14-jpackage+1-49_windows-x64_bin.zip" -O "build\jdk-14.zip"
79+
wget "https://download.java.net/java/early_access/jpackage/1/openjdk-14-jpackage+1-64_windows-x64_bin.zip" -O "build\jdk-14.zip"
8080
Expand-Archive build\jdk-14.zip -DestinationPath build
8181
displayName: 'Download JDK 14'
8282
- task: JavaToolInstaller@0
@@ -130,7 +130,7 @@ jobs:
130130
displayName: 'Download JDK'
131131
- powershell: |
132132
$ProgressPreference = 'SilentlyContinue'
133-
wget "https://download.java.net/java/early_access/jpackage/1/openjdk-14-jpackage+1-49_windows-x64_bin.zip" -O "build\jdk-14.zip"
133+
wget "https://download.java.net/java/early_access/jpackage/1/openjdk-14-jpackage+1-64_windows-x64_bin.zip" -O "build\jdk-14.zip"
134134
Expand-Archive build\jdk-14.zip -DestinationPath build
135135
displayName: 'Download JDK 14'
136136
- task: JavaToolInstaller@0
@@ -173,7 +173,7 @@ jobs:
173173
- script: |
174174
mkdir build
175175
wget "https://download.java.net/java/ga/jdk11/openjdk-11_osx-x64_bin.tar.gz" -O "build/jdk.tar.gz"
176-
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"
176+
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"
177177
sudo tar xzvf build/jdk-14.tar.gz -C /Library/Java/JavaVirtualMachines/
178178
sudo tar xvzf build/jdk.tar.gz -C /Library/Java/JavaVirtualMachines/
179179
export JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk-11.jdk/Contents/Home/

ui/ui.gradle.kts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -338,8 +338,7 @@ fun JpackageExec.configureForCurrentOs() {
338338
OperatingSystem.LINUX -> {
339339
val installerFileDir = installerFilesBaseDir.resolve("linux")
340340
resourceDir.set(installerFileDir)
341-
// Skip icon on linux, causing build to break
342-
//icon.set(installerFileDir.resolve("GRIP.png"))
341+
icon.set(installerFileDir.resolve("GRIP.png"))
343342
installerType.set("deb")
344343
}
345344
}

0 commit comments

Comments
 (0)