diff --git a/server/build.gradle.kts b/server/build.gradle.kts index bdf3d4f..65028a6 100644 --- a/server/build.gradle.kts +++ b/server/build.gradle.kts @@ -131,7 +131,7 @@ launch4j { //used for windows bundledJrePath = "jre" bundledJre64Bit = true jreMinVersion = "8" - outputDir = "${rootProject.name}-$tachideskVersion-$tachideskRevision-win32" + outputDir = "${rootProject.name}-$tachideskVersion-$tachideskRevision-win64" icon = "${projectDir}/src/main/resources/icon/faviconlogo.ico" jar = "${projectDir}/build/${rootProject.name}-$tachideskVersion-$tachideskRevision.jar" } @@ -170,38 +170,38 @@ tasks { } register("windowsPackage") { - from(fileTree("$buildDir/${rootProject.name}-$tachideskVersion-$tachideskRevision-win32")) + from(fileTree("$buildDir/${rootProject.name}-$tachideskVersion-$tachideskRevision-win64")) destinationDirectory.set(File("$buildDir")) - archiveFileName.set("${rootProject.name}-$tachideskVersion-$tachideskRevision-win32.zip") + archiveFileName.set("${rootProject.name}-$tachideskVersion-$tachideskRevision-win64.zip") dependsOn("windowsPackageWorkaround2") } register("windowsPackageWorkaround2") { delete( - "$buildDir/${rootProject.name}-$tachideskVersion-$tachideskRevision-win32/jre", - "$buildDir/${rootProject.name}-$tachideskVersion-$tachideskRevision-win32/lib", - "$buildDir/${rootProject.name}-$tachideskVersion-$tachideskRevision-win32/server.exe", - "$buildDir/${rootProject.name}-$tachideskVersion-$tachideskRevision-win32/Tachidesk-$tachideskVersion-$tachideskRevision-win32/Tachidesk-$tachideskVersion-$tachideskRevision-win32" + "$buildDir/${rootProject.name}-$tachideskVersion-$tachideskRevision-win64/jre", + "$buildDir/${rootProject.name}-$tachideskVersion-$tachideskRevision-win64/lib", + "$buildDir/${rootProject.name}-$tachideskVersion-$tachideskRevision-win64/server.exe", + "$buildDir/${rootProject.name}-$tachideskVersion-$tachideskRevision-win64/Tachidesk-$tachideskVersion-$tachideskRevision-win64/Tachidesk-$tachideskVersion-$tachideskRevision-win64" ) dependsOn("windowsPackageWorkaround") } register("windowsPackageWorkaround") { - from("$buildDir/${rootProject.name}-$tachideskVersion-$tachideskRevision-win32") - into("$buildDir/${rootProject.name}-$tachideskVersion-$tachideskRevision-win32/${rootProject.name}-$tachideskVersion-$tachideskRevision-win32") + from("$buildDir/${rootProject.name}-$tachideskVersion-$tachideskRevision-win64") + into("$buildDir/${rootProject.name}-$tachideskVersion-$tachideskRevision-win64/${rootProject.name}-$tachideskVersion-$tachideskRevision-win64") dependsOn("deleteUnwantedJreDir") } register("deleteUnwantedJreDir") { delete( - "$buildDir/${rootProject.name}-$tachideskVersion-$tachideskRevision-win32/jdk8u282-b08-jre" + "$buildDir/${rootProject.name}-$tachideskVersion-$tachideskRevision-win64/jdk8u292-b10-jre" ) dependsOn("addJreToDistributable") } register("addJreToDistributable") { - from(zipTree("$buildDir/OpenJDK8U-jre_x86-32_windows_hotspot_8u282b08.zip")) - into("$buildDir/${rootProject.name}-$tachideskVersion-$tachideskRevision-win32") + from(zipTree("$buildDir/OpenJDK8U-jre_x64_windows_hotspot_8u292b10.zip")) + into("$buildDir/${rootProject.name}-$tachideskVersion-$tachideskRevision-win64") eachFile { path = path.replace(".*-jre".toRegex(), "jre") } @@ -214,8 +214,8 @@ tasks { } register("downloadJre") { - src("https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_x86-32_windows_hotspot_8u282b08.zip") - dest("$buildDir/OpenJDK8U-jre_x86-32_windows_hotspot_8u282b08.zip") + src("https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jre_x64_windows_hotspot_8u292b10.zip") + dest("$buildDir/OpenJDK8U-jre_x64_windows_hotspot_8u292b10.zip") overwrite(false) onlyIfModified(true) }