v3.3.0: Updated Windows and Linux builds to JDK 17, from 16
Also dropping official support for Windows 7
This commit is contained in:
@@ -69,27 +69,29 @@ runtime {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (osName.contains('windows')) {
|
if (osName.contains('windows')) {
|
||||||
|
//May work on Windows 7 (2009), but that's old enough that I'm only officially supporting Windows 10 (2015)
|
||||||
targetPlatform("win") {
|
targetPlatform("win") {
|
||||||
jdkHome = jdkDownload("https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_x64_windows_hotspot_16.0.1_9.zip")
|
jdkHome = jdkDownload("https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.16%2B8/OpenJDK17U-jdk_x64_windows_hotspot_17.0.16_8.zip")
|
||||||
javaHome = file("./build/jdks/win/jdk-16.0.1+9").getAbsolutePath()
|
javaHome = file("./build/jdks/win/jdk-17.0.16+8").getAbsolutePath()
|
||||||
jpackage {
|
jpackage {
|
||||||
jpackageHome = file("./build/jdks/win/jdk-16.0.1+9")
|
jpackageHome = file("./build/jdks/win/jdk-17.0.16+8")
|
||||||
imageOptions = ["--icon", file("./src/main/assets/icons/windows.ico"),
|
imageOptions = ["--icon", file("./src/main/assets/icons/windows.ico"),
|
||||||
"--java-options", "-XX:+IgnoreUnrecognizedVMOptions"]
|
"--java-options", "-XX:+IgnoreUnrecognizedVMOptions"]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if (osName.contains('linux')) {
|
} else if (osName.contains('linux')) {
|
||||||
|
//May work on glibc 2.12 (2010), but that's old enough that I'm only officially supporting glibc 2.17 (2012)
|
||||||
targetPlatform("linux") {
|
targetPlatform("linux") {
|
||||||
jdkHome = jdkDownload("https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_x64_linux_hotspot_16.0.1_9.tar.gz")
|
jdkHome = jdkDownload("https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.16%2B8/OpenJDK17U-jdk_x64_linux_hotspot_17.0.16_8.tar.gz")
|
||||||
javaHome = file("./build/jdks/linux/jdk-16.0.1+9").getAbsolutePath()
|
javaHome = file("./build/jdks/linux/jdk-17.0.16+8").getAbsolutePath()
|
||||||
jpackage {
|
jpackage {
|
||||||
jpackageHome = file("./build/jdks/linux/jdk-16.0.1+9")
|
jpackageHome = file("./build/jdks/linux/jdk-17.0.16+8")
|
||||||
imageOptions = ["--icon", file("./src/main/assets/icons/icon_256.png"),
|
imageOptions = ["--icon", file("./src/main/assets/icons/icon_256.png"),
|
||||||
"--java-options", "-XX:+IgnoreUnrecognizedVMOptions"]
|
"--java-options", "-XX:+IgnoreUnrecognizedVMOptions"]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if (osName.contains('mac')) {
|
} else if (osName.contains('mac')) {
|
||||||
//Adoptium JDK 17 officially supports MacOS 12+, but internals suggest support for 10.12+
|
//This JDK officially supports MacOS 12 (2021), but internals suggest support for 10.12 (2016)
|
||||||
targetPlatform("mac") {
|
targetPlatform("mac") {
|
||||||
jdkHome = jdkDownload("https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.16%2B8/OpenJDK17U-jdk_x64_mac_hotspot_17.0.16_8.tar.gz")
|
jdkHome = jdkDownload("https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.16%2B8/OpenJDK17U-jdk_x64_mac_hotspot_17.0.16_8.tar.gz")
|
||||||
javaHome = file("./build/jdks/mac/jdk-17.0.16+8/Contents/Home/").getAbsolutePath()
|
javaHome = file("./build/jdks/mac/jdk-17.0.16+8/Contents/Home/").getAbsolutePath()
|
||||||
|
|||||||
Reference in New Issue
Block a user