diff --git a/package-lock.json b/package-lock.json index 6a6718dd1..5f252ad87 100644 --- a/package-lock.json +++ b/package-lock.json @@ -46,7 +46,7 @@ "autoprefixer": "^10.4.19", "babel-loader": "^9.1.3", "com.foxdebug.acode.exec": "file:src/plugins/Executor", - "cordova-android": "^13.0.0", + "cordova-android": "^14.0.1", "cordova-clipboard": "^1.3.0", "cordova-plugin-advanced-http": "^3.3.1", "cordova-plugin-browser": "file:src/plugins/browser", @@ -3202,9 +3202,9 @@ } }, "node_modules/android-versions/node_modules/semver": { - "version": "7.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", - "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", + "version": "7.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", + "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", "dev": true, "license": "ISC", "bin": { @@ -4231,34 +4231,43 @@ } }, "node_modules/cordova-android": { - "version": "13.0.0", - "resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-13.0.0.tgz", - "integrity": "sha512-uQG+cSyrB1NMi2aIzihldIupHB9WGpZVvrMMMAAtnyc6tDlEk7gweSSaFsEONyGAnteRYpIvrzg/YwDW08PcUg==", + "version": "14.0.1", + "resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-14.0.1.tgz", + "integrity": "sha512-HMBMdGu/JlSQtmBuDEpKWf/pE75SpF3FksxZ+mqYuL3qSIN8lN/QsNurwYaPAP7zWXN2DNpvwlpOJItS5VhdLg==", "dev": true, "license": "Apache-2.0", "dependencies": { - "android-versions": "^2.0.0", - "cordova-common": "^5.0.0", + "android-versions": "^2.1.0", + "cordova-common": "^5.0.1", "dedent": "^1.5.3", "execa": "^5.1.1", - "fast-glob": "^3.3.2", - "fs-extra": "^11.2.0", + "fast-glob": "^3.3.3", "is-path-inside": "^3.0.3", - "nopt": "^7.2.1", + "nopt": "^8.1.0", "properties-parser": "^0.6.0", - "semver": "^7.6.2", + "semver": "^7.7.1", "string-argv": "^0.3.1", "untildify": "^4.0.0", - "which": "^4.0.0" + "which": "^5.0.0" }, "engines": { - "node": ">=16.13.0" + "node": ">=20.5.0" + } + }, + "node_modules/cordova-android/node_modules/abbrev": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-3.0.1.tgz", + "integrity": "sha512-AO2ac6pjRB3SJmGJo+v5/aK6Omggp6fsLrs6wN9bd35ulu4cCwaAU9+7ZhXjeqHVkaHThLuzH0nZr0YpCDhygg==", + "dev": true, + "license": "ISC", + "engines": { + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/cordova-android/node_modules/dedent": { - "version": "1.5.3", - "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.3.tgz", - "integrity": "sha512-NHQtfOOW68WD8lgypbLA5oT+Bt0xXJhiYvoR6SmmNXZfpzOGXwdKWmcwG8N7PwVVWV3eF/68nmD9BaJSsTBhyQ==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.6.0.tgz", + "integrity": "sha512-F1Z+5UCFpmQUzJa11agbyPVMbpgT/qA3/SKyJ1jyBgm7dUcUEa8v9JwDkerSQXfakBwFljIxhOJqGkjUwZ9FSA==", "dev": true, "license": "MIT", "peerDependencies": { @@ -4280,10 +4289,26 @@ "node": ">=16" } }, + "node_modules/cordova-android/node_modules/nopt": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-8.1.0.tgz", + "integrity": "sha512-ieGu42u/Qsa4TFktmaKEwM6MQH0pOWnaB3htzh0JRtx84+Mebc0cbZYN5bC+6WTZ4+77xrL9Pn5m7CV6VIkV7A==", + "dev": true, + "license": "ISC", + "dependencies": { + "abbrev": "^3.0.0" + }, + "bin": { + "nopt": "bin/nopt.js" + }, + "engines": { + "node": "^18.17.0 || >=20.5.0" + } + }, "node_modules/cordova-android/node_modules/semver": { - "version": "7.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", - "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", + "version": "7.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", + "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", "dev": true, "license": "ISC", "bin": { @@ -4294,9 +4319,9 @@ } }, "node_modules/cordova-android/node_modules/which": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz", - "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/which/-/which-5.0.0.tgz", + "integrity": "sha512-JEdGzHwwkrbWoGOlIHqQ5gtprKGOenpDHpxE9zVR1bWbOtYRyPPHMe9FaP6x61CmNaTThSkb0DAJte5jD+DmzQ==", "dev": true, "license": "ISC", "dependencies": { @@ -4306,7 +4331,7 @@ "node-which": "bin/which.js" }, "engines": { - "node": "^16.13.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/cordova-app-hello-world": { diff --git a/package.json b/package.json index c3c31c4f5..565b34aef 100644 --- a/package.json +++ b/package.json @@ -115,4 +115,4 @@ "yargs": "^17.7.2" }, "browserslist": "cover 100%,not android < 5" -} \ No newline at end of file +} diff --git a/src/plugins/Executor/index.js b/src/plugins/Executor/index.js deleted file mode 100644 index ba4381718..000000000 --- a/src/plugins/Executor/index.js +++ /dev/null @@ -1,8 +0,0 @@ -function exec(cmd,success,failure) { - const ACTION = 'exec'; - cordova.exec(success, failure, 'Executor', ACTION, [cmd]); -} - -export default { - exec, -}; \ No newline at end of file diff --git a/src/plugins/Executor/plugin.xml b/src/plugins/Executor/plugin.xml index dc7e7d588..862dcb91d 100644 --- a/src/plugins/Executor/plugin.xml +++ b/src/plugins/Executor/plugin.xml @@ -1,2 +1,2 @@ -Executor +Executor diff --git a/src/plugins/Executor/www/Executor.js b/src/plugins/Executor/www/Executor.js new file mode 100644 index 000000000..9e3c2bc10 --- /dev/null +++ b/src/plugins/Executor/www/Executor.js @@ -0,0 +1,5 @@ +var exec = require('cordova/exec'); + +module.exports.execute = function (cmd,success,failure) { + exec(success, failure, 'Executor', 'exec', [cmd]); +} \ No newline at end of file