From c61bc0d2d35aad23d76c185e983d4c5e4f799673 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 3 Apr 2024 12:10:35 +0200
Subject: [PATCH] MOBILE-4563 core: Update cordova-ios and push plugin

---
 package-lock.json | 53 ++++++++++++++++++-----------------------------
 package.json      |  7 ++++---
 2 files changed, 24 insertions(+), 36 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5a8f1e7c1..63473fd58 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -51,7 +51,7 @@
         "@moodlehq/cordova-plugin-qrscanner": "3.0.1-moodle.5",
         "@moodlehq/cordova-plugin-statusbar": "4.0.0-moodle.3",
         "@moodlehq/cordova-plugin-zip": "3.1.0-moodle.1",
-        "@moodlehq/phonegap-plugin-push": "4.0.0-moodle.7",
+        "@moodlehq/phonegap-plugin-push": "4.0.0-moodle.8",
         "@ngx-translate/core": "^15.0.0",
         "@ngx-translate/http-loader": "^8.0.0",
         "@sqlite.org/sqlite-wasm": "^3.45.0-build1",
@@ -62,7 +62,7 @@
         "cordova": "^12.0.0",
         "cordova-android": "^12.0.1",
         "cordova-clipboard": "^1.3.0",
-        "cordova-ios": "^7.0.1",
+        "cordova-ios": "^7.1.0",
         "cordova-plugin-add-swift-support": "^2.0.2",
         "cordova-plugin-androidx-adapter": "^1.1.3",
         "cordova-plugin-badge": "^0.8.9",
@@ -7900,8 +7900,9 @@
       "license": "BSD"
     },
     "node_modules/@moodlehq/phonegap-plugin-push": {
-      "version": "4.0.0-moodle.7",
-      "license": "MIT",
+      "version": "4.0.0-moodle.8",
+      "resolved": "https://registry.npmjs.org/@moodlehq/phonegap-plugin-push/-/phonegap-plugin-push-4.0.0-moodle.8.tgz",
+      "integrity": "sha512-A55vngyJm6NhnM2eBmZe8cXei9vjqFZPDdv0l77V8aQtZA5DmTgoPASXCavA1t5ADWNdLBp/7c+OovBdbrtQGw==",
       "engines": {
         "cordovaDependencies": {
           "1.0.0": {
@@ -12566,19 +12567,17 @@
       }
     },
     "node_modules/cordova-ios": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/cordova-ios/-/cordova-ios-7.0.1.tgz",
-      "integrity": "sha512-WaG3bgOlIQukY8rOhTuA0p2PckBxogSCSOGfWamp4BnaWFoiVm65r4kFqr7PsPguVMbe0t4h4nQTpopxB2LTEQ==",
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/cordova-ios/-/cordova-ios-7.1.0.tgz",
+      "integrity": "sha512-9/vPU+GWRdfxNIkAc9Gq6yejMIgpy59ycP8WyVJJ7HfuPSTBUQT8AS2h5ZJOeN4Y/URyEwxQCrAqSADDBVCESA==",
       "dependencies": {
         "cordova-common": "^5.0.0",
+        "elementtree": "^0.1.7",
         "execa": "^5.1.1",
-        "fs-extra": "^11.1.1",
         "ios-sim": "^8.0.2",
-        "nopt": "^7.1.0",
         "plist": "^3.0.6",
         "semver": "^7.4.0",
-        "unorm": "^1.6.0",
-        "which": "^3.0.0",
+        "which": "^4.0.0",
         "xcode": "^3.0.1",
         "xml-escape": "^1.1.0"
       },
@@ -12586,31 +12585,26 @@
         "node": ">=16.13.0"
       }
     },
-    "node_modules/cordova-ios/node_modules/fs-extra": {
-      "version": "11.2.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
-      "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
-      "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
-      },
+    "node_modules/cordova-ios/node_modules/isexe": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz",
+      "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==",
       "engines": {
-        "node": ">=14.14"
+        "node": ">=16"
       }
     },
     "node_modules/cordova-ios/node_modules/which": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-3.0.1.tgz",
-      "integrity": "sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz",
+      "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==",
       "dependencies": {
-        "isexe": "^2.0.0"
+        "isexe": "^3.1.1"
       },
       "bin": {
         "node-which": "bin/which.js"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^16.13.0 || >=18.0.0"
       }
     },
     "node_modules/cordova-lib": {
@@ -28326,13 +28320,6 @@
         "node": ">= 10.0.0"
       }
     },
-    "node_modules/unorm": {
-      "version": "1.6.0",
-      "license": "MIT or GPL-2.0",
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
     "node_modules/unpipe": {
       "version": "1.0.0",
       "license": "MIT",
diff --git a/package.json b/package.json
index fe5e38680..13ca0a6a2 100644
--- a/package.json
+++ b/package.json
@@ -85,7 +85,7 @@
     "@moodlehq/cordova-plugin-qrscanner": "3.0.1-moodle.5",
     "@moodlehq/cordova-plugin-statusbar": "4.0.0-moodle.3",
     "@moodlehq/cordova-plugin-zip": "3.1.0-moodle.1",
-    "@moodlehq/phonegap-plugin-push": "4.0.0-moodle.7",
+    "@moodlehq/phonegap-plugin-push": "4.0.0-moodle.8",
     "@ngx-translate/core": "^15.0.0",
     "@ngx-translate/http-loader": "^8.0.0",
     "@sqlite.org/sqlite-wasm": "^3.45.0-build1",
@@ -96,7 +96,7 @@
     "cordova": "^12.0.0",
     "cordova-android": "^12.0.1",
     "cordova-clipboard": "^1.3.0",
-    "cordova-ios": "^7.0.1",
+    "cordova-ios": "^7.1.0",
     "cordova-plugin-add-swift-support": "^2.0.2",
     "cordova-plugin-androidx-adapter": "^1.1.3",
     "cordova-plugin-badge": "^0.8.9",
@@ -209,7 +209,8 @@
       "@moodlehq/cordova-plugin-zip": {},
       "@moodlehq/phonegap-plugin-push": {
         "ANDROIDX_CORE_VERSION": "1.6.+",
-        "FCM_VERSION": "23.+"
+        "FCM_VERSION": "23.+",
+        "IOS_FIREBASE_MESSAGING_VERSION": "~> 10.23.0"
       },
       "cordova-clipboard": {},
       "cordova-plugin-androidx-adapter": {},