Merge branch 'updateWMSSource-VIPSUTV-719' into 'development'

Update wms source vipsutv 719

See merge request !5

README.md

@@ -253,10 +253,22 @@ keytool -export -rfc -alias upload -file upload_certificate.pem -keystore keysto
 Signing can be done like this (example):
 
 ```bash
-$ cordova run android --release -- --keystore=[PATH_TO_KEYSTORE] --storePassword=[KEYSTORE_PASSWORD] --alias=upload --password=[PASSWORD] --packageType=bundle
+$ cordova build android --release -- --keystore=[PATH_TO_KEYSTORE] --storePassword=[KEYSTORE_PASSWORD] --alias=upload --password=[PASSWORD] --packageType=bundle
 
 ```
 
+**If building the bundle using the above command does not result in a signed bundle, it can be signed after it has been created, using this command**
+
+```bash
+jarsigner -verbose -keystore keystore.jks app-release.aab upload
+```
+
+You can verify this by using this command:
+
+```bash
+jarsigner -verify -verbose -certs app-release.aab
+```
+
 ### Notes and docs
 
 [Developer account for Google Play](https://play.google.com/console/)

config.xml

 <?xml version='1.0' encoding='utf-8'?>
-<widget id="no.nibio.vips.observation" version="2.0.10"
+<widget id="no.nibio.vips.observation" version="2.0.12"
 	xmlns="http://www.w3.org/ns/widgets"
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:cdv="http://cordova.apache.org/ns/1.0">
@@ -8,6 +8,7 @@
 Build it with 'npm run build' before any cordova
 specific actions - so that vuejs can
 compile to www folder</description>
+    <author email="lene.wasskog@nibio.no" href="https://nibio.no/en/employees/lene-hallen-wasskog">Lene Hallen Wasskog</author>
 	<author email="tor-einar.skog@nibio.no" href="https://www.nibio.no/en/employees/tor-einar-skog">Tor-Einar Skog</author>
 	<author>Bhabesh B Mukhopadhyay</author>
 	<icon src="static/css/images/logo_vips_new.png" />

package.json

 {
   "name": "vipsobservationapp",
-  "version": "2.0.10",
+  "version": "2.0.12",
   "private": true,
   "description": "The Field Pest Observation App for VIPS users",
-  "author": "Tor-Einar Skog <tor-einar.skog@nibio.no>",
+  "author": "Lene Hallen Wasskog <lene.wasskog@nibio.no>",
   "scripts": {
     "build": "node build/build.js",
     "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js",
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@formschema/native": "^2.0.0-alpha.2",
-    "@fortawesome/fontawesome-svg-core": "^6.5.0",
+    "@fortawesome/fontawesome-svg-core": "^1.3.0",
     "@fortawesome/free-regular-svg-icons": "^6.5.0",
     "@fortawesome/free-solid-svg-icons": "^6.5.0",
     "@fortawesome/vue-fontawesome": "^2.0.2",
@@ -20,6 +20,7 @@
     "browser-image-compression": "^1.0.17",
     "ekko-lightbox": "^5.3.0",
     "luxon": "^1.26.0",
+    "node": "^22.6.0",
     "ol": "6.5.0",
     "ol-ext": "^3.1.18",
     "vue": "^2.5.2",
@@ -40,7 +41,7 @@
     "babel-preset-stage-2": "^6.22.0",
     "chalk": "^2.0.1",
     "copy-webpack-plugin": "^4.0.1",
-    "cordova-android": "^12.0.0",
+    "cordova-android": "^13.0.0",
     "cordova-browser": "^6.0.0",
     "cordova-ios": "^7.0.1",
     "cordova-plugin-camera": "^6.0.0",
@@ -68,7 +69,7 @@
     "vue-loader": "^13.3.0",
     "vue-style-loader": "^3.0.1",
     "vue-template-compiler": "^2.5.2",
-    "webpack": "^3.6.0",
+    "webpack": "^3.12.0",
     "webpack-bundle-analyzer": "^2.9.0",
     "webpack-dev-server": "^2.9.1",
     "webpack-merge": "^4.1.0",
@@ -82,11 +83,13 @@
   "cordova": {
     "platforms": [
       "browser",
-      "android",
-      "ios"
+      "ios",
+      "android"
     ],
     "plugins": {
-      "cordova-plugin-geolocation": {},
+      "cordova-plugin-geolocation": {
+        "GPS_REQUIRED": "true"
+      },
       "cordova-plugin-camera": {
         "ANDROIDX_CORE_VERSION": "1.6.+"
       },
@@ -95,7 +98,7 @@
     }
   },
   "engines": {
-    "node": ">= 6.0.0",
-    "npm": ">= 3.0.0"
+    "node": ">= 20.0.0",
+    "npm": ">= 9.0.0"
   }
-}
+}
\ No newline at end of file