Skip to content
Snippets Groups Projects
Commit e1d7da37 authored by Bertrand Presles's avatar Bertrand Presles
Browse files

Merge branch 'feature/cordova-9' into feature/ios-support

parents dff1ab27 62fd066a
No related branches found
No related tags found
1 merge request!590iOS support: Fix "Missing attestations" message on AppStoreConnect. Added specific App ID for iOS. iOS 13 compatibility. Fix NPM install for minisodium.
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
/resources/android/build/release-signing.properties /resources/android/build/release-signing.properties
/plugins/ /plugins/
.idea/ .idea/
.vscode/
.local/ .local/
/*.iml /*.iml
......
...@@ -107,14 +107,12 @@ ...@@ -107,14 +107,12 @@
<false /> <false />
</config-file> </config-file>
</platform> </platform>
<engine name="android" spec="^6.2.3" /> <engine name="android" spec="^6.4.0" />
<engine name="ios" spec="^4.5.5" /> <engine name="ios" spec="^5.1.0-dev" />
<plugin name="cordova-plugin-ionic-webview" spec="^4.1.1" />
<plugin name="cordova-plugin-camera" spec="^2.4.1" /> <plugin name="cordova-plugin-camera" spec="^2.4.1" />
<plugin name="cordova-plugin-console" spec="^1.0.7" /> <plugin name="cordova-plugin-console" spec="^1.0.7" />
<plugin name="cordova-plugin-device" spec="^1.1.6" /> <plugin name="cordova-plugin-device" spec="^1.1.6" />
<plugin name="cordova-plugin-dialogs" spec="^1.3.3" /> <plugin name="cordova-plugin-dialogs" spec="^1.3.3" />
<plugin name="cordova-plugin-inappbrowser" spec="^1.7.1" />
<plugin name="cordova-plugin-minisodium" spec="^1.0.1" /> <plugin name="cordova-plugin-minisodium" spec="^1.0.1" />
<plugin name="cordova-plugin-secure-storage" spec="^2.6.8" /> <plugin name="cordova-plugin-secure-storage" spec="^2.6.8" />
<plugin name="cordova-plugin-splashscreen" spec="^3.2.2" /> <plugin name="cordova-plugin-splashscreen" spec="^3.2.2" />
......
{}
\ No newline at end of file
...@@ -30,18 +30,16 @@ ...@@ -30,18 +30,16 @@
"new": "https://git.duniter.org/clients/cesium-grp/cesium/issues/new" "new": "https://git.duniter.org/clients/cesium-grp/cesium/issues/new"
}, },
"dependencies": { "dependencies": {
"cordova": "^7.1.0", "cordova": "^9.0.0",
"cordova-android": "^6.2.3", "cordova-android": "6.4.0",
"cordova-ios": "^4.5.5", "cordova-ios": "https://github.com/bpresles/cordova-ios.git#5.1.0",
"cordova-plugin-camera": "^2.4.1", "cordova-plugin-camera": "^2.4.1",
"cordova-plugin-compat": "^1.1.0", "cordova-plugin-compat": "^1.2.0",
"cordova-plugin-console": "^1.0.7", "cordova-plugin-console": "^1.0.7",
"cordova-plugin-crosswalk-webview": "^2.3.0", "cordova-plugin-crosswalk-webview": "^2.3.0",
"cordova-plugin-device": "^1.1.6", "cordova-plugin-device": "^1.1.6",
"cordova-plugin-dialogs": "^1.3.3", "cordova-plugin-dialogs": "^1.3.3",
"cordova-plugin-inappbrowser": "^1.7.1", "cordova-plugin-minisodium": "https://github.com/E-IS/cordova-plugin-minisodium/archive/v1.0.1.tar.gz",
"cordova-plugin-ionic-webview": "^4.1.1",
"cordova-plugin-minisodium": "git+https://github.com/E-IS/cordova-plugin-minisodium.git",
"cordova-plugin-secure-storage": "^2.6.8", "cordova-plugin-secure-storage": "^2.6.8",
"cordova-plugin-splashscreen": "^3.2.2", "cordova-plugin-splashscreen": "^3.2.2",
"cordova-plugin-statusbar": "^2.4.2", "cordova-plugin-statusbar": "^2.4.2",
...@@ -52,7 +50,7 @@ ...@@ -52,7 +50,7 @@
"ionic-plugin-keyboard": "^2.2.1", "ionic-plugin-keyboard": "^2.2.1",
"moment": "~2.19.3", "moment": "~2.19.3",
"numeral": "1.5.3", "numeral": "1.5.3",
"phonegap-plugin-barcodescanner": "git+https://github.com/phonegap/phonegap-plugin-barcodescanner.git" "phonegap-plugin-barcodescanner": "https://github.com/phonegap/phonegap-plugin-barcodescanner.git"
}, },
"devDependencies": { "devDependencies": {
"bower": "^1.8.0", "bower": "^1.8.0",
...@@ -60,7 +58,6 @@ ...@@ -60,7 +58,6 @@
"del": "^2.2.0", "del": "^2.2.0",
"delete-empty": "^0.1.3", "delete-empty": "^0.1.3",
"event-stream": "3.3.4", "event-stream": "3.3.4",
"fs": "^0.0.2",
"glob": "^5.0.15", "glob": "^5.0.15",
"gulp": "^3.9.1", "gulp": "^3.9.1",
"gulp-angular-templatecache": "^1.8.0", "gulp-angular-templatecache": "^1.8.0",
...@@ -114,7 +111,6 @@ ...@@ -114,7 +111,6 @@
"cordova-plugin-vibration", "cordova-plugin-vibration",
"cordova-plugin-dialogs", "cordova-plugin-dialogs",
"cordova-plugin-secure-storage", "cordova-plugin-secure-storage",
"cordova-plugin-inappbrowser",
"cordova-plugin-x-toast", "cordova-plugin-x-toast",
"cordova-clipboard", "cordova-clipboard",
{ {
...@@ -128,8 +124,16 @@ ...@@ -128,8 +124,16 @@
"cordova-plugin-ionic-webview" "cordova-plugin-ionic-webview"
], ],
"cordovaPlatforms": [ "cordovaPlatforms": [
"android", {
"ios" "platform": "ios",
"version": "5.1.0",
"locator": "https://github.com/bpresles/cordova-ios.git#5.1.0"
},
{
"platform": "android",
"version": "6.4.0",
"locator": "android@6.4.0"
}
], ],
"cordova": { "cordova": {
"plugins": { "plugins": {
...@@ -137,7 +141,6 @@ ...@@ -137,7 +141,6 @@
"cordova-plugin-console": {}, "cordova-plugin-console": {},
"cordova-plugin-device": {}, "cordova-plugin-device": {},
"cordova-plugin-dialogs": {}, "cordova-plugin-dialogs": {},
"cordova-plugin-inappbrowser": {},
"cordova-plugin-minisodium": {}, "cordova-plugin-minisodium": {},
"cordova-plugin-secure-storage": {}, "cordova-plugin-secure-storage": {},
"cordova-plugin-splashscreen": {}, "cordova-plugin-splashscreen": {},
...@@ -153,8 +156,8 @@ ...@@ -153,8 +156,8 @@
"cordova-plugin-ionic-webview": {} "cordova-plugin-ionic-webview": {}
}, },
"platforms": [ "platforms": [
"android", "ios",
"ios" "android"
] ]
} }
} }
\ No newline at end of file
{
"ios": "https://github.com/bpresles/cordova-ios.git#5.1.0",
"android": "6.4.0"
}
/// <reference path="../.vscode/typings/cordova/cordova.d.ts"/>
/// <reference path="../.vscode/typings/cordova-ionic/plugins/keyboard.d.ts"/>
/// <reference path="../.vscode/typings/ionic/ionic.d.ts"/>
/// <reference path="../.vscode/typings/angularjs/angular.d.ts"/>
/// <reference path="../.vscode/typings/jquery/jquery.d.ts"/>
/// <reference path="../.vscode/typings/cordova/plugins/Toast.d.ts"/>
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment