diff --git a/gradle/functions.gradle b/gradle/functions.gradle
index 393f07d5..00289a93 100644
--- a/gradle/functions.gradle
+++ b/gradle/functions.gradle
@@ -14,36 +14,37 @@
  *  limitations under the License.
  */
 
-gradle.allprojects {
+def getCheckedOutGitCommitHash() {
+    def gitFolder = "$projectDir/.git/"
+    def takeFromHash = 6
 
-    // https://gist.github.com/JonasGroeger/7620911
-    ext.getCheckedOutGitCommitHash = {
-        def gitFolder = "$projectDir/.git/"
-        def takeFromHash = 6
-
-        def head
-        try {
-            head = new File(gitFolder + "HEAD").text.split(":")
-        } catch(Exception e) {
-            return null;
-        }
-
-        def isCommit = head.length == 1
-        if(isCommit) return head[0].trim().take(takeFromHash)
-
-        def refHead = new File(gitFolder + head[1].trim())
-        refHead.text.trim().take takeFromHash
+    def head
+    try {
+        head = new File(gitFolder + "HEAD").text.split(":")
+    } catch(Exception e) {
+        return null;
     }
 
-    ext.getCheckedOutBranch = {
-        def gitFolder = "$projectDir/.git/"
+    def isCommit = head.length == 1
+    if(isCommit) return head[0].trim().take(takeFromHash)
 
-        def head
-        try {
-            head = new File(gitFolder + "HEAD").text.split("/")
-            return head[2].trim();
-        } catch(Exception e) {
-            return "SNAPSHOT";
-        }
+    def refHead = new File(gitFolder + head[1].trim())
+    refHead.text.trim().take takeFromHash
+}
+
+def getCheckedOutBranch() {
+    def gitFolder = "$projectDir/.git/"
+
+    def head
+    try {
+        head = new File(gitFolder + "HEAD").text.split("/")
+        return head[2].trim();
+    } catch(Exception e) {
+        return "SNAPSHOT";
     }
 }
+
+ext {
+    getCheckedOutGitCommitHash = this.&getCheckedOutGitCommitHash
+    getCheckedOutBranch = this.&getCheckedOutBranch
+}
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index df04e474..f5bf744c 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ac0fa224..4e37c6d0 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Apr 24 12:27:08 SGT 2017
+#Mon Jul 03 07:09:45 EDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-bin.zip
diff --git a/gradlew b/gradlew
index 4453ccea..cccdd3d5 100755
--- a/gradlew
+++ b/gradlew
@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -155,7 +155,7 @@ if $cygwin ; then
 fi
 
 # Escape application args
-save ( ) {
+save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }