diff --git a/idea-extensions/idea-boot-java/.gitignore b/idea-extensions/idea-boot-java/.gitignore
index eeb2c0d2f..835e184e2 100644
--- a/idea-extensions/idea-boot-java/.gitignore
+++ b/idea-extensions/idea-boot-java/.gitignore
@@ -2,4 +2,3 @@
 /.idea
 *.iml
 *.zip
-/gradle/
diff --git a/idea-extensions/idea-boot-java/gradle/wrapper/gradle-wrapper.jar b/idea-extensions/idea-boot-java/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 000000000..29953ea14
Binary files /dev/null and b/idea-extensions/idea-boot-java/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/idea-extensions/idea-boot-java/gradle/wrapper/gradle-wrapper.properties b/idea-extensions/idea-boot-java/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000..e0b3fb8d7
--- /dev/null
+++ b/idea-extensions/idea-boot-java/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/idea-extensions/idea-boot-java/gradlew b/idea-extensions/idea-boot-java/gradlew
old mode 100644
new mode 100755
index 27309d923..cccdd3d51
--- a/idea-extensions/idea-boot-java/gradlew
+++ b/idea-extensions/idea-boot-java/gradlew
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
@@ -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
@@ -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 "$@")
 
-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" "$@"
diff --git a/idea-extensions/idea-boot-java/gradlew.bat b/idea-extensions/idea-boot-java/gradlew.bat
index 832fdb607..f9553162f 100644
--- a/idea-extensions/idea-boot-java/gradlew.bat
+++ b/idea-extensions/idea-boot-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