diff --git a/build.gradle b/build.gradle
index d5a19eaac5..065deae258 100644
--- a/build.gradle
+++ b/build.gradle
@@ -70,5 +70,5 @@ build.dependsOn wpiutilSourceZip
 apply from: 'publish.gradle'
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '3.0'
+    gradleVersion = '3.3'
 }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index deedc7fa5e..385dda1883 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 e69311fb04..af09f24cff 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Aug 22 20:37:33 PDT 2016
+#Wed Jan 04 14:11:50 PST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-bin.zip
diff --git a/gradlew b/gradlew
index 9aa616c273..4453ccea33 100755
--- a/gradlew
+++ b/gradlew
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
@@ -154,16 +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 "$@")
+
+# 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
+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/toolchains/windows.gradle b/toolchains/windows.gradle
index 54a039ba26..f56593477a 100644
--- a/toolchains/windows.gradle
+++ b/toolchains/windows.gradle
@@ -1,33 +1,10 @@
 model {
     toolChains {
         visualCpp(VisualCpp) {
-            // Workaround for VS2015 adapted from https://github.com/couchbase/couchbase-lite-java-native/issues/23
-            def VS_2015_INCLUDE_DIR = "C:/Program Files (x86)/Windows Kits/10/Include/10.0.10240.0/ucrt"
-            def VS_2015_LIB_DIR = "C:/Program Files (x86)/Windows Kits/10/Lib/10.0.10240.0/ucrt"
-            def VS_2015_INSTALL_DIR = 'C:/Program Files (x86)/Microsoft Visual Studio 14.0'
-            def vsInstallDir = file(VS_2015_INSTALL_DIR)
-
-            // If you ever happen to install and uninstall any other version of VS, Gradle will misdetect the compiler
-            // and linker to run. This fixes that by manually setting the install dir
-            if (vsInstallDir.exists()) {
-                installDir = vsInstallDir
-            }
 
             eachPlatform {
                 cppCompiler.withArguments { args ->
                     args << '/EHsc' << '/DNOMINMAX' << '/D_SCL_SECURE_NO_WARNINGS' << '/D_WINSOCK_DEPRECATED_NO_WARNINGS'
-                    if (file(VS_2015_INCLUDE_DIR).exists()) {
-                        args << "/I$VS_2015_INCLUDE_DIR"
-                    }
-                }
-                linker.withArguments { args ->
-                    if (file(VS_2015_LIB_DIR).exists()) {
-                        if (platform.architecture.name == 'x86') {
-                            args << "/LIBPATH:$VS_2015_LIB_DIR/x86"
-                        } else {
-                            args << "/LIBPATH:$VS_2015_LIB_DIR/x64"
-                        }
-                    }
                 }
             }
         }