Merge branch 'hotfix/4.0.12'

datauy · Jan 26, 2023 · 61391fa · 61391fa
2 parents 16af809 + 5551ee0
commit 61391fa
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 20 deletions.
diff --git a/package.json b/package.json
@@ -21,13 +21,14 @@
     "@angular/pwa": "^0.901.15",
     "@angular/router": "~8.2.14",
     "@asymmetrik/ngx-leaflet": "^6.0.1",
+    "@awesome-cordova-plugins/core": "^6.3.0",
+    "@awesome-cordova-plugins/firebase-x": "^5.46.0",
     "@babel/compat-data": "^7.13.15",
     "@babel/plugin-proposal-numeric-separator": "^7.12.13",
     "@capacitor/android": "^1.5.3",
     "@capacitor/core": "1.5.2",
     "@ionic-native/core": "^5.32.0",
     "@ionic-native/file": "^5.32.0",
-    "@ionic-native/firebase-x": "^5.32.0",
     "@ionic-native/geolocation": "^5.32.0",
     "@ionic-native/in-app-browser": "^5.36.0",
     "@ionic-native/keyboard": "^5.32.0",
@@ -36,6 +37,7 @@
     "@ionic-native/status-bar": "^5.32.0",
     "@ionic/angular": "^5.6.4",
     "@ionic/storage": "^2.2.0",
+    "@types/cordova": "^11.0.0",
     "com.telerik.plugins.nativepagetransitions": "^0.7.0",
     "cordova-ios": "6.1.1",
     "cordova-plugin-camera": "^4.1.0",
@@ -71,10 +73,8 @@
     "@types/node": "~8.9.4",
     "codelyzer": "^5.0.0",
     "cordova-android": "^10.1.2",
-    "cordova-plugin-androidx": "^2.0.0",
-    "cordova-plugin-androidx-adapter": "^1.1.3",
     "cordova-plugin-device": "^2.0.2",
-    "cordova-plugin-firebasex": "^10.2.0",
+    "cordova-plugin-firebasex": "^16.0.0",
     "cordova-plugin-inappbrowser": "^4.1.0",
     "cordova-plugin-splashscreen": "^5.0.4",
     "cordova-plugin-statusbar": "^2.4.2",
@@ -102,25 +102,32 @@
         "GPS_REQUIRED": "true"
       },
       "cordova-plugin-ionic-webview": {},
+      "cordova-plugin-inappbrowser": {},
       "cordova-plugin-firebasex": {
         "FIREBASE_ANALYTICS_COLLECTION_ENABLED": "true",
         "FIREBASE_PERFORMANCE_COLLECTION_ENABLED": "true",
         "FIREBASE_CRASHLYTICS_COLLECTION_ENABLED": "true",
+        "FIREBASE_FCM_AUTOINIT_ENABLED": "true",
         "ANDROID_ICON_ACCENT": "#FF00FFFF",
-        "ANDROID_PLAY_SERVICES_AUTH_VERSION": "18.0.0",
-        "ANDROID_FIREBASE_ANALYTICS_VERSION": "17.4.3",
-        "ANDROID_FIREBASE_MESSAGING_VERSION": "20.2.1",
-        "ANDROID_FIREBASE_CONFIG_VERSION": "19.1.4",
-        "ANDROID_FIREBASE_PERF_VERSION": "19.0.7",
-        "ANDROID_FIREBASE_AUTH_VERSION": "19.3.1",
-        "ANDROID_FIREBASE_FIRESTORE_VERSION": "21.4.3",
-        "ANDROID_FIREBASE_CRASHLYTICS_VERSION": "17.0.1",
-        "ANDROID_FIREBASE_CRASHLYTICS_NDK_VERSION": "17.0.1",
-        "ANDROID_GSON_VERSION": "2.8.6",
-        "ANDROID_PLAY_SERVICES_TAGMANAGER_VERSION": "17.0.0",
-        "ANDROID_FIREBASE_INAPPMESSAGING_VERSION": "19.0.7"
-      },
-      "cordova-plugin-inappbrowser": {}
+        "ANDROID_FIREBASE_PERFORMANCE_MONITORING": "false",
+        "ANDROID_PLAY_SERVICES_TAGMANAGER_VERSION": "18.0.2",
+        "ANDROID_PLAY_SERVICES_AUTH_VERSION": "20.4.0",
+        "ANDROID_FIREBASE_ANALYTICS_VERSION": "21.2.0",
+        "ANDROID_FIREBASE_MESSAGING_VERSION": "23.1.0",
+        "ANDROID_FIREBASE_CONFIG_VERSION": "21.2.0",
+        "ANDROID_FIREBASE_PERF_VERSION": "20.3.0",
+        "ANDROID_FIREBASE_AUTH_VERSION": "21.1.0",
+        "ANDROID_FIREBASE_INAPPMESSAGING_VERSION": "20.2.0",
+        "ANDROID_FIREBASE_FIRESTORE_VERSION": "24.4.1",
+        "ANDROID_FIREBASE_FUNCTIONS_VERSION": "20.2.1",
+        "ANDROID_FIREBASE_IID_VERSION": "21.1.0",
+        "ANDROID_FIREBASE_INSTALLATIONS_VERSION": "17.1.0",
+        "ANDROID_FIREBASE_CRASHLYTICS_VERSION": "18.3.2",
+        "ANDROID_FIREBASE_CRASHLYTICS_NDK_VERSION": "18.3.2",
+        "ANDROID_GSON_VERSION": "2.9.0",
+        "ANDROID_FIREBASE_PERF_GRADLE_PLUGIN_VERSION": "1.4.2",
+        "ANDROID_GRPC_OKHTTP": "1.46.0"
+      }
     },
     "platforms": [
       "ios",

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
@@ -25,7 +25,7 @@ import { File } from '@ionic-native/file/ngx';
 import { navPage } from './components/animations/';
 
 import { IonicStorageModule } from '@ionic/storage';
-import { FirebaseX } from "@ionic-native/firebase-x/ngx";
+import { FirebaseX } from "@awesome-cordova-plugins//firebase-x/ngx";
 
 import { MapaPageModule } from 'src/app/pages/mapa/mapa.module';
 /*

diff --git a/src/app/services/notifications.service.ts b/src/app/services/notifications.service.ts
@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { Platform, NavController } from '@ionic/angular';
 
-import { FirebaseX } from "@ionic-native/firebase-x/ngx";
+import { FirebaseX } from "@awesome-cordova-plugins/firebase-x/ngx";
 import { Message } from "src/app/models/message.model";
 
 @Injectable({