From b377860fc7dc0c4f5c22f99a20509c01823ce774 Mon Sep 17 00:00:00 2001
From: Martin Guillon <martin.guillon@akylas.fr>
Date: Fri, 16 Apr 2021 15:13:17 +0200
Subject: [PATCH] chore: upgrade ui-mobile-base for JDK 11

---
 .../android/gradle/wrapper/gradle-wrapper.properties          | 2 +-
 packages/ui-mobile-base/android/widgets/build.gradle          | 4 +++-
 packages/ui-mobile-base/build.android.sh                      | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/ui-mobile-base/android/gradle/wrapper/gradle-wrapper.properties b/packages/ui-mobile-base/android/gradle/wrapper/gradle-wrapper.properties
index 79d846136..95715c097 100644
--- a/packages/ui-mobile-base/android/gradle/wrapper/gradle-wrapper.properties
+++ b/packages/ui-mobile-base/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
diff --git a/packages/ui-mobile-base/android/widgets/build.gradle b/packages/ui-mobile-base/android/widgets/build.gradle
index f7fcfcde0..cc2e81745 100644
--- a/packages/ui-mobile-base/android/widgets/build.gradle
+++ b/packages/ui-mobile-base/android/widgets/build.gradle
@@ -88,11 +88,13 @@ task cleanBuildDir (type: Delete) {
     delete "../build/"
 }
 
-task copyAar << {
+task copyAar {
+    doLast {
     copy {
         from "build/outputs/aar/widgets-release.aar"
         into "../build/"
     }
+    }
 }
 
 assemble.dependsOn(cleanBuildDir)
diff --git a/packages/ui-mobile-base/build.android.sh b/packages/ui-mobile-base/build.android.sh
index 64401f524..f0fc51915 100755
--- a/packages/ui-mobile-base/build.android.sh
+++ b/packages/ui-mobile-base/build.android.sh
@@ -13,7 +13,7 @@ echo "Build android"
 cd android
 ./gradlew --quiet assembleRelease
 cd ..
-cp android/widgets/build/outputs/aar/widgets-release.aar dist/package/platforms/android/widgets-release.aar
+cp android/widgets/build/outputs/aar/widgets.aar dist/package/platforms/android/widgets-release.aar
 
 if [ "$1" ]
 then
@@ -26,7 +26,7 @@ then
   echo "SKIP pack" 
 else
   echo "Copy NPM artefacts"
-  cp .npmignore LICENSE README.md package.json dist/package
+  cp .npmignore README.md package.json dist/package
   echo "NPM pack"
   cd dist/package
   PACKAGE="$(npm pack)"