Fix (ICE-7909) - Update to gradle 3.x

10 files changed, 68 insertions, 59 deletions

diff --git a/java-compat/build.gradle b/java-compat/build.gradle
index d8032f639f5..8f6ee130c01 100644
--- a/java-compat/build.gradle
+++ b/java-compat/build.gradle
@@ -78,5 +78,5 @@ dist.dependsOn(project(":icestorm-compat").assemble)
 // the version of gradle needed to build Ice.
 //
 task wrapper(type: Wrapper) {
-    gradleVersion = "2.14"
+    gradleVersion = "3.2"
 }
diff --git a/java-compat/gradle/wrapper/gradle-wrapper.properties b/java-compat/gradle/wrapper/gradle-wrapper.properties
index df0b97f2e45..0d32cf369fc 100644
--- a/java-compat/gradle/wrapper/gradle-wrapper.properties
+++ b/java-compat/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Jul 27 16:17:53 EDT 2016
+#Mon May 29 15:07:26 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.2-bin.zip
diff --git a/java/build.gradle b/java/build.gradle
index 16474ad5e7d..f6d3300ffb1 100644
--- a/java/build.gradle
+++ b/java/build.gradle
@@ -77,5 +77,5 @@ dist.dependsOn(project(":IceGridGUI").assemble)
 // the version of gradle needed to build Ice.
 //
 task wrapper(type: Wrapper) {
-    gradleVersion = "2.14"
+    gradleVersion = "3.2"
 }
diff --git a/java/gradle/library.gradle b/java/gradle/library.gradle
index 67bdd0126e5..1006801aa6f 100644
--- a/java/gradle/library.gradle
+++ b/java/gradle/library.gradle
@@ -51,8 +51,10 @@ ext.projectPom = {
 
 task writeNewPom {
     outputs.file file(pomName)
-} << {
-    projectPom().writeTo(pomName)
+
+    doLast {
+        projectPom().writeTo(pomName)
+    }
 }
 
 jar.dependsOn(writeNewPom)
diff --git a/java/gradle/wrapper/gradle-wrapper.jar b/java/gradle/wrapper/gradle-wrapper.jar
index d3b83982b9b..d6e2637affb 100644
--- a/java/gradle/wrapper/gradle-wrapper.jar
+++ b/java/gradle/wrapper/gradle-wrapper.jar
diff --git a/java/gradle/wrapper/gradle-wrapper.properties b/java/gradle/wrapper/gradle-wrapper.properties
index b3de2719c77..08f93eabc59 100644
--- a/java/gradle/wrapper/gradle-wrapper.properties
+++ b/java/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Jul 28 13:36:19 EDT 2016
+#Mon May 29 14:54:24 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.2-bin.zip
diff --git a/java/gradlew b/java/gradlew
index 27309d92314..4ef3a871f2e 100755
--- a/java/gradlew
+++ b/java/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
+
+# 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" "$@"
diff --git a/java/gradlew.bat b/java/gradlew.bat
index 832fdb6079b..f9553162f12 100755
--- a/java/gradlew.bat
+++ b/java/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
diff --git a/java/src/IceGridGUI/build.gradle b/java/src/IceGridGUI/build.gradle
index b35bfefd345..edc3dd24142 100644
--- a/java/src/IceGridGUI/build.gradle
+++ b/java/src/IceGridGUI/build.gradle
@@ -86,12 +86,14 @@ if(icegridguiProguard.toBoolean()){
     apply from: "plain-jar.gradle"
 }
 
-task signjar(dependsOn: updateManifest) << {
-    if(keystore != null && keystore.length() > 0) {
-        ant.signjar(jar: "${libDir}/${jarName}",
-                    alias: 'zeroc.com',
-                    keystore:"${keystore}",
-                    storepass:"${keystore_password}")
+task signjar(dependsOn: updateManifest) {
+    doLast {
+        if(keystore != null && keystore.length() > 0) {
+            ant.signjar(jar: "${libDir}/${jarName}",
+                        alias: 'zeroc.com',
+                        keystore:"${keystore}",
+                        storepass:"${keystore_password}")
+        }
     }
 }
 assemble.dependsOn(signjar)
@@ -99,31 +101,33 @@ assemble.dependsOn(signjar)
 if(macosx)
 {
     def appName = "IceGrid GUI"
-    task bundleapp(dependsOn: updateManifest) << {
-        ant.taskdef(name: 'bundleapp',
-                    classname: 'com.oracle.appbundler.AppBundlerTask',
-                    classpath: configurations.bundleapp.asPath)
-
-        ant.bundleapp(outputdirectory: "${libDir}",
-                      name: appName,
-                      displayname: appName,
-                      identifier: "com.zeroc.IceGridGUI",
-                      icon: "${projectDir}/src/main/resources/icons/icegrid.icns",
-                      shortversion: "${project.version}",
-                      applicationCategory: "public.app-category.utilities",
-                      mainclassname: "com.zeroc.IceGridGUI/MainProxy",
-                      copyright: "Copyright © 2005-2016 ZeroC, Inc. All rights reserved.") {
-            classpath(file: "${libDir}/${jarName}") {
-            }
-            option(value: "-Dapple.laf.useScreenMenuBar=true") {
-            }
-            option(value: "-Dcom.apple.macos.use-file-dialog-packages=true") {
-            }
-            option(value: "-Dcom.apple.macos.useScreenMenuBar=true") {
-            }
-            option(value: "-Xdock:name=IceGrid GUI") {
-            }
-            option(value: "-Dcom.apple.mrj.application.apple.menu.about.name=${appName}") {
+    task bundleapp(dependsOn: updateManifest) {
+        doLast {
+            ant.taskdef(name: 'bundleapp',
+                        classname: 'com.oracle.appbundler.AppBundlerTask',
+                        classpath: configurations.bundleapp.asPath)
+
+            ant.bundleapp(outputdirectory: "${libDir}",
+                        name: appName,
+                        displayname: appName,
+                        identifier: "com.zeroc.IceGridGUI",
+                        icon: "${projectDir}/src/main/resources/icons/icegrid.icns",
+                        shortversion: "${project.version}",
+                        applicationCategory: "public.app-category.utilities",
+                        mainclassname: "com.zeroc.IceGridGUI/MainProxy",
+                        copyright: "Copyright © 2005-2016 ZeroC, Inc. All rights reserved.") {
+                classpath(file: "${libDir}/${jarName}") {
+                }
+                option(value: "-Dapple.laf.useScreenMenuBar=true") {
+                }
+                option(value: "-Dcom.apple.macos.use-file-dialog-packages=true") {
+                }
+                option(value: "-Dcom.apple.macos.useScreenMenuBar=true") {
+                }
+                option(value: "-Xdock:name=IceGrid GUI") {
+                }
+                option(value: "-Dcom.apple.mrj.application.apple.menu.about.name=${appName}") {
+                }
             }
         }
     }
diff --git a/java/src/IceGridGUI/proguard-jar.gradle b/java/src/IceGridGUI/proguard-jar.gradle
index 60c0096439e..32c2ea1a54e 100644
--- a/java/src/IceGridGUI/proguard-jar.gradle
+++ b/java/src/IceGridGUI/proguard-jar.gradle
@@ -25,12 +25,14 @@ task proguardJar(type: proguard.gradle.ProGuardTask, dependsOn: jar) {
     configuration 'icegridgui.pro'
 }
 
-task updateManifest(dependsOn: proguardJar) << {
-    if (hasJavaFx) {
-        ant.jar(update: true, destfile: "${libDir}/${jarName}") {
-            delegate.manifest {
-                attribute(name: 'Main-Class', value: 'com.zeroc.IceGridGUI.MainProxy')
-                attribute(name: 'Built-By', value: 'Zeroc, Inc.')
+task updateManifest(dependsOn: proguardJar) {
+    doLast {
+        if (hasJavaFx) {
+            ant.jar(update: true, destfile: "${libDir}/${jarName}") {
+                delegate.manifest {
+                    attribute(name: 'Main-Class', value: 'com.zeroc.IceGridGUI.MainProxy')
+                    attribute(name: 'Built-By', value: 'Zeroc, Inc.')
+                }
             }
         }
     }