update java and java fx versions (FAForever#1707)

* Update java fx and java jre

Fixes FAForever#1675

* Clean up CLI

* Update Gradle

* Fix coveralls by update

* Try fix cert errors

* Install new java

* Install new java

* Correct jdk name

* Install new java

* Fix WebViewPatcher

* Add note about changes

* Update to Gradle 6.5

.travis.yml

@@ -1,9 +1,5 @@
 language: java
 
-#Can not be used any longer as travis moved to adoptjdk which as issues with our project
-#jdk:
-#-openjdk10
-
 sudo: false
 
 services:
@@ -13,27 +9,31 @@ install: true
 
 env:
   global:
-  - secure: "UVIbeoJpx9n0KSWHbpdWZuR4zeZfXw3JQBq2Zb1h0/j4uREfXWiGFuNVQBPjsdtYi2+LkecjJ/MgKWo+SS0SjsvTa/ZPkOXt4408H1qYgwVnvWoeL/g1QQ6T8ADNysl/4ZtJLnSp0WXYEBkfHYZJD++vgDwkpVhnCLVzSFVAHls="
+    - secure: "UVIbeoJpx9n0KSWHbpdWZuR4zeZfXw3JQBq2Zb1h0/j4uREfXWiGFuNVQBPjsdtYi2+LkecjJ/MgKWo+SS0SjsvTa/ZPkOXt4408H1qYgwVnvWoeL/g1QQ6T8ADNysl/4ZtJLnSp0WXYEBkfHYZJD++vgDwkpVhnCLVzSFVAHls="
 
 before_install:
-#JDK defines the directory to store the jdk in
-- export JDK="openjdk10"
-#Installs the normal openjdk as this is not supported by travis itself
-- chmod +x ./ci/installjdk.sh && sudo ./ci/installjdk.sh
-- export JAVA_HOME="~/$JDK"
-- export PATH="$JAVA_HOME/bin:$PATH"
-- export JAVA_TOOL_OPTIONS="-Dprism.verbose=true -Dprism.order=sw -Djava.library.path=$HOME/openjfx/javafx-sdk-11/lib"
-- export APP_VERSION=$([ -n "${TRAVIS_TAG}" ] && echo "${TRAVIS_TAG#*v}" || echo "${TRAVIS_BRANCH##*/}")
-- export GITHUB_RELEASE_VERSION=$([ -n "${TRAVIS_TAG}" ] && echo "${TRAVIS_TAG}" || echo "${TRAVIS_BRANCH##*/}")
+  - export JDK="openjdk11"
+  #Installs the normal openjdk as this is not supported by travis itself
+  - chmod +x ./ci/installjdk.sh && sudo ./ci/installjdk.sh
+  - export JAVA_HOME="~/$JDK"
+  - export JAVA_TOOL_OPTIONS="-Dprism.verbose=true -Dprism.order=sw -Djava.library.path=$HOME/openjfx/javafx-sdk-11/lib"
+  - export JAVA_TOOL_OPTIONS="-Dprism.verbose=true -Dprism.order=sw"
+  - export APP_VERSION=$([ -n "${TRAVIS_TAG}" ] && echo "${TRAVIS_TAG#*v}" || echo "${TRAVIS_BRANCH##*/}")
+  - export GITHUB_RELEASE_VERSION=$([ -n "${TRAVIS_TAG}" ] && echo "${TRAVIS_TAG}" || echo "${TRAVIS_BRANCH##*/}")
+
+before_script:
+  - export PATH="$JAVA_HOME/bin:$PATH"
 
 script:
-- echo "$JAVA_HOME"
-- chmod +x ./ci/build.sh && ./ci/build.sh
-- chmod +x ./ci/test.sh && ./ci/test.sh
-- chmod +x ./ci/test-report.sh && ./ci/test-report.sh
+  - echo "$JAVA_HOME"
+  - echo "$PATH"
+  - java -version
+  - chmod +x ./ci/build.sh && ./ci/build.sh
+  - chmod +x ./ci/test.sh && ./ci/test.sh
+  - chmod +x ./ci/test-report.sh && ./ci/test-report.sh
 
 after_success:
-- if [ -n "${TRAVIS_TAG}" ]; then chmod +x ./ci/github-release.sh && ./ci/github-release.sh; fi
+  - if [ -n "${TRAVIS_TAG}" ]; then chmod +x ./ci/github-release.sh && ./ci/github-release.sh; fi
 
 after_failure:
 - cat /home/travis/build/FAForever/downlords-faf-client/hs_err_pid*.log
@@ -81,10 +81,7 @@ before_cache:
 cache:
   directories:
   - $HOME/install4j/
-  - $HOME/openjfx/
   - $HOME/.gradle/caches/
   - $HOME/.gradle/wrapper/
   - /home/travis/build/FAForever/downlords-faf-client/build/cache/
-  - $HOME/.install4j8/
-  - ~/openjdk10
-
+  - ~/openjdk11

build.gradle

@@ -18,7 +18,6 @@ buildscript {
     classpath("gradle.plugin.install4j.install4j:gradle_plugin:7.0.7")
     classpath("org.springframework.build.gradle:propdeps-plugin:${propdepsVersion}")
     classpath "org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}"
-    classpath("org.kt3k.gradle.plugin:coveralls-gradle-plugin:${coverallsGradlePluginVersion}")
   }
 }
 
