Commit 9790e041 authored by Benoit Lavenier's avatar Benoit Lavenier

[enh] Upgrade to @ionic/cli@6.6.0

parent dc942cb0
Pipeline #8748 failed
......@@ -9,10 +9,10 @@ ENV DEBIAN_FRONTEND=noninteractive \
NODE_VERSION=10.20.0 \
NPM_VERSION=6.14.4 \
YARN_VERSION=1.22.4 \
IONIC_CLI_VERSION=6.5.0 \
IONIC_CLI_VERSION=6.6.0 \
CORDOVA_VERSION=8.1.2 \
GRADLE_VERSION=4.10.3 \
GULP_VERSION=2.2.0
GULP_VERSION=3.9.1
# Install basics
RUN apk update && \
......
......@@ -82,7 +82,7 @@ npm install -g nw-gyp node-pre-gyp
2. Install global dependencies (see [Development Guide](./development_guide.md) for versions to used) :
```
npm install -g yarn gulp cordova@9.0.0 ionic@1.7.16
npm install -g yarn gulp@3.9.1 cordova @ionic/cli@6.6.0
```
3. Install project dependencies :
......
......@@ -27,7 +27,7 @@ To build Cesium, you will have to:
3. Installing node build tools, as global dependencies:
```bash
npm install -g yarn gulp cordova @ionic/cli web-ext
npm install -g yarn gulp@3.9.1 cordova@8.1.2 @ionic/cli@6.6.0 web-ext
```
## Get the source code and dependencies
......
......@@ -127,7 +127,7 @@ cd cesium
Puis, lancez le téléchargement et l'installation des modules Cesium à l'aide de la commande :
```bash
npm install -g yarn cordova ionic@1.7.16
npm install -g yarn gulp@3.9.1 cordova@8.1.2 @ionic/cli@6.6.0 web-ext
```
Puis pour les dépendances non globales :
......
{
"name": "cesium",
"version": "1.6.3",
"version": "1.6.4",
"description": "Cesium Wallet for G1 libre currency",
"author": "Benoit Lavenier <benoit.lavenier@e-is.pro>",
"license": "AGPL-3.0",
......@@ -104,7 +104,7 @@
"phonegap-plugin-barcodescanner": "^8.1.0"
},
"devDependencies": {
"@ionic/cli": "^6.5.0",
"@ionic/cli": "^6.6.0",
"@ionic/v1-toolkit": "^3.1.2",
"cordova-uglify": "^0.3.4",
"del": "^3.0.0",
......
Subproject commit c7a8b1fcbea7e08dc1a10a948c21bbf7f2e18f41
Subproject commit b1d608bdb8b49d8a71d13efe24ce96c0619c6d23
{
"name": "Cesium",
"short_name": "Cesium",
"version": "1.6.3",
"version": "1.6.4",
"description": "Manage your Duniter Wallet on a libre currency, like Ğ1",
"background": {
"scripts": ["background.js"]
......
......@@ -68,3 +68,5 @@ if [[ -d "${PROJECT_DIR}/.local/android" ]]; then
else
echo "No directory '${PROJECT_DIR}/.local/android' found. Please create it, with a file 'release-signing.properties' for release signing"
fi
echo "Environment is ready!"
......@@ -10,10 +10,10 @@ angular.module("cesium.config", [])
.constant("csConfig", {
"cacheTimeMs": 300000,
"fallbackLanguage": "en",
"fallbackLanguage": "fr",
"rememberMe": true,
"showUDHistory": true,
"timeout": 40000,
"timeout": 300000,
"timeWarningExpireMembership": 5184000,
"timeWarningExpire": 7776000,
"keepAuthIdle": 600,
......@@ -31,8 +31,8 @@ angular.module("cesium.config", [])
}
},
"license": {
"en": "license/license_g1-en",
"fr-FR": "license/license_g1-fr-FR",
"en": "license/license_g1-en",
"es-ES": "license/license_g1-es-ES",
"eo-EO": "license/license_g1-eo-EO"
},
......@@ -44,12 +44,12 @@ angular.module("cesium.config", [])
"maxContentLength": 1300
},
"node": {
"host": "g1.duniter.org",
"host": "g1.duniter.fr",
"port": 443
},
"fallbackNodes": [
{
"host": "g1.cgeek.fr",
"host": "g1.duniter.fr",
"port": 443
},
{
......@@ -61,14 +61,12 @@ angular.module("cesium.config", [])
"port": 443
},
{
"host": "g1.duniter.fr",
"host": "duniter.normandie-libre.fr",
"port": 443
}
],
"developers": [
},
{
"name": "Benoit Lavenier",
"pubkey": "38MEAZN68Pz1DTvT3tqgxx4yQP6snJCQhPqEFxbDk4aE"
"host": "g1.duniter.org",
"port": 443
}
],
"plugins": {
......@@ -97,8 +95,8 @@ angular.module("cesium.config", [])
"defaultCountry": "France"
}
},
"version": "1.6.3",
"build": "2020-04-14T15:27:37.888Z",
"version": "1.6.4",
"build": "2020-04-22T14:53:36.845Z",
"newIssueUrl": "https://git.duniter.org/clients/cesium-grp/cesium/issues/new"
})
......
......@@ -7049,7 +7049,7 @@ node-gyp@^3.8.0:
tar "^2.0.0"
which "1"
node-sass@^4.13.0, node-sass@^4.8.3:
node-sass@^4.13.1, node-sass@^4.8.3:
version "4.13.1"
resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.13.1.tgz#9db5689696bb2eec2c32b98bfea4c7a2e992d0a3"
integrity sha512-TTWFx+ZhyDx1Biiez2nB0L3YrCZ/8oHagaDalbuBSlqXgUPsdkUSzJsVxeDO9LtPB49+Fh3WQl3slABo6AotNw==
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment