From b8f5ac4a8df0830461920516d6cac02f3850600d Mon Sep 17 00:00:00 2001
From: Benoit Lavenier <benoit.lavenier@e-is.pro>
Date: Wed, 22 Apr 2020 19:33:36 +0200
Subject: [PATCH] [fix] Upgrade to ionic cli 6.6.0, and fix android build
script
---
scripts/env-global.sh | 7 ++++---
yarn.lock | 8 ++++----
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/scripts/env-global.sh b/scripts/env-global.sh
index d136f1c4..32ce4400 100755
--- a/scripts/env-global.sh
+++ b/scripts/env-global.sh
@@ -24,8 +24,9 @@ NODEJS_VERSION=10
ANDROID_NDK_VERSION=r19c
ANDROID_SDK_VERSION=r29.0.2
-ANDROID_SDK_ROOT=/usr/lib/android-sdk
ANDROID_SDK_TOOLS_VERSION=4333796
+ANDROID_SDK_ROOT=/usr/lib/android-sdk
+ANDROID_SDK_TOOLS_ROOT=${ANDROID_SDK_ROOT}/build-tools
ANDROID_OUTPUT_APK=${PROJECT_DIR}/platforms/android/build/outputs/apk
ANDROID_OUTPUT_APK_DEBUG=${ANDROID_OUTPUT_APK}/debug
ANDROID_OUTPUT_APK_RELEASE=${ANDROID_OUTPUT_APK}/release
@@ -33,10 +34,10 @@ ANDROID_OUTPUT_APK_RELEASE=${ANDROID_OUTPUT_APK}/release
DIST_WEB=${PROJECT_DIR}/dist/web/build
DIST_ANDROID=${PROJECT_DIR}/dist/android
-# Addons Modzilla ID
+# Addons Mozilla Web extension ID
WEB_EXT_ID="{6f9922f7-a054-4609-94ce-d269993246a5}"
-#JAVA_HOME=
+#JAVA_HOME= /!\ TODO Should be define in your <project>/.local/env.sh file
GRADLE_VERSION=4.10.3
GRADLE_HOME=${HOME}/.gradle/${GRADLE_VERSION}
diff --git a/yarn.lock b/yarn.lock
index 7a65fc6c..2deab57c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -301,10 +301,10 @@
wrap-ansi "^6.0.0"
write-file-atomic "^3.0.0"
-"@ionic/cli@^6.5.0":
- version "6.5.0"
- resolved "https://registry.yarnpkg.com/@ionic/cli/-/cli-6.5.0.tgz#8198bef2034e819a324bb7cb80a6de0a69db0180"
- integrity sha512-FyalQsiBAD/YhJ4FKpfRsFDXLEQ68E8tVivl8vfERAo8MLrQUwO0TSqtZKh5dWmRfkpMFnJa4joPo/9Qj6sn5Q==
+"@ionic/cli@^6.6.0":
+ version "6.6.0"
+ resolved "https://registry.yarnpkg.com/@ionic/cli/-/cli-6.6.0.tgz#508fd89e3fac51dd3758acf637d8d47469ee656c"
+ integrity sha512-AmF4tMdIGf2XTf6Riune6MwkKl0WImYwnStNDm0871qS8GRFtRSTmMOWnPfkW4lGrIo+OkKfi+NOdziLJ+KmFA==
dependencies:
"@ionic/cli-framework" "4.1.2"
"@ionic/cli-framework-prompts" "2.1.1"
--
GitLab