gradle 3.2-rc3

build.gradle

@@ -84,8 +84,10 @@ allprojects {
     }
 }
 
-task clean << {
-    delete externalLibsDir
+task clean {
+    doLast {
+        delete externalLibsDir
+    }
 }
 
 task test()

gradle.properties

@@ -0,0 +1 @@
+kotlin.incremental=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Nov 09 13:21:10 CET 2016
+#Fri Nov 11 16:15:11 CET 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.2-rc-3-all.zip

gradlew

@@ -161,4 +161,9 @@ function splitJvmOpts() {
 eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
 JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
 
+# 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 "$@"

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

modules/installer/installer.gradle

@@ -8,15 +8,17 @@ install4j {
     }
 }
 
-task clean << {
-    delete mediaDir
+task clean {
+    doLast {
+        delete mediaDir
+    }
 }
 
 task media(type: Install4jTask) {
 
     dependsOn ':dist', ':clean'
     projectFile = file('resources/jclasslib.install4j')
-    release = version
+    release = version as String
     disableSigning = !project.hasProperty("winCertPath") || !project.hasProperty("macCertPath")
     winKeystorePassword=project.findProperty("winKeystorePassword") ?: ''
     macKeystorePassword=project.findProperty("macKeystorePassword") ?: ''