Update gradle to 6.01

Author: ducpin

.gitignore

@@ -50,6 +50,7 @@ src/main/resources/META-INF/
 /output_manager/
 /output_witness/
 output*
+bak*
 nodeId.properties
 Wallet
 

Dockerfile

@@ -1,44 +1,18 @@
-FROM ubuntu:16.04 AS builder
-
-
-RUN apt-get update \
-    && apt-get -y upgrade \
-    && apt-get -y install wget openjdk-8-jdk unzip \
-    && rm -rf /var/lib/apt/lists/*
-
-ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64/
-ENV PATH $JAVA_HOME/bin:$PATH
-
-# Installing gradle
-#ENV GRADLE_VERSION 4.10.3
-#
-#RUN TMPFILE="$(mktemp)" \
-#	&& wget "https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-bin.zip" -O "$TMPFILE" \
-#	&& unzip "$TMPFILE" -d "/usr/local" \
-#	&& mv "/usr/local/gradle-${GRADLE_VERSION}" "/usr/local/gradle" \
-#	&& ln -s "../gradle/bin/gradle" "/usr/local/bin/gradle" \
-#	&& rm "$TMPFILE"
-#
-#RUN mkdir ~/.gradle \
-#	&& echo "org.gradle.daemon=false" > ~/.gradle/gradle.properties
-#
-#ENV GRADLE_HOME=/usr/local/gradle-${GRADLE_VERSION}
-#ENV PATH=$PATH:$GRADLE_HOME/bin
-ENV APP_HOME=/usr/app
+FROM openjdk:8 AS builder
 
+ENV APP_HOME=/usr/app
+ARG BUILD_OPT
 WORKDIR $APP_HOME
-
 COPY build.gradle settings.gradle gradlew $APP_HOME/
 COPY gradle $APP_HOME/gradle
 
-RUN ./gradlew build || return 0
+RUN ./gradlew --version
 
 COPY . .
 
-RUN ./gradlew build
-
-FROM openjdk:8
+RUN ./gradlew build $BUILD_OPT
 
+FROM openjdk:8-jre
 ENV APP_HOME=/usr/app
 
 RUN mkdir -p $APP_HOME/config

build.gradle

@@ -3,9 +3,12 @@ buildscript {
 		mavenCentral()
 		jcenter()
 	}
+	ext {
+		lombokVersion = '1.18.10'
+	}
 	dependencies {
-		classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.3'
-		classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.2'
+		classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.10'
+		classpath 'com.github.jengelman.gradle.plugins:shadow:5.2.0'
 	}
 }
 plugins {
@@ -26,12 +29,10 @@ shadowJar.enabled = false
 sourceCompatibility = 1.8
 [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
 mainClassName = 'io.midasprotocol.program.FullNode'
-
 publishing {
 	publications {
-		mavenJava(MavenPublication) {
+		maven(MavenPublication) {
 			from components.java
-			artifact sourceJar
 		}
 	}
 	repositories {
@@ -85,8 +86,10 @@ dependencies {
 	compile group: 'org.slf4j', name: 'jcl-over-slf4j', version: '1.7.25'
 	compile group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.3'
 
-//    compile "org.projectlombok:lombok:1.16.18"
-	compile group: 'org.projectlombok', name: 'lombok', version: '1.18.2'
+	compileOnly("org.projectlombok:lombok:${lombokVersion}")
+	testCompileOnly("org.projectlombok:lombok:${lombokVersion}")
+	annotationProcessor("org.projectlombok:lombok:${lombokVersion}")
+	testAnnotationProcessor("org.projectlombok:lombok:${lombokVersion}")
 
 	compile group: 'commons-codec', name: 'commons-codec', version: '1.11'
 
@@ -245,7 +248,6 @@ def binaryRelease(taskName, jarName, mainClass) {
 		from(sourceSets.main.output) {
 			include "/**"
 		}
-
 		from {
 			configurations.compile.collect {
 				it.isDirectory() ? it : zipTree(it)
@@ -259,7 +261,9 @@ def binaryRelease(taskName, jarName, mainClass) {
 }
 
 artifacts {
-	archives(binaryRelease('buildSolidityNodeJar', 'SolidityNode', 'io.midasprotocol.program.SolidityNode'),
+	archives(
+			binaryRelease('buildSolidityNodeJar', 'SolidityNode', 'io.midasprotocol.program.SolidityNode'),
 			binaryRelease('buildFullNodeJar', 'FullNode', 'io.midasprotocol.program.FullNode'),
-			binaryRelease('buildKeystoreFactoryJar', 'KeystoreFactory', 'io.midasprotocol.program.KeystoreFactory'))
+			binaryRelease('buildKeystoreFactoryJar', 'KeystoreFactory', 'io.midasprotocol.program.KeystoreFactory')
+	)
 }

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
-#Wed Feb 14 20:55:40 CET 2018
+#Fri Dec 13 17:05:14 ICT 2019
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-all.zip
+zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -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,7 +44,7 @@ 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"
@@ -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,19 +154,19 @@ 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
 
@@ -159,14 +175,9 @@ 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" "$@" --no-daemon
+exec "$JAVACMD" "$@"

gradlew

@@ -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