@@ -28,19 +27,19 @@ plugins {
   id "de.undercouch.download" version "3.4.3"
   id "io.franzbecker.gradle-lombok" version "1.14"
   id 'net.ltgt.apt' version '0.19'
+  id 'jacoco'
+  id 'com.github.kt3k.coveralls' version "${coverallsGradlePluginVersion}"
 }
 
 apply plugin: 'java'
 apply plugin: 'org.springframework.boot'
 apply plugin: 'io.spring.dependency-management'
 apply plugin: 'propdeps'
-apply plugin: 'jacoco'
-apply plugin: 'com.github.kt3k.coveralls'
 apply plugin: 'distribution'
 
 
-sourceCompatibility = JavaVersion.VERSION_1_10
-targetCompatibility = JavaVersion.VERSION_1_10
+sourceCompatibility = JavaVersion.VERSION_11
+targetCompatibility = JavaVersion.VERSION_11
 
 // These are read from gradle.properties
 version "${version}"
@@ -231,10 +230,6 @@ task downloadNativeDependencies(dependsOn: [downloadUnixUid, downloadWindowsUid,
 compileJava.dependsOn 'downloadNativeDependencies'
 compileJava.dependsOn ':webview-patch:build'
 
-task wrapper(type: Wrapper) {
-  gradleVersion = '4.5.1'
-}
-
 task sendCoverageToCodacy(type: JavaExec, dependsOn: jacocoTestReport) {
   main = "com.codacy.CodacyCoverageReporter"
   classpath = configurations.codacy
@@ -251,10 +246,6 @@ repositories {
   maven { url "https://repo.spring.io/milestone/" }
 }
 
-jacoco {
-  toolVersion = "${jacocoVersion}"
-}
-
 dependencies {
   compile("org.springframework.boot:spring-boot-starter")
   compile("org.springframework.boot:spring-boot-starter-cache")
@@ -319,6 +310,5 @@ dependencies {
 
   optional("org.springframework.boot:spring-boot-configuration-processor")
 
-
   codacy("com.github.codacy:codacy-coverage-reporter:-SNAPSHOT")
 }

ci/build.sh

@@ -1,11 +1,3 @@
 #!/usr/bin/env bash
 
-# Download JavaFX only if it doesn't already exist (from Travis cache)
-if [ ! -d "$HOME/openjfx/javafx-sdk-11" ]; then
-  mkdir -p "$HOME/openjfx"
-  curl https://content.faforever.com/openjfx/openjfx-11_linux-x64_bin-sdk.zip -o "$HOME/openjfx/openjfx.zip"
-  unzip -d "$HOME/openjfx" "$HOME/openjfx/openjfx.zip"
-  ls -lah $HOME/openjfx/javafx-sdk-11/lib
-fi
-
 ./gradlew --stacktrace -Pversion=${APP_VERSION} -PjavafxPlatform=linux jar

ci/github-release.sh

@@ -2,11 +2,12 @@
 
 # Download install4j and the required JRE, only if it doesn't already exist (from Travis cache)
 INSTALL4J_DIR="$HOME/install4j/install4j7.0.12"
-if [ ! -d "${INSTALL4J_DIR}" ]; then
+if [ ! -d "${INSTALL4J_DIR}" ] || [ ! -d "${INSTALL4J_DIR}/jres/windows-amd64-11.0.7_packed.tar.gz" ]; then
+  rm -rf "$HOME/install4j"
   mkdir -p "$HOME/install4j"
   curl https://download-keycdn.ej-technologies.com/install4j/install4j_unix_7_0_12.tar.gz -o "$HOME/install4j/install4j.tar.gz"
   mkdir -p "${INSTALL4J_DIR}/jres/"
-  curl https://content.faforever.com/jre/windows-amd64-10.0.2.tar.gz -o "${INSTALL4J_DIR}/jres/windows-amd64-10.0.2.tar.gz"
+  curl https://content.faforever.com/jre/windows-amd64-11.0.7.tar.gz -o "${INSTALL4J_DIR}/jres/windows-amd64-11.0.7_packed.tar.gz"
   tar xzf "$HOME/install4j/install4j.tar.gz" -C "$HOME/install4j"
 fi
 

ci/installjdk.sh

@@ -13,7 +13,4 @@ wget "$url" -P ~/bin/ || {
 }
 chmod +x ~/bin/install-jdk.sh
 export JAVA_HOME="~/$JDK"
-# shellcheck disable=SC2016
-export PATH="$JAVA_HOME/bin:$PATH"
-# shellcheck disable=2088
-~/bin/install-jdk.sh --url "https://download.java.net/openjdk/jdk10/ri/jdk-10_linux-x64_bin_ri.tar.gz" --target "$JAVA_HOME" --workspace "$TRAVIS_HOME/.cache/install-jdk" --cacerts
+~/bin/install-jdk.sh --url "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jdk_x64_linux_hotspot_11.0.7_10.tar.gz" --target "$JAVA_HOME" --workspace "$TRAVIS_HOME/.cache/install-jdk" --cacerts

downlords-faf-client.install4j

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <install4j version="7.0.12" transformSequenceNumber="7">
   <directoryPresets config="./src/media/appicon" />
-  <application name="Downlord's FAF Client" distributionSourceDir="" applicationId="2848-7798-9769-5013" mediaDir="./build/install4j" mediaFilePattern="${compiler:sys.shortName}_${compiler:sys.platform}_${compiler:sys.version}" compression="6" lzmaCompression="true" pack200Compression="true" excludeSignedFromPacking="true" commonExternalFiles="false" createMd5Sums="true" shrinkRuntime="true" shortName="dfc" publisher="Downlord" publisherWeb="https://github.com/FAForever/downlords-faf-client" version="" allPathsRelative="true" backupOnSave="false" autoSave="true" convertDotsToUnderscores="true" macSignature="????" macVolumeId="e230e730a6fc064c" javaMinVersion="10" javaMaxVersion="13" allowBetaVM="true" jdkMode="runtimeJre" jdkName="">
+  <application name="Downlord's FAF Client" distributionSourceDir="" applicationId="2848-7798-9769-5013" mediaDir="./build/install4j" mediaFilePattern="${compiler:sys.shortName}_${compiler:sys.platform}_${compiler:sys.version}" compression="6" lzmaCompression="true" pack200Compression="true" excludeSignedFromPacking="true" commonExternalFiles="false" createMd5Sums="true" shrinkRuntime="true" shortName="dfc" publisher="Downlord" publisherWeb="https://github.com/FAForever/downlords-faf-client" version="" allPathsRelative="true" backupOnSave="false" autoSave="true" convertDotsToUnderscores="true" macSignature="????" macVolumeId="e230e730a6fc064c" javaMinVersion="11" javaMaxVersion="11" allowBetaVM="true" jdkMode="runtimeJre" jdkName="">
     <languages skipLanguageSelection="false" languageSelectionInPrincipalLanguage="false">
       <principalLanguage id="en" customLocalizationFile="" />
       <additionalLanguages />
@@ -1449,7 +1449,7 @@ return console.askYesNo(message, true);
     </styles>
   </installerGui>
   <mediaSets>
-    <windows name="Windows" id="26" customizedId="" mediaFileName="" installDir="${compiler:sys.fullName}" overridePrincipalLanguage="false" jreBitType="64" runPostProcessor="false" postProcessor="" failOnPostProcessorError="false" useLegacyMediaFileIds="false" legacyMediaFileIds="" downloadURL="" includeAllDownloadableComponents="false" includedJRE="windows-amd64-10.0.2" manualJREEntry="false" bundleType="1" jreURL="https://content.faforever.com/jre/windows-amd64-10.0.2.tar.gz" jreShared="false" directDownload="false" installOnlyIfNecessary="false" customInstallBaseDir="" contentFilesType="1" verifyIntegrity="true">
+    <windows name="Windows" id="26" customizedId="" mediaFileName="" installDir="${compiler:sys.fullName}" overridePrincipalLanguage="false" jreBitType="64" runPostProcessor="false" postProcessor="" failOnPostProcessorError="false" useLegacyMediaFileIds="false" legacyMediaFileIds="" downloadURL="" includeAllDownloadableComponents="false" includedJRE="windows-amd64-11.0.7_packed" manualJREEntry="false" bundleType="1" jreURL="https://content.faforever.com/jre/windows-amd64-11.0.7.tar.gz" jreShared="false" directDownload="true" installOnlyIfNecessary="false" customInstallBaseDir="" contentFilesType="1" verifyIntegrity="true">
       <excludedComponents />
       <includedDownloadableComponents />
       <excludedLaunchers />
@@ -1465,7 +1465,7 @@ return console.askYesNo(message, true);
         <customAttributes />
       </autoUpdate>
     </windows>
-    <windowsArchive name="Windows Archive" id="330" customizedId="" mediaFileName="" installDir="downlords-faf-client-${compiler:sys.version}" overridePrincipalLanguage="false" jreBitType="64" runPostProcessor="false" postProcessor="" failOnPostProcessorError="false" useLegacyMediaFileIds="false" legacyMediaFileIds="" downloadURL="" includeAllDownloadableComponents="true" includedJRE="windows-amd64-10.0.2" manualJREEntry="false">
+    <windowsArchive name="Windows Archive" id="330" customizedId="" mediaFileName="" installDir="downlords-faf-client-${compiler:sys.version}" overridePrincipalLanguage="false" jreBitType="64" runPostProcessor="false" postProcessor="" failOnPostProcessorError="false" useLegacyMediaFileIds="false" legacyMediaFileIds="" downloadURL="" includeAllDownloadableComponents="true" includedJRE="windows-amd64-11.0.7_packed" manualJREEntry="false">
       <excludedComponents />
       <includedDownloadableComponents />
       <excludedLaunchers />

gradle.properties

@@ -5,7 +5,7 @@ faf_uid_version=4.0.4
 propdepsVersion=0.0.7
 springBootVersion=2.1.6.RELEASE
 springSecurityOauth2AutoconfigureVersion=2.1.6.RELEASE
-lombokVersion=1.18.2
+lombokVersion=1.18.12
 fafCommonsVersion=0b83fa48a039cea085a7d462cc937fb5a035c186
 jacksonDatatypeJsr310Version=2.9.7
 qBuildersVersion=1.6
@@ -14,8 +14,7 @@ jsonapiConverterVersion=0.9
 install4jRuntimeVersion=7.0.7
 jfoenixVersion=9.0.6
 javassist.version=3.23.1-GA
-javafxVersion=11.0.2
-coverallsGradlePluginVersion=2.8.2
+javafxVersion=14.0.1
+coverallsGradlePluginVersion=2.10.1
 jnaVersion=5.0.0
-jacocoVersion=0.8.2
 discordRpcVersion=1.6.2-jna

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Mon Jan 30 18:27:36 CET 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip

gradlew

@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,16 +44,16 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -109,8 +125,8 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
     JAVACMD=`cygpath --unix "$JAVACMD"`
@@ -138,35 +154,30 @@ if $cygwin ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
 # Escape application args
-save ( ) {
+save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome

webview-patch/build.gradle

@@ -1,6 +1,6 @@
 apply plugin: 'java'
 
-sourceCompatibility = 1.10
+sourceCompatibility = 1.11
 
 repositories {
   mavenCentral()

webview-patch/src/main/java/com/faforever/client/webviewpatcher/TransparentWebViewPatch.java

@@ -17,6 +17,8 @@
  * software.
  * <p>
  * 3. This notice may not be removed or altered from any source distribution.
+ *
+ * Changes made to the original can be seen in the git history.
  */
 
 import javassist.ClassPool;
@@ -61,9 +63,10 @@ public byte[] transform(ClassLoader loader, String class_name, Class<?> class_be
         // repaint of the entire frame
         // when the page is scrolled
         CtMethod scroll_method = ct_class.getDeclaredMethod("scroll");
-        scroll_method.setBody(
+        scroll_method.insertBefore(
             "{\n" + "   "
                 + "addDirtyRect(new com.sun.webkit.graphics.WCRectangle(0f,0f,(float)width,(float)height));\n"
+                + "return;"
                 + "}"
         );
         byte_code = ct_class.toBytecode();
@@ -81,7 +84,7 @@ public byte[] transform(ClassLoader loader, String class_name, Class<?> class_be
 
         // Then, we edit the the WCGraphicsPrismContext.setClip method
         // in order to call clearRect over the area of the clip.
-        CtClass signature[] = new CtClass[]{_CLASS_POOL.get("com.sun.webkit.graphics.WCRectangle")};
+        CtClass[] signature = new CtClass[]{_CLASS_POOL.get("com.sun.webkit.graphics.WCRectangle")};
         CtMethod setClip_method = ct_class.getDeclaredMethod("setClip", signature);
         setClip_method.insertBefore(
             "{" + "  "