diff --git a/.gitignore b/.gitignore
index 60922c7d50..f996e9f666 100644
--- a/.gitignore
+++ b/.gitignore
@@ -57,3 +57,15 @@ raft-rs
 # ignore tikv-client bazel build
 bazel-*
 
+# ignore gradle
+.gradle
+build/
+
+# Cache of project
+.gradletasknamecache
+
+# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
+!gradle-wrapper.jar
+
+# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
+# gradle/wrapper/gradle-wrapper.properties
diff --git a/BUILD b/BUILD
deleted file mode 100644
index c17434b890..0000000000
--- a/BUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-load(
-    "@com_github_zhexuany_bazel_shade//:java_shade.bzl",
-    "java_shade"
-)
-package(default_visibility = ["//visibility:public"])
-
-java_binary(
-    name = "tikv-java-client",
-    main_class = "com.pingcap.tikv.Main",
-    runtime_deps = [
-        "//src/main/java/com/pingcap/tikv:tikv-java-client-lib",
-        ":shaded_scalding",
-    ],
-)
-java_shade(
-    name = "shaded_args",
-    input_jar = "@io_netty_netty_codec_socks//jar",
-    rules = "shading_rule"
-)
-
-java_import(
-    name = "shaded_scalding",
-    jars = ["shaded_args.jar"]
-)
-
-filegroup(
-    name = "protos",
-    srcs = glob([
-         "kvproto/proto/*.proto",
-	      "kvproto/_vendor/src/github.com/gogo/protobuf/gogoproto/*.proto",
-	      "tipb/proto/*.proto",
-    ]),
-)
-
-load("@org_pubref_rules_protobuf//java:rules.bzl", "java_proto_library")
-
-java_proto_library(
-    name = "java",
-    imports = [
-            "external/com_google_protobuf/src/",
-            "kvproto/proto",
-            "kvproto/_vendor/src/github.com/gogo/protobuf",
-            "tipb/proto",
-    ],
-    inputs = ["@com_google_protobuf//:well_known_protos"],
-    protos = [":protos"],
-    verbose = 0,  # 0=no output, 1=show protoc command, 2+ more...
-    with_grpc = True,
-)
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000000..2ef024a5c3
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,154 @@
+apply plugin: 'java'
+apply plugin: 'maven'
+apply plugin: 'idea'
+apply plugin: "com.google.protobuf"
+
+group = 'org.tikv'
+version = '2.0-SNAPSHOT'
+
+description = """TiSpark Project TiKV Java Client"""
+
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
+tasks.withType(JavaCompile) {
+	options.encoding = 'UTF-8'
+}
+
+buildscript {
+  repositories {
+    maven { url "http://repo.maven.apache.org/maven2" }
+  }
+  dependencies {
+    classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.7'
+  }
+}
+
+sourceSets {
+    main {
+        proto {
+            srcDir './proto'
+			include '**/*.proto'
+        }
+        java {
+            // include self written and generated code
+            srcDirs 'src/main/java', 'target/generated-sources/main/java'            
+        }
+    }
+	test {
+		java {
+			srcDirs 'src/test/java'
+		}
+	}
+    // remove the test configuration - at least in your example you don't have a special test proto file
+}
+
+protobuf {
+    // Configure the protoc executable
+    protoc {
+        // Download from repositories
+        artifact = 'com.google.protobuf:protoc:3.1.0'
+    }
+
+	// Locate the codegen plugins
+	plugins {
+		// Locate a plugin with name 'grpc'. This step is optional.
+		// If you don't locate it, protoc will try to use "protoc-gen-grpc" from
+		// system search path.
+		grpc {
+			artifact = 'io.grpc:protoc-gen-grpc-java:1.4.0'
+			// or
+			// path = 'tools/protoc-gen-grpc-java'
+		}
+    }
+
+    generateProtoTasks.generatedFilesBaseDir = 'target/generated-sources'
+
+    generateProtoTasks {
+        // all() returns the collection of all protoc tasks
+        all().each { task ->
+			task.plugins {
+				grpc {
+					outputSubDir = 'grpc-java'
+				}
+			}
+            // Here you can configure the task
+        }
+
+        // In addition to all(), you may get the task collection by various
+        // criteria:
+
+        // (Java only) returns tasks for a sourceSet
+        ofSourceSet('main')
+
+    }   
+}
+
+clean {
+	delete protobuf.generatedFilesBaseDir
+}
+
+idea {
+	module {}
+}
+
+repositories {
+     maven { url "http://repo.maven.apache.org/maven2" }
+}
+
+dependencies {
+    compile group: 'log4j', name: 'log4j', version:'1.2.17'
+    compile group: 'net.sf.trove4j', name: 'trove4j', version:'3.0.1'
+    compile group: 'com.sangupta', name: 'murmur', version:'1.0.0'
+    compile group: 'io.grpc', name: 'grpc-netty', version:'1.7.0'
+    compile group: 'io.grpc', name: 'grpc-protobuf', version:'1.7.0'
+    compile group: 'io.grpc', name: 'grpc-stub', version:'1.7.0'
+    compile group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version:'2.8.11'
+    compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version:'2.8.11.1'
+    compile(group: 'com.fasterxml.jackson.module', name: 'jackson-module-scala_2.11', version:'2.8.11') {
+		exclude(module: 'guava')
+    }
+    compile group: 'joda-time', name: 'joda-time', version:'2.9.9'
+    compile group: 'org.joda', name: 'joda-convert', version:'1.9.2'
+    testCompile group: 'io.grpc', name: 'grpc-testing', version:'1.7.0'
+    compile group: 'org.apache.logging.log4j', name: 'log4j-api', version:'2.8.1'
+    compile group: 'org.apache.logging.log4j', name: 'log4j-core', version:'2.8.1'
+    compile group: 'org.apache.spark', name: 'spark-core_2.11', version:'2.3.2'
+    compile group: 'org.apache.spark', name: 'spark-catalyst_2.11', version:'2.3.2'
+    compile group: 'org.apache.spark', name: 'spark-sql_2.11', version:'2.3.2'
+    compile group: 'org.apache.spark', name: 'spark-hive_2.11', version:'2.3.2'
+    compile group: 'org.apache.spark', name: 'spark-hive-thriftserver_2.11', version:'2.3.2'
+    compile group: 'org.apache.spark', name: 'spark-unsafe_2.11', version:'2.3.2'
+    compile group: 'org.slf4j', name: 'slf4j-api', version:'1.7.16'
+    compile group: 'org.slf4j', name: 'slf4j-log4j12', version:'1.7.16'
+    compile group: 'org.slf4j', name: 'jul-to-slf4j', version:'1.7.16'
+    compile group: 'org.slf4j', name: 'jcl-over-slf4j', version:'1.7.16'
+	compile 'com.google.protobuf:protobuf-java:3.1.0'
+}
+
+task updateProtoModule(type: Exec) {
+    if (System.getProperty('os.name').toLowerCase(Locale.ROOT).contains('windows')) {
+        commandLine 'cmd', '/c', './scripts/proto.sh'
+    } else {
+        commandLine 'sh', '-c', './scripts/proto.sh'
+    }
+}
+
+compileJava << {
+	println 'Compiling'
+}
+
+task copyResources(type: Copy) {
+	includeEmptyDirs = false
+	copy {
+		from "./kvproto/vendor/github.com/gogo/protobuf/"
+		include "**/gogoproto/**"
+		into "./proto/"
+	}
+	copy {
+		from "./kvproto/proto/", "./raft-rs/proto/", "./tipb/proto"
+		into "./proto/"
+	}
+}
+
+compileJava.dependsOn copyResources
+copyResources.dependsOn updateProtoModule
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000000..29953ea141
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000000..e0b3fb8d70
--- /dev/null
+++ b/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/gradlew b/gradlew
new file mode 100755
index 0000000000..cccdd3d517
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+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
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000000..f9553162f1
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 0000000000..4eb0905c1d
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1 @@
+rootProject.name = 'tikv-client-java'