diff --git a/.gitignore b/.gitignore
index d83f828..2bd01e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ src/compiled-dictionaries
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 
+/.gradle/
diff --git a/GRADLE_CHEATSHEET.txt b/GRADLE_CHEATSHEET.txt
index 143796b..70d4965 100644
--- a/GRADLE_CHEATSHEET.txt
+++ b/GRADLE_CHEATSHEET.txt
@@ -1,10 +1,17 @@
-ant compile -> gradle compileJava
-ant compile-tests -> gradle compileTestJava
-ant javadoc -> gradle javadoc
-ant jar -Ddictype=ipadic -> gradle jarWithIpaDic
-ant jar -Ddictype=naist-chasen -> gradle jarWithNaistChasen
-cd dictionary;ant clean -> gradle :dictionary:clean
-ant dist -> gradle dist
+## Gradle Wrapper
+
+Use Gradle Wrapper (`./gradlew`) instead installed Gradle.
+If you want to upgradel gradle, change gradle/wrapper/gradle-wrapper.properties
+
+## Cheatsheet
+
+ant compile -> ./gradlew compileJava
+ant compile-tests -> ./gradlew compileTestJava
+ant javadoc -> ./gradlew javadoc
+ant jar -Ddictype=ipadic -> ./gradlew jarWithIpaDic
+ant jar -Ddictype=naist-chasen -> ./gradlew jarWithNaistChasen
+cd dictionary;ant clean -> ./gradlew :dictionary:clean
+ant dist -> ./gradlew dist
 
 
 ## For committer
@@ -24,7 +31,7 @@ sonatypeFullname=FULL_NAME
 Then,
 
 ```
-$ gradle uploadArchives
+$ ./gradlew uploadArchives
 ```
 
 the task asks you sshkey password and Sonatype password.
diff --git a/README.md b/README.md
index f752f13..f56118a 100644
--- a/README.md
+++ b/README.md
@@ -45,24 +45,24 @@ Add dependency to pom.xml.
 
 ## Build
 
-You can build the project using Gradle. 
+You can build the project using Gradle. And you should use `gradlew` command.
 
 Build only jar file without dictionary
 
 ```
-$ gradle jar
+$ ./gradlew jar
 ```
 
 Build jar file with IPA dictionary
 
 ```
-$ gradle jarWithIpaDic
+$ ./gradlew jarWithIpaDic
 ```
 
 Build jar file with Naist Chasen dictionary
 
 ```
-$ gradle jarWithNaistChasen
+$ ./gradlew jarWithNaistChasen
 ```
 
 Please note that you should modify the following line in `gradle.properties` if you want to build the Gosen for Solr 7.1 or before. 
diff --git a/build.gradle b/build.gradle
index 7358dd0..42ef0ab 100644
--- a/build.gradle
+++ b/build.gradle
@@ -36,14 +36,18 @@ javadoc {
 defaultTasks 'clean', 'dist'
 
 // Re-build dictionary with user custom dictionaries, without copy
-task rebuildNaistChasenDic() << {
-  println "rebuilding dicitonary"
+task rebuildNaistChasenDic() {
+  doLast {
+    println "rebuilding dicitonary"
+  }
 }
 
 tasks.rebuildNaistChasenDic.dependsOn(compileJava, ":dictionary:cleanCompiledNaistChasen", ":dictionary:compileNaistChasen")
 
-task rebuildIpadicDic() << {
-  println "rebuilding dicitonary"
+task rebuildIpadicDic() {
+  doLast {
+    println "rebuilding dicitonary"
+  }
 }
 
 tasks.rebuildIpadicDic.dependsOn(compileJava, ":dictionary:cleanCompiledIpadic", ":dictionary:compileIpadic")
diff --git a/dictionary/build.gradle b/dictionary/build.gradle
index a75d998..65d4a1f 100644
--- a/dictionary/build.gradle
+++ b/dictionary/build.gradle
@@ -41,12 +41,16 @@ def checkExistFile(dictype, fileName) {
     return file.exists()
 }
 
-task downloadNaistChasen(dependsOn: checkBuildStatus) << {
-    download(naistDictype, naistProps)
+task downloadNaistChasen(dependsOn: checkBuildStatus) {
+    doLast {
+        download(naistDictype, naistProps)
+    }
 }
 
-task downloadIpadic(dependsOn: checkBuildStatus) << {
-    download("ipadic", ipadicProps)
+task downloadIpadic(dependsOn: checkBuildStatus) {
+    doLast {
+        download("ipadic", ipadicProps)
+    }
 }
 
 def unpackArchive(dictype, props) {
@@ -62,28 +66,38 @@ def unpackArchive(dictype, props) {
     }
 }
 
-task unpackNaistChasen(dependsOn: downloadNaistChasen) << {
-    unpackArchive(naistDictype, naistProps)
+task unpackNaistChasen(dependsOn: downloadNaistChasen) {
+    doLast {
+        unpackArchive(naistDictype, naistProps)
+    }
 }
 
-task unpackIpadic(dependsOn: downloadIpadic) << {
-    unpackArchive(ipadicDictype, ipadicProps)
+task unpackIpadic(dependsOn: downloadIpadic) {
+    doLast {
+        unpackArchive(ipadicDictype, ipadicProps)
+    }
 }
 
-task clean << {
-    delete ipadicDictype, naistDictype
+task clean {
+    doLast {
+        delete ipadicDictype, naistDictype
+    }
 }
 
 def cleanSen(dictype) {
     delete fileTree(dir: dictype, include: '*.sen')
 }
 
-task cleanCompiledNaistChasen() << {
-    cleanSen(naistDictype)
+task cleanCompiledNaistChasen() {
+    doLast {
+        cleanSen(naistDictype)
+    }
 }
 
-task cleanCompiledIpadic() << {
-    cleanSen(ipadicDictype)
+task cleanCompiledIpadic() {
+    doLast {
+        cleanSen(ipadicDictype)
+    }
 }
 
 def getCompiledDicDir(dictype) {
@@ -116,12 +130,16 @@ def preprocessDic(dictype, props) {
     }
 }
 
-task preprocessNaistChasen(dependsOn: unpackNaistChasen) << {
-    preprocessDic(naistDictype, naistProps)
+task preprocessNaistChasen(dependsOn: unpackNaistChasen) {
+    doLast {
+        preprocessDic(naistDictype, naistProps)
+    }
 }
 
-task preprocessIpadic(dependsOn: unpackIpadic) << {
-    preprocessDic(ipadicDictype, ipadicProps)
+task preprocessIpadic(dependsOn: unpackIpadic) {
+    doLast {
+        preprocessDic(ipadicDictype, ipadicProps)
+    }
 }
 
 /**
@@ -150,12 +168,16 @@ def compileDic(dictype, props) {
     }
 }
 
-task compileNaistChasen(dependsOn: preprocessNaistChasen) << {
-    compileDic(naistDictype, naistProps)
+task compileNaistChasen(dependsOn: preprocessNaistChasen) {
+    doLast {
+        compileDic(naistDictype, naistProps)
+    }
 }
 
-task compileIpadic(dependsOn: preprocessIpadic) << {
-    compileDic(ipadicDictype, ipadicProps)
+task compileIpadic(dependsOn: preprocessIpadic) {
+    doLast {
+        compileDic(ipadicDictype, ipadicProps)
+    }
 }
 
 
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..87b738c
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 0000000..558870d
--- /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-5.1.1-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
new file mode 100755
index 0000000..af6708f
--- /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='"-Xmx64m"'
+
+# 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 0000000..6d57edc
--- /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="-Xmx64m"
+
+@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