From b15efe83e035f2e36c92e8a14805fe8e80a00740 Mon Sep 17 00:00:00 2001 From: Andrea Busi Date: Tue, 21 Mar 2023 18:06:18 +0100 Subject: [PATCH] dependency: Rework Firebase configuration, as per official documentation --- .../project.pbxproj | 6 +-- Sources/Earthquake Network/AppDelegate.m | 3 +- Sources/Podfile | 5 +-- Sources/Podfile.lock | 44 +++---------------- 4 files changed, 11 insertions(+), 47 deletions(-) diff --git a/Sources/Earthquake Network.xcodeproj/project.pbxproj b/Sources/Earthquake Network.xcodeproj/project.pbxproj index 6df48cf..07cf3d0 100644 --- a/Sources/Earthquake Network.xcodeproj/project.pbxproj +++ b/Sources/Earthquake Network.xcodeproj/project.pbxproj @@ -1478,6 +1478,7 @@ "${BUILT_PRODUCTS_DIR}/FirebaseMessaging/FirebaseMessaging.framework", "${BUILT_PRODUCTS_DIR}/FirebaseSessions/FirebaseSessions.framework", "${BUILT_PRODUCTS_DIR}/GoogleDataTransport/GoogleDataTransport.framework", + "${BUILT_PRODUCTS_DIR}/GoogleUtilities/GoogleUtilities.framework", "${BUILT_PRODUCTS_DIR}/PromisesObjC/FBLPromises.framework", "${BUILT_PRODUCTS_DIR}/PromisesSwift/Promises.framework", "${BUILT_PRODUCTS_DIR}/Solar/Solar.framework", @@ -1497,6 +1498,7 @@ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseMessaging.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseSessions.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleDataTransport.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleUtilities.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBLPromises.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Promises.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Solar.framework", @@ -2005,8 +2007,6 @@ "-framework", "\"FBLPromises\"", "-framework", - "\"FirebaseAnalytics\"", - "-framework", "\"FirebaseCore\"", "-framework", "\"FirebaseCrashlytics\"", @@ -2115,8 +2115,6 @@ "-framework", "\"FBLPromises\"", "-framework", - "\"FirebaseAnalytics\"", - "-framework", "\"FirebaseCore\"", "-framework", "\"FirebaseCrashlytics\"", diff --git a/Sources/Earthquake Network/AppDelegate.m b/Sources/Earthquake Network/AppDelegate.m index 81e2d7f..4ab4023 100644 --- a/Sources/Earthquake Network/AppDelegate.m +++ b/Sources/Earthquake Network/AppDelegate.m @@ -21,7 +21,8 @@ @import UserNotifications; @import AppTrackingTransparency; -@import Firebase; +@import FirebaseCore; +@import FirebaseMessaging; @import FirebaseCrashlytics; @import GoogleMobileAds; @import FBSDKCoreKit; diff --git a/Sources/Podfile b/Sources/Podfile index 17dbba3..3d8cfee 100644 --- a/Sources/Podfile +++ b/Sources/Podfile @@ -4,9 +4,8 @@ platform :ios, '12.0' use_frameworks! target 'Earthquake Network' do - pod 'Firebase/Core' - pod 'Firebase/Messaging' - pod 'Firebase/Crashlytics' + pod 'FirebaseMessaging' + pod 'FirebaseCrashlytics' pod 'Google-Mobile-Ads-SDK' pod 'FBSDKCoreKit' pod 'DZNEmptyDataSet' diff --git a/Sources/Podfile.lock b/Sources/Podfile.lock index 3c2d974..f218ff5 100644 --- a/Sources/Podfile.lock +++ b/Sources/Podfile.lock @@ -6,24 +6,7 @@ PODS: - FBAEMKit (= 16.0.0) - FBSDKCoreKit_Basics (= 16.0.0) - FBSDKCoreKit_Basics (16.0.0) - - Firebase/Analytics (3.6.0): - - FirebaseAnalytics (= 3.4.2) - - Firebase/Core (3.6.0): - - Firebase/Analytics - - Firebase/CoreOnly (10.6.0): - - FirebaseCore (= 10.6.0) - - Firebase/Crashlytics (10.6.0): - - Firebase/CoreOnly - - FirebaseCrashlytics (~> 10.6.0) - - Firebase/Messaging (10.6.0): - - Firebase/CoreOnly - - FirebaseMessaging (~> 10.6.0) - - FirebaseAnalytics (3.4.2): - - FirebaseInstanceID (~> 1.0) - - GoogleInterchangeUtilities (~> 1.2) - - GoogleSymbolUtilities (~> 1.1) - - GoogleUtilities (~> 1.2) - - FirebaseCore (10.6.0): + - FirebaseCore (10.7.0): - FirebaseCoreInternal (~> 10.0) - GoogleUtilities/Environment (~> 7.8) - GoogleUtilities/Logger (~> 7.8) @@ -44,7 +27,6 @@ PODS: - GoogleUtilities/Environment (~> 7.8) - GoogleUtilities/UserDefaults (~> 7.8) - PromisesObjC (~> 2.1) - - FirebaseInstanceID (1.0.9) - FirebaseMessaging (10.6.0): - FirebaseCore (~> 10.0) - FirebaseInstallations (~> 10.0) @@ -89,12 +71,7 @@ PODS: - GoogleUtilities/Environment (~> 7.7) - nanopb (< 2.30910.0, >= 2.30908.0) - PromisesObjC (< 3.0, >= 1.2) - - GoogleInterchangeUtilities (1.2.2): - - GoogleSymbolUtilities (~> 1.1) - - GoogleSymbolUtilities (1.1.2) - GoogleUserMessagingPlatform (2.0.1) - - GoogleUtilities (1.3.2): - - GoogleSymbolUtilities (~> 1.1) - GoogleUtilities/AppDelegateSwizzler (7.11.0): - GoogleUtilities/Environment - GoogleUtilities/Logger @@ -127,9 +104,8 @@ PODS: DEPENDENCIES: - DZNEmptyDataSet - FBSDKCoreKit - - Firebase/Core - - Firebase/Crashlytics - - Firebase/Messaging + - FirebaseCrashlytics + - FirebaseMessaging - Google-Mobile-Ads-SDK - Solar @@ -139,21 +115,16 @@ SPEC REPOS: - FBAEMKit - FBSDKCoreKit - FBSDKCoreKit_Basics - - Firebase - - FirebaseAnalytics - FirebaseCore - FirebaseCoreExtension - FirebaseCoreInternal - FirebaseCrashlytics - FirebaseInstallations - - FirebaseInstanceID - FirebaseMessaging - FirebaseSessions - Google-Mobile-Ads-SDK - GoogleAppMeasurement - GoogleDataTransport - - GoogleInterchangeUtilities - - GoogleSymbolUtilities - GoogleUserMessagingPlatform - GoogleUtilities - nanopb @@ -166,21 +137,16 @@ SPEC CHECKSUMS: FBAEMKit: 7fb5a0b5caf2ed2900e29c3a17de92ea7193a247 FBSDKCoreKit: 2a77418391aaa5da38ebf57b90b6de42cebcce6a FBSDKCoreKit_Basics: 65c5b3146f38705b95338b54f68ea086bcc468dd - Firebase: f13680471b021937f2230ea8503c7809d8c29806 - FirebaseAnalytics: 3f5358d9104adf159cc8d99b7b501e50099a39ad - FirebaseCore: fa80ad16a62d52f67274b5b88304c3a318bbf9a4 + FirebaseCore: e317665b9d744727a97e623edbbed009320afdd7 FirebaseCoreExtension: f17247ba8c61e4d3c8d136b5e2de3cb4ac6a85b6 FirebaseCoreInternal: 8845798510aae74703467480f71ac613788d0696 FirebaseCrashlytics: ede07e7f433a0a2270112baf2d156b111cfb422d FirebaseInstallations: 59c0e4c7a816a0f76710d83f77e5369b3e45eb96 - FirebaseInstanceID: 2d0518b1378fe9d685ef40cbdd63d2fdc1125339 FirebaseMessaging: fd93783258c53ae5cdb9b41bf0c51606a677f2d5 FirebaseSessions: 34e5c084da010ef3802cbc062b822e513c9e6318 Google-Mobile-Ads-SDK: 4cf7100c99e7cfdd97dd9193cc26a13411aa6891 GoogleAppMeasurement: fe17c92a32207dd5cdd4e8d742767f2da74857f6 GoogleDataTransport: ea169759df570f4e37bdee1623ec32a7e64e67c4 - GoogleInterchangeUtilities: d5bc4d88d5b661ab72f9d70c58d02ca8c27ad1f7 - GoogleSymbolUtilities: 631ee17048aa5e9ab133470d768ea997a5ef9b96 GoogleUserMessagingPlatform: 5f8b30daf181805317b6b985bb51c1ff3beca054 GoogleUtilities: c2bdc4cf2ce786c4d2e6b3bcfd599a25ca78f06f nanopb: b552cce312b6c8484180ef47159bc0f65a1f0431 @@ -188,6 +154,6 @@ SPEC CHECKSUMS: PromisesSwift: cf9eb58666a43bbe007302226e510b16c1e10959 Solar: 2dc6e7cc39186cb0c8228fa08df76fb50c7d8f24 -PODFILE CHECKSUM: 8ea8b5074e46a5d9288cef7a482f8c5bebe2d6e2 +PODFILE CHECKSUM: d1702281e78deff520792b6eb9ce54ffd0e034c5 COCOAPODS: 1.11.3