From 8c7676623f42ff9438f63464f74d3354d9919542 Mon Sep 17 00:00:00 2001
From: larvacea <larvacea@mac.com>
Date: Thu, 5 Mar 2020 07:16:14 -0800
Subject: [PATCH] Change cmake version, split build and test steps

---
 .github/workflows/build-android.yml   | 14 ++++++++------
 lib/android_build/app/build.gradle    |  2 +-
 lib/android_build/maesdk/build.gradle |  2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build-android.yml b/.github/workflows/build-android.yml
index d65a7d25d..93f4c9565 100644
--- a/.github/workflows/build-android.yml
+++ b/.github/workflows/build-android.yml
@@ -26,6 +26,9 @@ jobs:
       run: |
         cd "$Env:GITHUB_WORKSPACE\lib\android_build"
         .\gradlew.bat assemble
+    - name: Java unit tests
+      run: |
+        cd "$Env:GITHUB_WORKSPACE\lib\android_build"
         .\gradlew.bat maesdk:test
     - name: Upload Reports
       if: failure()
@@ -33,9 +36,8 @@ jobs:
       with:
         name: reports
         path: lib\android_build\maesdk\build\reports
-        
-#    - name: Upload Artifacts
-#      uses: actions/upload-artifact@v1
-#      with:
-#        name: maesdk
-#        path: lib\android_build\maesdk\build\outputs\aar
+    - name: Upload Artifacts
+      uses: actions/upload-artifact@v1
+      with:
+        name: maesdk
+        path: lib\android_build\maesdk\build\outputs\aar
diff --git a/lib/android_build/app/build.gradle b/lib/android_build/app/build.gradle
index 24bc9210f..90ab0a5ae 100644
--- a/lib/android_build/app/build.gradle
+++ b/lib/android_build/app/build.gradle
@@ -25,7 +25,7 @@ android {
     externalNativeBuild {
         cmake {
             path "src/main/cpp/CMakeLists.txt"
-            version "3.16.2"
+            version "3.16.4"
         }
     }
 }
diff --git a/lib/android_build/maesdk/build.gradle b/lib/android_build/maesdk/build.gradle
index 0a291c437..d49073d52 100644
--- a/lib/android_build/maesdk/build.gradle
+++ b/lib/android_build/maesdk/build.gradle
@@ -31,7 +31,7 @@ android {
     externalNativeBuild {
         cmake {
             path "src/main/cpp/CMakeLists.txt"
-            version "3.16.2"
+            version "3.16.4"
         }
     }
 }