Merge pull request #162 from jameshilliard/update-gradle

Update gradle to version 6.5 and fix jdk14 compatibility
jpos · Jun 26, 2020 · dae8fc7 · dae8fc7
2 parents d814315 + 2f410de
commit dae8fc7
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,6 +8,7 @@ jdk:
   - openjdk11
   - openjdk12
   - openjdk13
+  - openjdk14
 before_script:
 - echo $JAVA_OPTS
 - export JAVA_OPTS=-Xmx1G

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/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

diff --git a/gradlew.bat b/gradlew.bat
@@ -84,6 +84,7 @@ set CMD_LINE_ARGS=%*
 
 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%
 

diff --git a/libraries.gradle b/libraries.gradle
@@ -12,7 +12,8 @@ ext {
     jsonSchemaVersion = '2.2.11'
     guavaVersion = '28.1-jre'
     jacksonVersion = '2.10.0'
-    groovyVersion = '2.5.8'
+    groovyVersion = '3.0.4'
+    jlineVersion = '2.14.6'
     restAssuredVersion = '2.9.0'
     vaadinVersion = '8.10.0'
     nettyVersion = '4.1.42.Final'
@@ -102,6 +103,9 @@ ext {
             groovysh: "org.codehaus.groovy:groovy-groovysh:${groovyVersion}",
             groovySql: "org.codehaus.groovy:groovy-sql:${groovyVersion}",
 
+            // Jline
+            jline: "jline:jline:${jlineVersion}",
+
             // Jackson
             jacksonDatabind: "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}",
 
@@ -110,7 +114,7 @@ ext {
             nettyCodecHttp: "io.netty:netty-codec-http:${nettyVersion}",
 
             // RestAssured
-            restAssured: "io.rest-assured:rest-assured:4.1.1",
+            restAssured: "io.rest-assured:rest-assured:4.3.0",
 
             jsonSchemaValidator: "com.github.java-json-tools:json-schema-validator:${jsonSchemaVersion}",
             guava: "com.google.guava:guava:${guavaVersion}",

diff --git a/modules/binlog/src/test/java/org/jpos/binlog/BinLogTest.java b/modules/binlog/src/test/java/org/jpos/binlog/BinLogTest.java
@@ -100,7 +100,7 @@ public void run() {
 
     @AfterAll
     public static void cleanup() throws IOException {
-        if (Files.list(dir) != null) {
+        if (Files.isDirectory(dir)) {
             for (Path f : Files.newDirectoryStream(dir)) {
                 if (f.toString().endsWith(".dat")) {
                     System.out.println ("Deleting " + f.toString());
@@ -109,6 +109,6 @@ public static void cleanup() throws IOException {
             }
         }
         System.out.println ("Deleting " + dir);
-        Files.delete(dir);
+        Files.deleteIfExists(dir);
     }
 }
diff --git a/modules/groovy/build.gradle b/modules/groovy/build.gradle
@@ -4,6 +4,7 @@ dependencies {
     api libraries.jpos
     api libraries.groovy
     api libraries.groovysh
+    implementation libraries.jline
     api group: 'org.fusesource.jansi', name: 'jansi', version: '1.11'
 
     api libraries.groovySql