diff --git a/package-lock.json b/package-lock.json index 3b4d207ec..29eef5220 100644 --- a/package-lock.json +++ b/package-lock.json @@ -48,7 +48,7 @@ "@moodlehq/cordova-plugin-ionic-webview": "5.0.0-moodle.1", "@moodlehq/cordova-plugin-local-notification": "0.9.0-moodle.2", "@moodlehq/cordova-plugin-qrscanner": "3.0.1-moodle.2", - "@moodlehq/phonegap-plugin-push": "2.2.3-moodle.1", + "@moodlehq/phonegap-plugin-push": "2.0.0-moodle.2", "@ngx-translate/core": "^13.0.0", "@ngx-translate/http-loader": "^6.0.0", "@types/chart.js": "^2.9.31", @@ -93,7 +93,6 @@ "mathjax": "2.7.7", "moment": "^2.29.0", "nl.kingsquare.cordova.background-audio": "^1.0.1", - "phonegap-plugin-multidex": "^1.0.0", "rxjs": "~6.5.5", "ts-md5": "^1.2.7", "tslib": "^2.0.1", @@ -119,6 +118,7 @@ "@typescript-eslint/eslint-plugin": "^4.22.0", "@typescript-eslint/parser": "^4.22.0", "check-es-compat": "^1.1.1", + "cordova-plugin-androidx-adapter": "^1.1.3", "eslint": "^7.25.0", "eslint-config-prettier": "^8.3.0", "eslint-plugin-header": "^3.1.1", @@ -5025,44 +5025,20 @@ } }, "node_modules/@moodlehq/phonegap-plugin-push": { - "version": "2.2.3-moodle.1", - "resolved": "https://registry.npmjs.org/@moodlehq/phonegap-plugin-push/-/phonegap-plugin-push-2.2.3-moodle.1.tgz", - "integrity": "sha512-LxHz0nPIvxhRgjvj8QRTdhuMtb+NNbFsaAh7JS6q9Ag0lt3LkKrGwCoMr/rTfhfCLj+mrIhyLUv/mo8oPmHeeg==", - "dependencies": { - "babel-plugin-add-header-comment": "^1.0.3", - "install": "^0.8.2" - }, + "version": "2.0.0-moodle.2", + "resolved": "https://registry.npmjs.org/@moodlehq/phonegap-plugin-push/-/phonegap-plugin-push-2.0.0-moodle.2.tgz", + "integrity": "sha512-a1ZR36vOy0Gu0yaX2T+PODlNSQcIUuHMNzPZ/kn4I+cV+hyPwAw1LmdGQDdxfABAGKWCvtzwUyYs1T/NCz2fRQ==", "engines": { "cordovaDependencies": { - "<2.0.0": { - "cordova": ">=6.4.0", - "cordova-android": ">=6.0.0", - "cordova-ios": ">=4.3.0" - }, - "<2.1.2": { - "cordova": ">=7.1.0", - "cordova-android": ">=6.3.0", - "cordova-ios": ">=4.4.0" - }, - "<2.2.0": { - "cordova": ">=7.1.0", - "cordova-android": ">=6.3.0", - "cordova-ios": ">=4.5.0" - }, - "1.8.2": { - "cordova": ">=3.6.3", - "cordova-android": ">=4.0.0", - "cordova-ios": ">=4.1.0" + "1.0.0": { + "cordova": ">=10.0.0", + "cordova-android": ">=8.0.0", + "cordova-ios": ">=5.1.1" }, "2.0.0": { - "cordova": ">=7.0.0", - "cordova-android": ">=6.2.1", - "cordova-ios": ">=4.4.0" - }, - "2.2.0": { - "cordova": ">=7.1.0", - "cordova-android": ">=7.1.0", - "cordova-ios": ">=4.5.0" + "cordova": ">=10.0.0", + "cordova-android": ">=8.0.0", + "cordova-ios": ">=6.0.0" } } } @@ -7579,11 +7555,6 @@ "semver": "bin/semver" } }, - "node_modules/babel-plugin-add-header-comment": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/babel-plugin-add-header-comment/-/babel-plugin-add-header-comment-1.0.3.tgz", - "integrity": "sha1-URxJAQYmQNWkgLSsPt1pRBlYUOw=" - }, "node_modules/babel-plugin-dynamic-import-node": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz", @@ -10787,6 +10758,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-badge": { "version": "0.8.8", "resolved": "https://registry.npmjs.org/cordova-plugin-badge/-/cordova-plugin-badge-0.8.8.tgz", @@ -16809,14 +16790,6 @@ "node": ">=4" } }, - "node_modules/install": { - "version": "0.8.9", - "resolved": "https://registry.npmjs.org/install/-/install-0.8.9.tgz", - "integrity": "sha1-n0tcDRhR74cunfheT3Fi1OXc2+0=", - "engines": { - "node": ">= 0.10" - } - }, "node_modules/internal-ip": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz", @@ -22591,12 +22564,6 @@ "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" }, - "node_modules/phonegap-plugin-multidex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/phonegap-plugin-multidex/-/phonegap-plugin-multidex-1.0.0.tgz", - "integrity": "sha512-1wvc3iQOQpEBaQbXgLxA2JUiLSQ2azdF/bF29ghXDiQJWSpQ1BF8gSuqttM8WZoj081Ps8OKL0gYxdDBkFNPqA==", - "deprecated": "This package is deprecated, see https://blog.phonegap.com/update-for-customers-using-phonegap-and-phonegap-build-cc701c77502c" - }, "node_modules/picomatch": { "version": "2.2.2", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz", @@ -24440,6 +24407,18 @@ "node": ">= 0.10" } }, + "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/reflect-metadata": { "version": "0.1.13", "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.13.tgz", @@ -34740,13 +34719,9 @@ } }, "@moodlehq/phonegap-plugin-push": { - "version": "2.2.3-moodle.1", - "resolved": "https://registry.npmjs.org/@moodlehq/phonegap-plugin-push/-/phonegap-plugin-push-2.2.3-moodle.1.tgz", - "integrity": "sha512-LxHz0nPIvxhRgjvj8QRTdhuMtb+NNbFsaAh7JS6q9Ag0lt3LkKrGwCoMr/rTfhfCLj+mrIhyLUv/mo8oPmHeeg==", - "requires": { - "babel-plugin-add-header-comment": "^1.0.3", - "install": "^0.8.2" - } + "version": "2.0.0-moodle.2", + "resolved": "https://registry.npmjs.org/@moodlehq/phonegap-plugin-push/-/phonegap-plugin-push-2.0.0-moodle.2.tgz", + "integrity": "sha512-a1ZR36vOy0Gu0yaX2T+PODlNSQcIUuHMNzPZ/kn4I+cV+hyPwAw1LmdGQDdxfABAGKWCvtzwUyYs1T/NCz2fRQ==" }, "@netflix/nerror": { "version": "1.1.3", @@ -36699,11 +36674,6 @@ } } }, - "babel-plugin-add-header-comment": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/babel-plugin-add-header-comment/-/babel-plugin-add-header-comment-1.0.3.tgz", - "integrity": "sha1-URxJAQYmQNWkgLSsPt1pRBlYUOw=" - }, "babel-plugin-dynamic-import-node": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz", @@ -44033,11 +44003,6 @@ } } }, - "install": { - "version": "0.8.9", - "resolved": "https://registry.npmjs.org/install/-/install-0.8.9.tgz", - "integrity": "sha1-n0tcDRhR74cunfheT3Fi1OXc2+0=" - }, "internal-ip": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz", @@ -48613,11 +48578,6 @@ "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" }, - "phonegap-plugin-multidex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/phonegap-plugin-multidex/-/phonegap-plugin-multidex-1.0.0.tgz", - "integrity": "sha512-1wvc3iQOQpEBaQbXgLxA2JUiLSQ2azdF/bF29ghXDiQJWSpQ1BF8gSuqttM8WZoj081Ps8OKL0gYxdDBkFNPqA==" - }, "picomatch": { "version": "2.2.2", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz", diff --git a/package.json b/package.json index 17fb490cd..ee81a3bc7 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "@moodlehq/cordova-plugin-ionic-webview": "5.0.0-moodle.1", "@moodlehq/cordova-plugin-local-notification": "0.9.0-moodle.2", "@moodlehq/cordova-plugin-qrscanner": "3.0.1-moodle.2", - "@moodlehq/phonegap-plugin-push": "2.2.3-moodle.1", + "@moodlehq/phonegap-plugin-push": "2.0.0-moodle.2", "@ngx-translate/core": "^13.0.0", "@ngx-translate/http-loader": "^6.0.0", "@types/chart.js": "^2.9.31", @@ -122,7 +122,6 @@ "mathjax": "2.7.7", "moment": "^2.29.0", "nl.kingsquare.cordova.background-audio": "^1.0.1", - "phonegap-plugin-multidex": "^1.0.0", "rxjs": "~6.5.5", "ts-md5": "^1.2.7", "tslib": "^2.0.1", @@ -224,8 +223,9 @@ "cordova-plugin-zip": {}, "cordova-sqlite-storage": {}, "@moodlehq/phonegap-plugin-push": { - "ANDROID_SUPPORT_V13_VERSION": "27.+", - "FCM_VERSION": "17.0.+" + "ANDROID_SUPPORT_V13_VERSION": "28.0.0", + "FCM_VERSION": "18.+", + "IOS_FIREBASE_MESSAGING_VERSION": "~> 6.32.2" }, "com-darryncampbell-cordova-plugin-intent": {}, "nl.kingsquare.cordova.background-audio": {},