upgrade to gradle 3.4, switch to doLast instead of left shift which w…

…as deprecated in gradle 3.2

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sun Feb 15 10:48:52 EST 2015
+#Thu Mar 02 17:29:19 EST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.4-bin.zip

gradlew

@@ -1,17 +1,35 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
 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=""
+
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
@@ -30,6 +48,7 @@ die ( ) {
 cygwin=false
 msys=false
 darwin=false
+nonstop=false
 case "`uname`" in
   CYGWIN* )
     cygwin=true
@@ -40,31 +59,11 @@ case "`uname`" in
   MINGW* )
     msys=true
     ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
@@ -90,7 +89,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -114,6 +113,7 @@ fi
 if $cygwin ; 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
     ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
@@ -154,11 +154,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save ( ) {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+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" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -8,14 +8,14 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
-@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 DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 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=
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
@@ -46,10 +46,9 @@ echo location of your Java installation.
 goto fail
 
 :init
-@rem Get command-line arguments, handling Windowz variants
+@rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line

gwtBuild.gradle

@@ -249,19 +249,21 @@ war {
 
 
 
-task setProjectArtifacts << {
-	def allProjects = [] as LinkedHashSet
-	CompileGwt.collectDependedUponProjects(project, allProjects, "runtime")
+task setProjectArtifacts {
+	doLast {
+		def allProjects = [] as LinkedHashSet
+		CompileGwt.collectDependedUponProjects(project, allProjects, "runtime")
 
-	def allProjectArtifacts = [] as LinkedHashSet
+		def allProjectArtifacts = [] as LinkedHashSet
 
-	allProjects.each { project ->
-		project.configurations.findAll().each {
-			allProjectArtifacts.addAll(it.allArtifacts.getFiles().getFiles())
-		}
-	};
+		allProjects.each { project ->
+			project.configurations.findAll().each {
+				allProjectArtifacts.addAll(it.allArtifacts.getFiles().getFiles())
+			}
+		};
 
-	project.ext.projectArtifacts = allProjectArtifacts
+		project.ext.projectArtifacts = allProjectArtifacts
+	}
 }
 
 

lumongo-common/build.gradle

@@ -24,43 +24,45 @@ sourceSets {
 }
 
 
-task compileProto << {
-	File outputDir = project.file("gen-src")
-	File protoDir = project.file("proto")
+task compileProto {
+	doLast {
+		File outputDir = project.file("gen-src")
+		File protoDir = project.file("proto")
 
-	String os = System.getProperty("os.name").toLowerCase();
-	String protocCommand = "protoc";
+		String os = System.getProperty("os.name").toLowerCase();
+		String protocCommand = "protoc";
 
-	println("OS: " + os);
-	if (os.contains("linux")) {
-		protocCommand = rootProject.file("util" + File.separator +  "protoc").toString();
-	}
-	else {
-		println("Using protoc on path");
-	}
+		println("OS: " + os);
+		if (os.contains("linux")) {
+			protocCommand = rootProject.file("util" + File.separator +  "protoc").toString();
+		}
+		else {
+			println("Using protoc on path");
+		}
 
-	if (!outputDir.exists()) {
-		outputDir.mkdir();
-	}
+		if (!outputDir.exists()) {
+			outputDir.mkdir();
+		}
 
-	if (protoDir.isDirectory() && protoDir.exists()) {
+		if (protoDir.isDirectory() && protoDir.exists()) {
 
-		String[] protos = protoDir.list()
+			String[] protos = protoDir.list()
 
-		for (String proto : protos) {
-			if (proto.endsWith(".proto")) {
-				String protoFull = protoDir.getAbsolutePath() + File.separator + proto
-				println("Compiling proto in <" + protoFull + "> to <" + outputDir.getAbsolutePath() + ">")
-				exec {
-					setStandardOutput(System.out)
-					executable protocCommand
-					args '--proto_path=' + protoDir.getAbsolutePath(), '--java_out=' + outputDir.getAbsolutePath(), protoFull
+			for (String proto : protos) {
+				if (proto.endsWith(".proto")) {
+					String protoFull = protoDir.getAbsolutePath() + File.separator + proto
+					println("Compiling proto in <" + protoFull + "> to <" + outputDir.getAbsolutePath() + ">")
+					exec {
+						setStandardOutput(System.out)
+						executable protocCommand
+						args '--proto_path=' + protoDir.getAbsolutePath(), '--java_out=' + outputDir.getAbsolutePath(), protoFull
+					}
 				}
 			}
 		}
-	}
-	else {
-		println("Error: " + protoDir.getAbsolutePath() + " does not exist or is not a directory")
+		else {
+			println("Error: " + protoDir.getAbsolutePath() + " does not exist or is not a directory")
+		}
 	}
 }