From 324c1247f62e8fe19399fd925a8bc43eec9764ac Mon Sep 17 00:00:00 2001
From: Benoit Lavenier <benoit.lavenier@e-is.pro>
Date: Mon, 23 Dec 2019 10:05:13 +0100
Subject: [PATCH] [fix] Update barcode scanner plugin to v8.1.0 - fix #856
---
bower.json | 2 +-
config.xml | 4 ++--
package.json | 15 +++++----------
3 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/bower.json b/bower.json
index c8aef743a..84eaeeb41 100644
--- a/bower.json
+++ b/bower.json
@@ -36,7 +36,7 @@
"angular-fullscreen": "E-IS/angular-fullscreen#1.0.2",
"leaflet": "0.7.7",
"moment": "^2.24.0",
- "numeral": "1.5.3",
+ "numeral": "1.5.6",
"underscore": "1.8.3",
"qrcode.js": "davidshimjs/qrcodejs",
"aes-js": "ricmoo/aes-js#3.1.2",
diff --git a/config.xml b/config.xml
index 7008c1054..bf91a4490 100644
--- a/config.xml
+++ b/config.xml
@@ -138,7 +138,7 @@
<plugin name="cordova-plugin-x-toast" spec="^2.6.0" />
<plugin name="cordova-plugin-ionic-keyboard" spec="^2.2.0" />
<plugin name="cordova-plugin-minisodium" spec="https://github.com/E-IS/cordova-plugin-minisodium.git" />
- <plugin name="phonegap-plugin-barcodescanner" spec="https://github.com/phonegap/phonegap-plugin-barcodescanner.git">
- <variable name="CAMERA_USAGE_DESCRIPTION" value="Scan QRCode" />
+ <plugin name="phonegap-plugin-barcodescanner">
+ <variable name="CAMERA_USAGE_DESCRIPTION" value="To scan QRCode" />
</plugin>
</widget>
diff --git a/package.json b/package.json
index 5e5c0ec5a..de8b6beab 100644
--- a/package.json
+++ b/package.json
@@ -53,8 +53,8 @@
"cordova-plugin-x-toast": "^2.7.2",
"ionic-plugin-keyboard": "^2.2.1",
"moment": "~2.24.0",
- "numeral": "1.5.3",
- "phonegap-plugin-barcodescanner": "phonegap-plugin-barcodescanner"
+ "numeral": "1.5.6",
+ "phonegap-plugin-barcodescanner": "8.1.0"
},
"devDependencies": {
"bower": "^1.8.8",
@@ -140,10 +140,7 @@
],
"cordova": {
"plugins": {
- "cordova-plugin-camera": {
- "CAMERA_USAGE_DESCRIPTION": " ",
- "PHOTOLIBRARY_USAGE_DESCRIPTION": " "
- },
+ "cordova-plugin-camera": {},
"cordova-plugin-console": {},
"cordova-plugin-device": {},
"cordova-plugin-dialogs": {},
@@ -157,13 +154,11 @@
"cordova-plugin-x-toast": {},
"cordova-plugin-ionic-keyboard": {},
"phonegap-plugin-barcodescanner": {
- "CAMERA_USAGE_DESCRIPTION": "Scan QRCode"
+ "CAMERA_USAGE_DESCRIPTION": "To scan QRCode"
},
"ionic-plugin-keyboard": {},
"cordova-clipboard": {},
- "cordova-plugin-ionic-webview": {
- "ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+"
- }
+ "cordova-plugin-ionic-webview": {}
},
"platforms": [
"ios",
--
GitLab