diff --git a/.travis.yml b/.travis.yml index 51a5353606..f4d18efa5c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,9 @@ script: - ./gradlew check - ./gradlew tests:test - if [ -n "$TRAVIS_TAG" ]; then - wget -O jdk-windows.zip https://github.com/ojdkbuild/ojdkbuild/releases/download/java-1.8.0-openjdk-1.8.0.232-1.b09/java-1.8.0-openjdk-1.8.0.232-1.b09.ojdkbuild.windows.x86_64.zip; + wget -O jdk-windows-64.zip https://github.com/ojdkbuild/ojdkbuild/releases/download/java-1.8.0-openjdk-1.8.0.232-1.b09/java-1.8.0-openjdk-1.8.0.232-1.b09.ojdkbuild.windows.x86_64.zip; + wget -O jdk-windows-32.zip https://developers.redhat.com/download-manager/file/java-1.8.0-openjdk-1.8.0.252-2.b09.redhat.windows.x86.zip; + ./gradlew desktop:packrWindows32; ./gradlew desktop:packrWindows64; ./gradlew desktop:packrLinux32; diff --git a/desktop/build.gradle b/desktop/build.gradle index f8af688c5d..b5d6a2a8ce 100644 --- a/desktop/build.gradle +++ b/desktop/build.gradle @@ -34,7 +34,7 @@ task dist(dependsOn: classes, type: Jar) { // Compiles the jar file // see Laurent1967's comment on https://github.com/libgdx/libgdx/issues/5491 from {configurations.compileClasspath.collect { it.isDirectory() ? it : zipTree(it) }} from files(project.assetsDir) - // This is for the .dll and .so files to ake the Discord RPC work on all desktops + // This is for the .dll and .so files to make the Discord RPC work on all desktops from files(project.discordDir) archiveFileName = "${appName}.jar" @@ -58,8 +58,10 @@ for(platform in PackrConfig.Platform.values()) { config.jdk = System.env.'JAVA_HOME' // take the jdk straight from the building linux computer - if (platform == PackrConfig.Platform.Windows32 || platform == PackrConfig.Platform.Windows64) - config.jdk = "jdk-windows.zip" // see how we download and name this in travis yml + if (platform == PackrConfig.Platform.Windows64) + config.jdk = "jdk-windows-64.zip" // see how we download and name this in travis yml + if (platform == PackrConfig.Platform.Windows32) + config.jdk = "jdk-windows-32.zip" // see how we download and name this in travis yml } else { // for my computer