Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Cesium
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
bpresles
Cesium
Commits
b8f5ac4a
Commit
b8f5ac4a
authored
4 years ago
by
Benoit Lavenier
Browse files
Options
Downloads
Patches
Plain Diff
[fix] Upgrade to ionic cli 6.6.0, and fix android build script
parent
aa37011e
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
scripts/env-global.sh
+4
-3
4 additions, 3 deletions
scripts/env-global.sh
yarn.lock
+4
-4
4 additions, 4 deletions
yarn.lock
with
8 additions
and
7 deletions
scripts/env-global.sh
+
4
−
3
View file @
b8f5ac4a
...
...
@@ -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 Mo
d
zilla 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
}
...
...
This diff is collapsed.
Click to expand it.
yarn.lock
+
4
−
4
View file @
b8f5ac4a
...
...
@@ -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"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment