diff --git a/package-lock.json b/package-lock.json
index 48e0da6b6e328eae0b66686313a0414423217534..21c5276f5ff4fd03704a7fbb4920830d8ca3e41c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -28,7 +28,7 @@
"angular2-chartjs": "^0.5.1",
"angular2-hotkeys": "^13.1.0",
"chartjs-plugin-zoom": "^0.7.7",
- "cordova-android": "^10.1.2",
+ "cordova-android": "^11.0.0",
"cordova-plugin-advanced-http": "^3.3.1",
"cordova-plugin-app-version": "^0.1.14",
"cordova-plugin-badge": "^0.8.8",
@@ -74,6 +74,7 @@
"@typescript-eslint/parser": "^5.30.5",
"codelyzer": "^6.0.2",
"cordova": "^11.0.0",
+ "cordova-plugin-androidx-adapter": "^1.1.3",
"electron": "^19.0.7",
"electron-builder": "^23.1.0",
"eslint": "^8.19.0",
@@ -7217,24 +7218,24 @@
}
},
"node_modules/cordova-android": {
- "version": "10.1.2",
- "resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-10.1.2.tgz",
- "integrity": "sha512-F28+NvgKO4ZhKFkqctCOh62mhVoNyUuRQh/F/nqp+Sti4ODv2rUa6UeW18khhdYTjlDeihHQsPqxvB7mI6fVYA==",
+ "version": "11.0.0",
+ "resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-11.0.0.tgz",
+ "integrity": "sha512-ZhvSF5BYY8gmrAu1PtMPdHFsRoom/emT4OtTcecmh3Zj22900y4Golg5whhBPcYcTPC7BU6PG/EmG9BBHcX9tQ==",
"dependencies": {
"android-versions": "^1.7.0",
"cordova-common": "^4.0.2",
"execa": "^5.1.1",
- "fast-glob": "^3.2.7",
- "fs-extra": "^10.0.0",
+ "fast-glob": "^3.2.11",
+ "fs-extra": "^10.1.0",
"is-path-inside": "^3.0.3",
"nopt": "^5.0.0",
"properties-parser": "^0.3.1",
- "semver": "^7.3.5",
+ "semver": "^7.3.7",
"untildify": "^4.0.0",
"which": "^2.0.2"
},
"engines": {
- "node": ">=12.0.0"
+ "node": ">=14.0.0"
}
},
"node_modules/cordova-app-hello-world": {
@@ -7901,6 +7902,16 @@
}
]
},
+ "node_modules/cordova-plugin-androidx-adapter": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/cordova-plugin-androidx-adapter/-/cordova-plugin-androidx-adapter-1.1.3.tgz",
+ "integrity": "sha512-W1SImn0cCCvOSTSfWWp5TnanIQrSuh2Bch+dcZXIzEn0km3Qb7VryeAqHhgBQYwwzC5Ollk1DtUAk/AJSojuZA==",
+ "dev": true,
+ "dependencies": {
+ "q": "^1.5.1",
+ "recursive-readdir": "^2.2.2"
+ }
+ },
"node_modules/cordova-plugin-app-version": {
"version": "0.1.14",
"resolved": "https://registry.npmjs.org/cordova-plugin-app-version/-/cordova-plugin-app-version-0.1.14.tgz",
@@ -18444,6 +18455,40 @@
"node": ">=8.10.0"
}
},
+ "node_modules/recursive-readdir": {
+ "version": "2.2.2",
+ "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz",
+ "integrity": "sha512-nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg==",
+ "dev": true,
+ "dependencies": {
+ "minimatch": "3.0.4"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/recursive-readdir/node_modules/brace-expansion": {
+ "version": "1.1.11",
+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+ "dev": true,
+ "dependencies": {
+ "balanced-match": "^1.0.0",
+ "concat-map": "0.0.1"
+ }
+ },
+ "node_modules/recursive-readdir/node_modules/minimatch": {
+ "version": "3.0.4",
+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+ "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+ "dev": true,
+ "dependencies": {
+ "brace-expansion": "^1.1.7"
+ },
+ "engines": {
+ "node": "*"
+ }
+ },
"node_modules/reflect-metadata": {
"version": "0.1.13",
"resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.13.tgz",
@@ -27703,19 +27748,19 @@
}
},
"cordova-android": {
- "version": "10.1.2",
- "resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-10.1.2.tgz",
- "integrity": "sha512-F28+NvgKO4ZhKFkqctCOh62mhVoNyUuRQh/F/nqp+Sti4ODv2rUa6UeW18khhdYTjlDeihHQsPqxvB7mI6fVYA==",
+ "version": "11.0.0",
+ "resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-11.0.0.tgz",
+ "integrity": "sha512-ZhvSF5BYY8gmrAu1PtMPdHFsRoom/emT4OtTcecmh3Zj22900y4Golg5whhBPcYcTPC7BU6PG/EmG9BBHcX9tQ==",
"requires": {
"android-versions": "^1.7.0",
"cordova-common": "^4.0.2",
"execa": "^5.1.1",
- "fast-glob": "^3.2.7",
- "fs-extra": "^10.0.0",
+ "fast-glob": "^3.2.11",
+ "fs-extra": "^10.1.0",
"is-path-inside": "^3.0.3",
"nopt": "^5.0.0",
"properties-parser": "^0.3.1",
- "semver": "^7.3.5",
+ "semver": "^7.3.7",
"untildify": "^4.0.0",
"which": "^2.0.2"
}
@@ -28276,6 +28321,16 @@
"resolved": "https://registry.npmjs.org/cordova-plugin-advanced-http/-/cordova-plugin-advanced-http-3.3.1.tgz",
"integrity": "sha512-hESuB3mxIHCUrzb5lm7juda6PSNcC5N8Invizj5wGV2rSldCapiNxMTEpzKR1UVPDDP2XOtBzO0SAYS+3+g/ig=="
},
+ "cordova-plugin-androidx-adapter": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/cordova-plugin-androidx-adapter/-/cordova-plugin-androidx-adapter-1.1.3.tgz",
+ "integrity": "sha512-W1SImn0cCCvOSTSfWWp5TnanIQrSuh2Bch+dcZXIzEn0km3Qb7VryeAqHhgBQYwwzC5Ollk1DtUAk/AJSojuZA==",
+ "dev": true,
+ "requires": {
+ "q": "^1.5.1",
+ "recursive-readdir": "^2.2.2"
+ }
+ },
"cordova-plugin-app-version": {
"version": "0.1.14",
"resolved": "https://registry.npmjs.org/cordova-plugin-app-version/-/cordova-plugin-app-version-0.1.14.tgz",
@@ -36088,6 +36143,36 @@
"picomatch": "^2.2.1"
}
},
+ "recursive-readdir": {
+ "version": "2.2.2",
+ "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz",
+ "integrity": "sha512-nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg==",
+ "dev": true,
+ "requires": {
+ "minimatch": "3.0.4"
+ },
+ "dependencies": {
+ "brace-expansion": {
+ "version": "1.1.11",
+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+ "dev": true,
+ "requires": {
+ "balanced-match": "^1.0.0",
+ "concat-map": "0.0.1"
+ }
+ },
+ "minimatch": {
+ "version": "3.0.4",
+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+ "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+ "dev": true,
+ "requires": {
+ "brace-expansion": "^1.1.7"
+ }
+ }
+ }
+ },
"reflect-metadata": {
"version": "0.1.13",
"resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.13.tgz",
diff --git a/package.json b/package.json
index 4365382c6f5830d017d83e5a3a2fb0f7c357131e..4d95e38e8a424933c26928330187274a887a6364 100644
--- a/package.json
+++ b/package.json
@@ -54,7 +54,7 @@
"angular2-chartjs": "^0.5.1",
"angular2-hotkeys": "^13.1.0",
"chartjs-plugin-zoom": "^0.7.7",
- "cordova-android": "^10.1.2",
+ "cordova-android": "^11.0.0",
"cordova-plugin-advanced-http": "^3.3.1",
"cordova-plugin-app-version": "^0.1.14",
"cordova-plugin-badge": "^0.8.8",
@@ -100,6 +100,7 @@
"@typescript-eslint/parser": "^5.30.5",
"codelyzer": "^6.0.2",
"cordova": "^11.0.0",
+ "cordova-plugin-androidx-adapter": "^1.1.3",
"electron": "^19.0.7",
"electron-builder": "^23.1.0",
"eslint": "^8.19.0",
@@ -115,17 +116,22 @@
"cordova": {
"plugins": {
"cordova-plugin-whitelist": {},
- "cordova-plugin-file": {},
+ "cordova-plugin-file": {
+ "ANDROIDX_WEBKIT_VERSION": "1.4.0"
+ },
"cordova-plugin-file-opener2": {
"ANDROID_SUPPORT_V4_VERSION": "27.+"
},
"cordova-plugin-device": {},
"cordova-plugin-local-notification": {},
"cordova-plugin-app-version": {},
- "cordova-plugin-advanced-http": {}
+ "cordova-plugin-advanced-http": {
+ "ANDROIDBLACKLISTSECURESOCKETPROTOCOLS": "SSLv3,TLSv1"
+ },
+ "cordova-plugin-androidx-adapter": {}
},
"platforms": [
"android"
]
}
-}
+}
\ No newline at end of file