Bump Gradle to 8.3 (#2475)

This commit is contained in:
Glavo
2023-08-19 06:13:39 +08:00
committed by GitHub
parent fe622579cf
commit d83b508ce4
5 changed files with 108 additions and 102 deletions

View File

@@ -23,9 +23,9 @@ data class Platform(
module: String, classifier: String, ext: String,
repo: String = "https://repo1.maven.org/maven2"
): java.net.URL =
java.net.URL(
java.net.URI(
"$repo/${groupId.replace('.', '/')}/javafx-$module/$version/javafx-$module-$version-$classifier.$ext"
)
).toURL()
}
val jfxModules = listOf("base", "graphics", "controls", "media", "web")
@@ -53,7 +53,7 @@ val jfxInClasspath =
}
if (!jfxInClasspath && JavaVersion.current() >= JavaVersion.VERSION_11) {
val os = System.getProperty("os.name").toLowerCase().let { osName ->
val os = System.getProperty("os.name").lowercase().let { osName ->
when {
osName.contains("win") -> "windows"
osName.contains("mac") -> "osx"
@@ -62,7 +62,7 @@ if (!jfxInClasspath && JavaVersion.current() >= JavaVersion.VERSION_11) {
}
}
val arch = when (System.getProperty("os.arch").toLowerCase()) {
val arch = when (System.getProperty("os.arch").lowercase()) {
"x86_64", "x86-64", "amd64", "ia32e", "em64t", "x64" -> "x86_64"
"x86", "x86_32", "x86-32", "i386", "i486", "i586", "i686", "i86pc", "ia32", "x32" -> "x86"
"arm64", "aarch64", "armv8", "armv9" -> "arm64"