From bcb5a5843594362f3a66b1fb9c02ae4b08d64404 Mon Sep 17 00:00:00 2001
From: yeyunpeng2020 <yeyunpeng1@huawei.com>
Date: Sun, 4 Jul 2021 13:30:25 +0800
Subject: [PATCH] add gradlew

---
 build.sh                              | 52 +++++++++++++--------------
 mindspore/lite/java/java/build.gradle |  2 ++
 2 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/build.sh b/build.sh
index a4c1039d8b..e65a480812 100755
--- a/build.sh
+++ b/build.sh
@@ -532,32 +532,32 @@ build_lite_x86_64_jni_and_jar()
         cp ./libmindspore-lite-train-jni.so ${BASEPATH}/output/tmp/${pkg_name}/runtime/lib/
     fi
 
+    cd ${LITE_JAVA_PATH}/java
+    rm -rf gradle .gradle gradlew gradlew.bat
+    gradle wrapper --gradle-version 6.6.1 --distribution-type all
     # build java common
-    cd ${LITE_JAVA_PATH}/java/common
-    gradle clean
-    gradle build
+    ${LITE_JAVA_PATH}/java/gradlew clean -p ${LITE_JAVA_PATH}/java/common
+    ${LITE_JAVA_PATH}/java/gradlew build -p ${LITE_JAVA_PATH}/java/common
     cp ${LITE_JAVA_PATH}/java/common/build/libs/mindspore-lite-java-common.jar ${LITE_JAVA_PATH}/java/linux_x86/libs/
 
     # build java fl_client
     if [[ "X$is_train" = "Xon" ]]; then
-      cd ${LITE_JAVA_PATH}/java/fl_client
-      gradle clean
+      ${LITE_JAVA_PATH}/java/gradlew clean -p ${LITE_JAVA_PATH}/java/fl_client
       echo "--------------------building createFlatBuffers for fl_client------------------------"
-      gradle createFlatBuffers
+      ${LITE_JAVA_PATH}/java/gradlew createFlatBuffers -p ${LITE_JAVA_PATH}/java/fl_client
       echo "--------------------create FlatBuffers for fl_client success--------------------"
-      gradle build
-      gradle clearJar
+      ${LITE_JAVA_PATH}/java/gradlew build -p ${LITE_JAVA_PATH}/java/fl_client
+      ${LITE_JAVA_PATH}/java/gradlew clearJar -p ${LITE_JAVA_PATH}/java/fl_client
       echo "--------------------building flReleaseJar for fl_client------------------------"
-      gradle flReleaseJarX86 --rerun-tasks
+      ${LITE_JAVA_PATH}/java/gradlew flReleaseJarX86 --rerun-tasks -p ${LITE_JAVA_PATH}/java/fl_client
       echo "--------------------build jar for fl_client success ------------------------"
       cp ${LITE_JAVA_PATH}/java/fl_client/build/libs/jarX86/mindspore-lite-java-flclient.jar ${BASEPATH}/output/tmp/${pkg_name}/runtime/lib/
     fi
 
     # build jar
-    cd ${LITE_JAVA_PATH}/java/linux_x86/
-    gradle clean
-    gradle releaseJar
-    cp ./build/lib/jar/*.jar ${BASEPATH}/output/tmp/${pkg_name}/runtime/lib/
+    ${LITE_JAVA_PATH}/java/gradlew clean -p ${LITE_JAVA_PATH}/java/linux_x86/
+    ${LITE_JAVA_PATH}/java/gradlew releaseJar -p ${LITE_JAVA_PATH}/java/linux_x86/
+    cp ${LITE_JAVA_PATH}/java/linux_x86/build/lib/jar/*.jar ${BASEPATH}/output/tmp/${pkg_name}/runtime/lib/
 
     # package
     cd ${BASEPATH}/output/tmp
@@ -780,10 +780,12 @@ build_aar() {
     if [[ "X${INC_BUILD}" == "Xoff" ]]; then
         [ -n "${BASEPATH}" ] && rm -rf ${BASEPATH}/mindspore/lite/build
     fi
+    cd ${LITE_JAVA_PATH}/java
+    rm -rf gradle .gradle gradlew gradlew.bat
+    gradle wrapper --gradle-version 6.6.1 --distribution-type all
     # build common module
-    cd ${LITE_JAVA_PATH}/java/common
-    gradle clean
-    gradle build
+    ${LITE_JAVA_PATH}/java/gradlew clean -p ${LITE_JAVA_PATH}/java/common
+    ${LITE_JAVA_PATH}/java/gradlew build -p ${LITE_JAVA_PATH}/java/common
 
     # build aar
     local npu_bak=${MSLITE_ENABLE_NPU}
@@ -800,24 +802,22 @@ build_aar() {
       is_train=off
     fi
     if [[ "X$is_train" = "Xon" ]]; then
-      cd ${LITE_JAVA_PATH}/java/fl_client
-      gradle clean
+      ${LITE_JAVA_PATH}/java/gradlew clean -p ${LITE_JAVA_PATH}/java/fl_client
       echo "--------------------building createFlatBuffers for fl_client------------------------"
-      gradle createFlatBuffers
+      ${LITE_JAVA_PATH}/java/gradlew createFlatBuffers -p ${LITE_JAVA_PATH}/java/fl_client
       echo "--------------------create FlatBuffers for fl_client success--------------------"
-      gradle build
-      gradle clearJar
+      ${LITE_JAVA_PATH}/java/gradlew build -p ${LITE_JAVA_PATH}/java/fl_client
+      ${LITE_JAVA_PATH}/java/gradlew clearJar -p ${LITE_JAVA_PATH}/java/fl_client
       echo "--------------------building flReleaseJar for fl_client------------------------"
-      gradle flReleaseJarAAR --rerun-tasks
+      ${LITE_JAVA_PATH}/java/gradlew flReleaseJarAAR --rerun-tasks -p ${LITE_JAVA_PATH}/java/fl_client
       echo "--------------------build jar for fl_client success ------------------------"
       cp ${LITE_JAVA_PATH}/java/fl_client/build/libs/jarAAR/mindspore-lite-java-flclient.jar ${LITE_JAVA_PATH}/java/app/libs
     fi
     
     cp ${LITE_JAVA_PATH}/java/common/build/libs/mindspore-lite-java-common.jar ${LITE_JAVA_PATH}/java/app/libs
-    cd ${LITE_JAVA_PATH}/java/app
-    gradle clean
-    gradle build
-    gradle publish -PLITE_VERSION=${VERSION_STR}
+    ${LITE_JAVA_PATH}/java/gradlew clean -p ${LITE_JAVA_PATH}/java/app
+    ${LITE_JAVA_PATH}/java/gradlew build  -p ${LITE_JAVA_PATH}/java/app
+    ${LITE_JAVA_PATH}/java/gradlew publish -PLITE_VERSION=${VERSION_STR} -p ${LITE_JAVA_PATH}/java/app
 
     cd ${LITE_JAVA_PATH}/java/app/build
     [ -n "${BASEPATH}" ] && rm -rf ${BASEPATH}/output/*.tar.gz*
diff --git a/mindspore/lite/java/java/build.gradle b/mindspore/lite/java/java/build.gradle
index 9850dfbde0..eef79c264b 100644
--- a/mindspore/lite/java/java/build.gradle
+++ b/mindspore/lite/java/java/build.gradle
@@ -3,6 +3,7 @@ buildscript {
     repositories {
         google()
         jcenter()
+        mavenCentral()
     }
     dependencies {
         classpath "com.android.tools.build:gradle:4.0.0"
@@ -13,6 +14,7 @@ allprojects {
     repositories {
         google()
         jcenter()
+        mavenCentral()
     }
 }