Merge pull request #257 from alpha-asp/java-update

Upgrade Java and Gradle

.travis.yml

@@ -1,8 +1,5 @@
-# Route our builds to Travis CI's Container Based
-# Infrastructure for shorter queue times.
-# https://docs.travis-ci.com/user/workers/container-based-infrastructure/#Routing-your-build-to-container-based-infrastructure
-sudo: true
-
+os: linux
+dist: focal
 language: java
 
 # We test against Java releases:
@@ -11,20 +8,26 @@ language: java
 #    - with LTS and in "Premier Support" phase
 #    OR
 #    - not succeeded by any other release
+# No Oracle JDK >11, see
+# https://blogs.oracle.com/java-platform-group/oracle-jdk-releases-for-java-11-and-later
 # https://www.oracle.com/technetwork/java/java-se-support-roadmap.html
 # https://docs.travis-ci.com/user/languages/java#Testing-Against-Multiple-JDKs
-jdk:
-  # LTS and in "Premier Support" as of 2019-03 (until 2022-03)
-  - openjdk8
-  # - oraclejdk8 # Removed due to not being supported on Ubuntu xenial
-  # LTS and in "Premier Support" as of 2019-03 (until 2023-09)
-  - openjdk11
-  - oraclejdk11
-  # Not succeeded as of 2019-11. Scheduled to be succeeded by
-  # Java 14 in 2020-03, see http://openjdk.java.net/projects/jdk/14/spec/
-  - openjdk13
-  # No Oracle JDK >11, see
-  # https://blogs.oracle.com/java-platform-group/oracle-jdk-releases-for-java-11-and-later
+# https://docs.travis-ci.com/user/reference/linux/
+jobs:
+  include:
+    - dist: trusty
+      # LTS and in "Premier Support" as of 2019-03 (until 2022-03)
+      jdk: oraclejdk8
+    - dist: xenial
+      # LTS and in "Premier Support" as of 2019-03 (until 2022-03)
+      jdk: openjdk8
+    - dist: focal
+      # LTS and in "Premier Support" as of 2019-03 (until 2023-09)
+      jdk: openjdk11
+    - dist: focal
+      # Not succeeded as of 2020-10. Scheduled to be succeeded by
+      # Java 16 in 2021-03, see http://openjdk.java.net/projects/jdk/16/
+      jdk: openjdk15
 
 # As of 2016-06 Travis CI is running an outdated
 # version of Gradle, so this workaround fetches

build.gradle

@@ -126,6 +126,6 @@ test {
 }
 
 wrapper {
-	gradleVersion = '6.0'
+	gradleVersion = '6.7'
 	distributionType = 'ALL'
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -82,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath

gradlew.bat

@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @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="-Xmx64m" "-Xms64m"
 
@@ -37,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -51,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -61,28 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell