Updated to Gradle 3.2

Jenkinsfile

@@ -15,6 +15,6 @@ node {
 		slackSend color: 'danger', message: "Build Failed - ${env.JOB_NAME} ${env.BUILD_NUMBER} (<${env.BUILD_URL}|Open>)"
 		throw e
 	} finally {
-		step([$class: 'JUnitResultArchiver', testResults: '**/build/test-results/*.xml'])
+		step([$class: 'JUnitResultArchiver', testResults: '**/build/test-results/test/*.xml'])
 	}
 }

gradle/manifest-gen.gradle

@@ -47,18 +47,20 @@ jar {
 
 def sourcesManifestFile = "$buildDir/tmp/sourcesJar/MANIFEST.MF"
 
-task genSourcesManifest << {
-	def f = new File(sourcesManifestFile)
-	f.parentFile.mkdirs()
-	def writer = new PrintWriter(f)
-	writer.println('Manifest-Version: 1.0')
-	writer.println('Bundle-ManifestVersion: 2')
-	writer.println('Bundle-SymbolicName: ' + project.name + '.source')
-	writer.println('Bundle-Version: ' + qualifiedVersion)
-	writer.println('Bundle-Name: Sources')
-	writer.println('Bundle-Vendor: Eclipse Xtext')
-	writer.println('Eclipse-SourceBundle: ' + project.name + ';version="' + qualifiedVersion + '"')
-	writer.close()
+task genSourcesManifest {
+	doLast {
+		def f = new File(sourcesManifestFile)
+		f.parentFile.mkdirs()
+		def writer = new PrintWriter(f)
+		writer.println('Manifest-Version: 1.0')
+		writer.println('Bundle-ManifestVersion: 2')
+		writer.println('Bundle-SymbolicName: ' + project.name + '.source')
+		writer.println('Bundle-Version: ' + qualifiedVersion)
+		writer.println('Bundle-Name: Sources')
+		writer.println('Bundle-Vendor: Eclipse Xtext')
+		writer.println('Eclipse-SourceBundle: ' + project.name + ';version="' + qualifiedVersion + '"')
+		writer.close()
+	}
 }
 genSourcesManifest.outputs.file(sourcesManifestFile)
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu Jul 21 11:38:19 CEST 2016
+#Fri Nov 18 08:52:13 CET 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.2-bin.zip

gradlew

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
@@ -154,11 +154,18 @@ 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=("$@")
-}
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+# Escape application args
+for s in "${@}" ; do
+    s=\"$s\"
+    APP_ARGS=$APP_ARGS" "$s
+done
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# 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

@@ -49,7 +49,6 @@ goto fail
 @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