release: Increase version for release

Resolves: https://gitlab.steamware.net/eqn/eqn.ios/-/issues/46

CHANGELOG.md

@@ -1,5 +1,35 @@
 # Changelog
 
+## Versione 5.0.3
+
+### Build (89)
+- Corretto problema con ultima posizione non salvata in app
+- Forzato aggiornamento Firebase
+- Corretti metodi deprecati in salvataggio dati
+- Corretti comportamento filtri con iOS 15
+- Slider con valori a step
+
+## Versione 5.0.2
+
+### Build (88)
+- Corretto errato salvataggio raggio sismi forti in allerte tempo reale
+
+## Versione 5.0.1
+
+### Build (87)
+- Corretto problema con slider in impostazioni
+
+## Versione 5.0
+
+### Build (86)
+- Corretto problema layout in schede sismi
+
+### Build (85)
+- Nuova icona
+- Nascosta sezione 'pro'
+- Aggiornamento ad Xcode 13
+- Disabilitati ads
+
 ## Versione 4.2
 ### Build (84)
 - Corretti errori in nuovi sviluppi

Sources/Earthquake Network.xcodeproj/project.pbxproj

@@ -1451,9 +1451,9 @@
 				"${BUILT_PRODUCTS_DIR}/DZNEmptyDataSet/DZNEmptyDataSet.framework",
 				"${BUILT_PRODUCTS_DIR}/FirebaseCore/FirebaseCore.framework",
 				"${BUILT_PRODUCTS_DIR}/FirebaseCoreDiagnostics/FirebaseCoreDiagnostics.framework",
+				"${BUILT_PRODUCTS_DIR}/FirebaseCoreInternal/FirebaseCoreInternal.framework",
 				"${BUILT_PRODUCTS_DIR}/FirebaseCrashlytics/FirebaseCrashlytics.framework",
 				"${BUILT_PRODUCTS_DIR}/FirebaseInstallations/FirebaseInstallations.framework",
-				"${BUILT_PRODUCTS_DIR}/FirebaseInstanceID/FirebaseInstanceID.framework",
 				"${BUILT_PRODUCTS_DIR}/FirebaseMessaging/FirebaseMessaging.framework",
 				"${BUILT_PRODUCTS_DIR}/GoogleDataTransport/GoogleDataTransport.framework",
 				"${BUILT_PRODUCTS_DIR}/GoogleUtilities/GoogleUtilities.framework",
@@ -1466,9 +1466,9 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DZNEmptyDataSet.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCore.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCoreDiagnostics.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCoreInternal.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCrashlytics.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseInstallations.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseInstanceID.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseMessaging.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleDataTransport.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleUtilities.framework",
@@ -1738,12 +1738,12 @@
 				CODE_SIGN_ENTITLEMENTS = EQNNotificationService/EQNNotificationService.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 84;
+				CURRENT_PROJECT_VERSION = 89;
 				DEVELOPMENT_TEAM = WJA4MR4CPC;
 				INFOPLIST_FILE = EQNNotificationService/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
-				MARKETING_VERSION = 4.2.0;
+				MARKETING_VERSION = 5.0.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.finazzi.distquake.notificationservice;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "EQNetwork Extension Service - Development";
@@ -1762,12 +1762,12 @@
 				CODE_SIGN_ENTITLEMENTS = EQNNotificationService/EQNNotificationService.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 84;
+				CURRENT_PROJECT_VERSION = 89;
 				DEVELOPMENT_TEAM = WJA4MR4CPC;
 				INFOPLIST_FILE = EQNNotificationService/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
-				MARKETING_VERSION = 4.2.0;
+				MARKETING_VERSION = 5.0.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.finazzi.distquake.notificationservice;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "EQNetwork Extension Service - AppStore";
@@ -1811,9 +1811,11 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = dwarf;
+				DEVELOPMENT_TEAM = WJA4MR4CPC;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -1823,6 +1825,7 @@
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
+					"ADS_ENABLED=0",
 				);
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
@@ -1870,13 +1873,16 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
+				CODE_SIGN_IDENTITY = "Apple Distribution";
+				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				DEVELOPMENT_TEAM = WJA4MR4CPC;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = "ADS_ENABLED=0";
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
@@ -1899,16 +1905,16 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = "Earthquake Network/Earthquake Network.entitlements";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development";
+				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 84;
+				CURRENT_PROJECT_VERSION = 89;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = WJA4MR4CPC;
 				GCC_PREFIX_HEADER = "Earthquake Network/Earthquake Network-Prefix.pch";
 				INFOPLIST_FILE = "Earthquake Network/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 4.2.0;
+				MARKETING_VERSION = 5.0.3;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1944,8 +1950,6 @@
 					"-framework",
 					"\"FirebaseInstallations\"",
 					"-framework",
-					"\"FirebaseInstanceID\"",
-					"-framework",
 					"\"FirebaseMessaging\"",
 					"-framework",
 					"\"Foundation\"",
@@ -2011,15 +2015,15 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = "Earthquake Network/Earthquake Network.entitlements";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Distribution";
+				CODE_SIGN_IDENTITY = "Apple Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 84;
+				CURRENT_PROJECT_VERSION = 89;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = WJA4MR4CPC;
 				GCC_PREFIX_HEADER = "Earthquake Network/Earthquake Network-Prefix.pch";
 				INFOPLIST_FILE = "Earthquake Network/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 4.2.0;
+				MARKETING_VERSION = 5.0.3;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -2055,8 +2059,6 @@
 					"-framework",
 					"\"FirebaseInstallations\"",
 					"-framework",
-					"\"FirebaseInstanceID\"",
-					"-framework",
 					"\"FirebaseMessaging\"",
 					"-framework",
 					"\"Foundation\"",
@@ -2120,12 +2122,12 @@
 				CODE_SIGN_ENTITLEMENTS = EQNNotificationContent/EQNNotificationContent.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 84;
+				CURRENT_PROJECT_VERSION = 89;
 				DEVELOPMENT_TEAM = WJA4MR4CPC;
 				INFOPLIST_FILE = EQNNotificationContent/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
-				MARKETING_VERSION = 4.2.0;
+				MARKETING_VERSION = 5.0.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.finazzi.distquake.notificationcontent;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "EQNetwork Extension Content - Development";
@@ -2144,12 +2146,12 @@
 				CODE_SIGN_ENTITLEMENTS = EQNNotificationContent/EQNNotificationContent.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 84;
+				CURRENT_PROJECT_VERSION = 89;
 				DEVELOPMENT_TEAM = WJA4MR4CPC;
 				INFOPLIST_FILE = EQNNotificationContent/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
-				MARKETING_VERSION = 4.2.0;
+				MARKETING_VERSION = 5.0.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.finazzi.distquake.notificationcontent;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "EQNetwork Extension Content - AppStore";

Sources/Earthquake Network/AppDelegate.m

@@ -36,10 +36,12 @@
     // Test ads on specific devices
     GADMobileAds.sharedInstance.requestConfiguration.testDeviceIdentifiers = @[ @"81392581e1790d4fbc6eff919815088d" ];
 #endif
+#if ADS_ENABLED
     // start 3rd party SDKs and custom managers
     [GADMobileAds.sharedInstance startWithCompletionHandler:^(GADInitializationStatus *status) {
         NSLog(@"[AppDelegate] GADMobileAds started with status: %@", status);
     }];
+#endif
     
     [EQNUser defaultUser];
     [EQNManager defaultManager];
@@ -122,7 +124,10 @@
 - (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken
 {
     NSString *token = [self stringWithDeviceToken:deviceToken];
+    NSLog(@"[DEBUG] push token: %@", token);
     [[NSUserDefaults standardUserDefaults] setObject:token forKey:EQNUserDefaultPushToken];
+    
+    FIRMessaging.messaging.APNSToken = deviceToken;
 }
 
 - (NSString *)stringWithDeviceToken:(NSData *)deviceToken

Sources/Earthquake Network/Base.lproj/LaunchScreen.storyboard

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -24,12 +24,12 @@
                                 </constraints>
                             </imageView>
                         </subviews>
-                        <color key="backgroundColor" red="0.50766238939999997" green="0.75272958739999996" blue="0.98132258650000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <constraints>
                             <constraint firstItem="Dzo-29-2FJ" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="LUF-7j-Kmc"/>
                             <constraint firstItem="Dzo-29-2FJ" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="MuU-xU-Ic2"/>
                         </constraints>
-                        <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
                     </view>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -38,6 +38,6 @@
         </scene>
     </scenes>
     <resources>
-        <image name="eq_icon" width="166" height="166"/>
+        <image name="eq_icon" width="200" height="200"/>
     </resources>
 </document>

Sources/Earthquake Network/Controllers/Alerts/AllerteViewController.m

@@ -16,7 +16,6 @@
 @import StoreKit;
 @import SafariServices;
 @import CoreLocation;
-@import GoogleMobileAds;
 
 @interface AllerteViewController () <UITableViewDelegate, UITableViewDataSource>
 @property (weak, nonatomic) IBOutlet UIBarButtonItem *expandeCollapseButton;
@@ -37,7 +36,7 @@ typedef NS_ENUM(NSInteger, AllerteTableRow) {
     AllerteTableRowAllertePassate,
     AllerteTableRowReteSmartphone,
     AllerteTableRowServizioPriorita,
-    AllerteTableRowVersionePro,
+    AllerteTableRowVersionePro, // non più visualizzata con passaggio dell'app a pagamento
     AllerteTableRowDatiPosizione
 };
 
@@ -140,10 +139,7 @@ typedef NS_ENUM(NSInteger, AllerteTableRow) {
     if (CLLocationManager.authorizationStatus != kCLAuthorizationStatusAuthorizedAlways) {
         [self.tableItems addObject:@(AllerteTableRowLocationPermission)];
     }
-    // pro cell is visible only if user hasn't already bought the app
-    if ([EQNPurchaseUtility isProVersionEnabled] == NO) {
-        [self.tableItems addObject:@(AllerteTableRowVersionePro)];
-    }
+    
     // location data visible only if last position is known
     if ([EQNUser defaultUser].lastPosition != nil && showAllCards) {
         [self.tableItems addObject:@(AllerteTableRowDatiPosizione)];

Sources/Earthquake Network/Controllers/EQNBaseViewController.m

@@ -44,7 +44,11 @@
 {
     [super viewWillAppear:animated];
     
+#if ADS_ENABLED
     [self handleAdBanner];
+#else
+    [self hideAdBanner];
+#endif
 }
 
 #pragma mark - Public

Sources/Earthquake Network/Controllers/Seismic Networks/Cells/SeismicNetworkTableViewCell.swift

@@ -10,7 +10,7 @@ import UIKit
 import MapKit
 import CoreLocation
 
-protocol SeismicNetworkTableViewCellDelegate: class {
+protocol SeismicNetworkTableViewCellDelegate: AnyObject {
     func seismicNetworkCellDidTapShare(_ cell: SeismicNetworkTableViewCell)
     func seismicNetworkCellDidTapMap(_ cell: SeismicNetworkTableViewCell)
     func seismicNetworkCellDidTapMapDetail(_ cell: SeismicNetworkTableViewCell)
@@ -90,7 +90,7 @@ class SeismicNetworkTableViewCell: UITableViewCell {
         let label = UILabel()
         label.translatesAutoresizingMaskIntoConstraints = false
         label.font = UIFont.preferredFont(for: .title2, weight: .semibold)
-        label.numberOfLines = 2
+        label.numberOfLines = 3
         return label
     }()
     
@@ -256,7 +256,9 @@ class SeismicNetworkTableViewCell: UITableViewCell {
         titleImageView.widthAnchor.constraint(equalTo: titleImageView.heightAnchor).isActive = true
         networkLabel.heightAnchor.constraint(equalToConstant: 34.0).isActive = true
         networkLabel.setContentHuggingPriority(.init(800), for: .horizontal)
+        networkLabel.setContentCompressionResistancePriority(.defaultHigh, for: .horizontal)
         placeLabel.setContentHuggingPriority(.init(200), for: .horizontal)
+        placeLabel.setContentCompressionResistancePriority(.defaultLow, for: .horizontal)
         shareButton.widthAnchor.constraint(equalToConstant: titleComponentsHeight).isActive = true
         shareButton.widthAnchor.constraint(equalTo: shareButton.heightAnchor).isActive = true
         

Sources/Earthquake Network/Controllers/Seismic Networks/Filters/SeismicFiltersViewController.swift

@@ -8,7 +8,7 @@
 
 import UIKit
 
-@objc protocol SeismicFiltersViewControllerDelegate: class {
+protocol SeismicFiltersViewControllerDelegate: AnyObject {
     func seismicFiltersControllerDidUpdateFilters(_ controller: SeismicFiltersViewController)
 }
 
@@ -24,7 +24,7 @@ class SeismicFiltersViewController: UIViewController, UITableViewDelegate, UITab
         case modificaImpostazioni
     }
     
-    @objc weak var delegate: SeismicFiltersViewControllerDelegate?
+    weak var delegate: SeismicFiltersViewControllerDelegate?
     /// Tells if delegate needs to redownload data when filter is dismissed
     @objc private(set) var needsDataUpdate = false
     
@@ -66,7 +66,8 @@ class SeismicFiltersViewController: UIViewController, UITableViewDelegate, UITab
         super.viewDidLoad()
 
         setupUI()
-        updateUI()
+        loadDataSource()
+        tableView.reloadData()
     }
     
     private func setupUI() {
@@ -83,7 +84,7 @@ class SeismicFiltersViewController: UIViewController, UITableViewDelegate, UITab
         closeButton.setLocalizedTitle(key: "official_close", uppercased: false)
     }
     
-    private func updateUI() {
+    private func loadDataSource() {
         currentMagnitudoMinima = EQNData.magitudoDebole(for: EQNSeismic.shared.magnitudoMinima)
         if initialMagnitudoMinima == nil {
             initialMagnitudoMinima = currentMagnitudoMinima
@@ -97,7 +98,6 @@ class SeismicFiltersViewController: UIViewController, UITableViewDelegate, UITab
             initialQualsiasiMagnitudo = currentSismiQualsiasiMagnitudo
         }
         currentModificaImpostazioni = EQNSeismic.shared.modificaImpostazioniAbilitato
-        tableView.reloadData()
     }
 
     // MARK: - Table view delegate and data source
@@ -111,7 +111,7 @@ class SeismicFiltersViewController: UIViewController, UITableViewDelegate, UITab
         
         switch setting.type {
         case .slider:
-            let cell = tableView.dequeueReusableCell(withIdentifier: SettingSliderTableViewCell.Identifier, for: indexPath) as! SettingSliderTableViewCell
+            let cell = SettingSliderTableViewCell(style: .default, reuseIdentifier: nil)
             cell.titleLabel.text = setting.displayTitle
             
             if indexPath.row == RowIdentifier.magnitudoMinima.rawValue {
@@ -120,7 +120,6 @@ class SeismicFiltersViewController: UIViewController, UITableViewDelegate, UITab
                     currentMagnitudoMinima = value
                     EQNSeismic.shared.magnitudoMinima = value.value
                     EQNSeismic.shared.saveFilters()
-                    updateUI()
                 }
                 cell.dragEnded = { [unowned self] in
                     showWarningAlertIfNeeded(for: currentMagnitudoMinima)
@@ -131,7 +130,6 @@ class SeismicFiltersViewController: UIViewController, UITableViewDelegate, UITab
                     currentDistanzaMassima = value
                     EQNSeismic.shared.distanzaMassima = value.value
                     EQNSeismic.shared.saveFilters()
-                    updateUI()
                 }
             } else if indexPath.row == RowIdentifier.periodoTemporale.rawValue {
                 cell.configureSlider(with: dataSourcePeriodoTemporale, current: currentPeriodoTemporale)
@@ -139,7 +137,6 @@ class SeismicFiltersViewController: UIViewController, UITableViewDelegate, UITab
                     currentPeriodoTemporale = value
                     EQNSeismic.shared.periodoTemporale = value.value
                     EQNSeismic.shared.saveFilters()
-                    updateUI()
                 }
             } else if indexPath.row == RowIdentifier.sismiFortiDistanza.rawValue {
                 cell.isDisabled = !currentSismiFortiAbilitati
@@ -148,13 +145,12 @@ class SeismicFiltersViewController: UIViewController, UITableViewDelegate, UITab
                     currentSismiFortiDistanza = value
                     EQNSeismic.shared.sismiFortiMagnitudo = value.value
                     EQNSeismic.shared.saveFilters()
-                    updateUI()
                 }
             }
             
             return cell
         case .enable:
-            let cell = tableView.dequeueReusableCell(withIdentifier: SettingEnableTableViewCell.Identifier, for: indexPath) as! SettingEnableTableViewCell
+            let cell = SettingEnableTableViewCell(style: .default, reuseIdentifier: nil)
             cell.titleLabel.text = setting.displayTitle
             cell.detailTextLabel?.text = setting.subtitle
             
@@ -164,7 +160,9 @@ class SeismicFiltersViewController: UIViewController, UITableViewDelegate, UITab
                     currentSismiFortiAbilitati = value
                     EQNSeismic.shared.sismiFortiAbilitati = value
                     EQNSeismic.shared.saveFilters()
-                    updateUI()
+                    
+                    loadDataSource()
+                    tableView.reloadData()
                 }
             } else if indexPath.row == RowIdentifier.sismiQualsiasiMagnitudo.rawValue {
                 cell.toggleSwitch.isOn = currentSismiQualsiasiMagnitudo
@@ -172,7 +170,6 @@ class SeismicFiltersViewController: UIViewController, UITableViewDelegate, UITab
                     currentSismiQualsiasiMagnitudo = value
                     EQNSeismic.shared.sismiQualsiasiAbilitati = value
                     EQNSeismic.shared.saveFilters()
-                    updateUI()
                 }
             } else if indexPath.row == RowIdentifier.modificaImpostazioni.rawValue {
                 cell.toggleSwitch.isOn = currentModificaImpostazioni
@@ -180,7 +177,6 @@ class SeismicFiltersViewController: UIViewController, UITableViewDelegate, UITab
                     currentModificaImpostazioni = value
                     EQNSeismic.shared.modificaImpostazioniAbilitato = value
                     EQNSeismic.shared.saveFilters()
-                    updateUI()
                 }
             }
             

Sources/Earthquake Network/Controllers/Seismic Networks/SeismicCardSettingsViewController.swift

@@ -8,7 +8,7 @@
 
 import UIKit
 
-protocol SeismicCardSettingsViewControllerDelegate: class {
+protocol SeismicCardSettingsViewControllerDelegate: AnyObject {
     func seismicCardSettingsDidComplete(_ controller: SeismicCardSettingsViewController)
 }
 

Sources/Earthquake Network/Controllers/Seismic Networks/SeismicNetworksMapDetailViewController.swift

@@ -9,7 +9,7 @@
 import UIKit
 import MapKit
 
-protocol SeismicNetworksMapDetailViewControllerDelegate: class {
+protocol SeismicNetworksMapDetailViewControllerDelegate: AnyObject {
     func seismicNetworksMapDetailControllerWillUpdateData(_ controller: SeismicNetworksMapDetailViewController, needsDataUpdate: Bool)
 }
 

Sources/Earthquake Network/Controllers/Seismic Networks/SeismicNetworksViewController.swift

@@ -155,10 +155,12 @@ class SeismicNetworksViewController: UIViewController, UITableViewDelegate, UITa
         let filteredSeismics = EQNSeismic.shared.filterSeismicList(allSeismics ?? [])
         rows = filteredSeismics.map { .seismic($0) }
         
+    #if ADS_ENABLED
         // if is not a pro user, show an advertise
         if !EQNPurchaseUtility.isProVersionEnabled() {
             loadAd()
         }
+    #endif
         
         // if a map detail is presented, update its data
         if let mapController = currentMapController {

Sources/Earthquake Network/Controllers/Seismic Networks/SeismicSettingsNetworksViewController.swift

@@ -9,13 +9,13 @@
 import UIKit
 
 
-@objc protocol SeismicSettingsNetworksViewControllerDelegate: class {
+protocol SeismicSettingsNetworksViewControllerDelegate: AnyObject {
     func seismicSettingsNetworksControllerDidComplete(_ controller: SeismicSettingsNetworksViewController)
 }
 
 class SeismicSettingsNetworksViewController: UITableViewController {
 
-    @objc weak var delegate: SeismicSettingsNetworksViewControllerDelegate?
+    weak var delegate: SeismicSettingsNetworksViewControllerDelegate?
     
     // MARK: - Private
     

Sources/Earthquake Network/Controllers/Seismic Networks/SeismicSettingsViewController.swift

@@ -9,7 +9,7 @@
 import Foundation
 
 
-@objc protocol SeismicSettingsViewControllerDelegate: class {
+protocol SeismicSettingsViewControllerDelegate: AnyObject {
     func seismicSettingsControllerDidComplete(_ controller: SeismicSettingsViewController)
     func seismicSettingsControllerWillOpenProviders(_ controller: SeismicSettingsViewController)
 }
@@ -17,7 +17,7 @@ import Foundation
 
 class SeismicSettingsViewController: UIViewController {
     
-    @objc weak var delegate: SeismicSettingsViewControllerDelegate?
+    weak var delegate: SeismicSettingsViewControllerDelegate?
     
     // MARK: - Private
     

Sources/Earthquake Network/Controllers/Settings/Cells/SettingDateTableViewCell.swift

@@ -89,8 +89,6 @@ class SettingDateTableViewCell: UITableViewCell {
     // MARK: - Private
     
     private func setupUI() {
-        translatesAutoresizingMaskIntoConstraints = false
-        
         stackView.addArrangedSubview(titleLabel)
         stackView.addArrangedSubview(valuesLabel)
         

Sources/Earthquake Network/Controllers/Settings/Cells/SettingEnableTableViewCell.swift

@@ -62,7 +62,6 @@ class SettingEnableTableViewCell: UITableViewCell {
     
     private func setupUI() {
         selectionStyle = .none
-        translatesAutoresizingMaskIntoConstraints = false
 
         let stackView = UIStackView()
         stackView.translatesAutoresizingMaskIntoConstraints = false

Sources/Earthquake Network/Controllers/Settings/Cells/SettingMultivaluesTableViewCell.swift

@@ -54,8 +54,6 @@ class SettingMultivaluesTableViewCell: UITableViewCell {
     // MARK: - Private
     
     private func setupUI() {
-        translatesAutoresizingMaskIntoConstraints = false
-
         let stackView = UIStackView()
         stackView.translatesAutoresizingMaskIntoConstraints = false
         stackView.axis = .vertical

Sources/Earthquake Network/Controllers/Settings/Cells/SettingSegmentedTableViewCell.swift

@@ -55,7 +55,6 @@ class SettingSegmentedTableViewCell: UITableViewCell {
     
     private func setupUI() {
         selectionStyle = .none
-        translatesAutoresizingMaskIntoConstraints = false
 
         let stackView = UIStackView()
         stackView.translatesAutoresizingMaskIntoConstraints = false

Sources/Earthquake Network/Controllers/Settings/Cells/SettingSliderTableViewCell.swift

@@ -66,7 +66,6 @@ class SettingSliderTableViewCell: UITableViewCell {
     
     private func setupUI() {
         selectionStyle = .none
-        translatesAutoresizingMaskIntoConstraints = false
 
         let stackView = UIStackView()
         stackView.translatesAutoresizingMaskIntoConstraints = false
@@ -99,6 +98,12 @@ class SettingSliderTableViewCell: UITableViewCell {
         let index = Int(sender.value)
         let item = items[index]
         
+        // make slider with step values
+        let step: Float = 1
+        let roundedValue = round(sender.value / step) * step
+        sender.value = roundedValue
+        
+        // update value
         valueLabel.text = item.display
         valueChanged?(item)
     }

Sources/Earthquake Network/Controllers/Settings/SettingsRealTimeAlertsViewController.m

@@ -75,7 +75,8 @@ typedef NS_ENUM(NSInteger, RowIdentifier) {
     self.dataSourceSismi = [EQNData seismicToNotify];
     self.dataSourceRaggioSisma = [EQNData raggioSismi];
     
-    [self updateUI];
+    [self loadDataSource];
+    [self.tableView reloadData];
 }
 
 #pragma mark - Private
@@ -94,7 +95,7 @@ typedef NS_ENUM(NSInteger, RowIdentifier) {
     [self.tableView registerClass:[SettingDateTableViewCell class] forCellReuseIdentifier:SettingDateTableViewCell.Identifier];
 }
 
-- (void)updateUI
+- (void)loadDataSource
 {
     self.notificationEnabled = [EQNAllertaSismica sharedInstance].isAbilitato;
     self.criticalAlertsEnabled = [EQNAllertaSismica sharedInstance].isCriticalAlertsEnabled;
@@ -120,8 +121,6 @@ typedef NS_ENUM(NSInteger, RowIdentifier) {
     self.currentEndTime = endTime;
     
     [[EQNAllertaSismica sharedInstance] saveUserInfo];
-    
-    [self.tableView reloadData];
 }
 
 
@@ -262,35 +261,40 @@ typedef NS_ENUM(NSInteger, RowIdentifier) {
 {
     [EQNAllertaSismica sharedInstance].sismiDaNotificare = seismic.value;
     [[EQNAllertaSismica sharedInstance] saveUserInfo];
-    [self updateUI];
+    
+    [self loadDataSource];
 }
 
 - (void)updateLowSeismicRadius:(EQNGenericValue *)radius
 {
     [EQNAllertaSismica sharedInstance].raggioSismiLievi = radius.value;
     [[EQNAllertaSismica sharedInstance] saveUserInfo];
-    [self updateUI];
+    
+    [self loadDataSource];
 }
 
 - (void)updateStrongSeismicRadius:(EQNGenericValue *)radius
 {
     [EQNAllertaSismica sharedInstance].raggioSismiForti = radius.value;
     [[EQNAllertaSismica sharedInstance] saveUserInfo];
-    [self updateUI];
+    
+    [self loadDataSource];
 }
 
 - (void)updateStartTime:(NSDate *)date
 {
     [EQNAllertaSismica sharedInstance].oraioInizio = date;
     [[EQNAllertaSismica sharedInstance] saveUserInfo];
-    [self updateUI];
+    
+    [self loadDataSource];
 }
 
 - (void)updateEndTime:(NSDate *)date
 {
     [EQNAllertaSismica sharedInstance].orarioFine = date;
     [[EQNAllertaSismica sharedInstance] saveUserInfo];
-    [self updateUI];
+    
+    [self loadDataSource];
 }
 
 - (void)askForCriticalAlertsPermission

Sources/Earthquake Network/Controllers/Settings/SettingsSeismicNetworkAlertsViewController.m

@@ -62,14 +62,16 @@ typedef NS_ENUM(NSInteger, RowIdentifier) {
     self.dataSourceRaggioSisma = [EQNData raggioSismi];
     self.dataSourceMagnitudoForti = [EQNData magitudoForti];
     
-    [self updateUI];
+    [self loadDataSource];
+    [self.tableView reloadData];
 }
 
 - (void)viewWillAppear:(BOOL)animated
 {
     [super viewWillAppear:animated];
     
-    [self updateUI];    
+    [self loadDataSource];
+    [self.tableView reloadData];
 }
 
 #pragma mark - Private
@@ -86,7 +88,7 @@ typedef NS_ENUM(NSInteger, RowIdentifier) {
     [self.tableView registerClass:[SettingMultivaluesTableViewCell class] forCellReuseIdentifier:SettingMultivaluesTableViewCell.Identifier];
 }
 
-- (void)updateUI
+- (void)loadDataSource
 {
     self.notificationEnabled = [EQNNotificheReteSismiche sharedInstance].isAbilitato;
     self.notificationNearEarthquakeEnabled = [EQNNotificheReteSismiche sharedInstance].isAbilitaVicini;
@@ -110,8 +112,6 @@ typedef NS_ENUM(NSInteger, RowIdentifier) {
     }
     
     [[EQNNotificheReteSismiche sharedInstance] saveUserInfo];
-    
-    [self.tableView reloadData];
 }
 
 
@@ -229,7 +229,7 @@ typedef NS_ENUM(NSInteger, RowIdentifier) {
     [EQNNotificheReteSismiche sharedInstance].distanzaPosizione = radius.value;
     [[EQNNotificheReteSismiche sharedInstance] saveUserInfo];
     
-    [self updateUI];
+    [self loadDataSource];
 }
 
 - (void)updateSeismicEnergy:(EQNGenericValue *)energy
@@ -237,7 +237,7 @@ typedef NS_ENUM(NSInteger, RowIdentifier) {
     [EQNNotificheReteSismiche sharedInstance].energiaSisma = energy.value;
     [[EQNNotificheReteSismiche sharedInstance] saveUserInfo];
     
-    [self updateUI];
+    [self loadDataSource];
 }
 
 - (void)updateStrongEarthquakeEnergy:(EQNGenericValue *)energy
@@ -245,7 +245,7 @@ typedef NS_ENUM(NSInteger, RowIdentifier) {
     [EQNNotificheReteSismiche sharedInstance].energiaTerremotiForti = energy.value;
     [[EQNNotificheReteSismiche sharedInstance] saveUserInfo];
     
-    [self updateUI];
+    [self loadDataSource];
 }
 
 - (NSString *)stringOfSelectedNetworks

Sources/Earthquake Network/Models/Commands/EQNCommandProtocol.swift

@@ -10,6 +10,6 @@ import Foundation
 
 
 @objc
-protocol EQNCommandProtocol: class {
+protocol EQNCommandProtocol: AnyObject {
     @objc func execute()
 }

Sources/Earthquake Network/Models/EQNUser.m

@@ -130,14 +130,11 @@
 
 - (void)inviaPosizioneServer
 {
-    NSLog(@"URLPosizione %@", [EQNGeneratoreURLServer urlPosizione]);
-
     [[ServerRequest defaultServerConnectionSingleton] inviaInformazioniAlServerWithURL:[EQNGeneratoreURLServer urlPosizione] richiesta:EQNTipoChiamataPosizione success:^(id result) {
-        
-        NSLog(@"inviato");
-        
-    } failure:^(NSError *errore) {
-        
+        NSLog(@"[EQNUtility] Position saved on server");
+        [self saveUserInfo];
+    } failure:^(NSError *error) {
+        NSLog(@"[EQNUtility] Unable to save position. Error: %@", error.localizedDescription);
     }];
 }
 

Sources/Earthquake Network/Models/EQNUtility.m

@@ -102,6 +102,10 @@
 {
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
     NSData *data = [defaults objectForKey:keyName];
+    if (!data) {
+        NSLog(@"[EQNUtility] No array saved for key '%@'", keyName);
+        return nil;
+    }
     
     NSError *error;
     NSKeyedUnarchiver *unarchiver = [[NSKeyedUnarchiver alloc] initForReadingFromData:data error:&error];
@@ -119,6 +123,10 @@
 {
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
     NSData *data = [defaults objectForKey:keyName];
+    if (!data) {
+        NSLog(@"[EQNUtility] No dictionary saved for key '%@'", keyName);
+        return nil;
+    }
     
     NSError *error;
     NSKeyedUnarchiver *unarchiver = [[NSKeyedUnarchiver alloc] initForReadingFromData:data error:&error];

Sources/Earthquake Network/Models/Settings/EQNAllertaSismica.m

@@ -53,7 +53,7 @@
     [userDefaults setBool:self.isAbilitato forKey:NOTIFICHE_ALLERA_SISMICA_ABILITATO];
     [userDefaults setObject:self.sismiDaNotificare forKey:NOTIFICHE_ALLERA_SISMICA_SISMI_DA_NOTIFICARE];
     [userDefaults setObject:self.raggioSismiLievi forKey:NOTIFICHE_ALLERA_SISMICA_RAGGIO_SISMI_LIEVI];
-    [userDefaults setObject:self.raggioSismiLievi forKey:NOTIFICHE_ALLERA_SISMICA_RAGGIO_SISMI_FORTI];
+    [userDefaults setObject:self.raggioSismiForti forKey:NOTIFICHE_ALLERA_SISMICA_RAGGIO_SISMI_FORTI];
     [userDefaults setBool:self.isintervalloAllarme forKey:NOTIFICHE_ALLERA_SISMICA_ABILITA_INTERVALLO];
     [userDefaults setObject:self.oraioInizio forKey:NOTIFICHE_ALLERA_SISMICA_ORA_INIZIO];
     [userDefaults setObject:self.orarioFine forKey:NOTIFICHE_ALLERA_SISMICA_ORA_FINE];

Sources/Earthquake Network/Server Requests/ServerRequest.m

@@ -137,6 +137,7 @@
                     case EQNTipoChiamataRilevamento:
                         onSuccess([EQNUtility clearStringMessaggi:newStr]);
                         break;
+                    case EQNTipoChiamataPosizione:
                     case EQNTipoChiamataCalibrazione:
                     case EQNTipoChiamataImpostazioniNotifiche:
                     case EQNTipoChiamataAlertSimulator:

Sources/Podfile.lock

@@ -1,96 +1,120 @@
 PODS:
   - DZNEmptyDataSet (1.8.1)
-  - Firebase/Core (7.10.0):
+  - Firebase/Core (9.0.0):
     - Firebase/CoreOnly
-    - FirebaseAnalytics (~> 7.10.0)
-  - Firebase/CoreOnly (7.10.0):
-    - FirebaseCore (= 7.10.0)
-  - Firebase/Crashlytics (7.10.0):
+    - FirebaseAnalytics (~> 9.0.0)
+  - Firebase/CoreOnly (9.0.0):
+    - FirebaseCore (= 9.0.0)
+  - Firebase/Crashlytics (9.0.0):
     - Firebase/CoreOnly
-    - FirebaseCrashlytics (~> 7.10.0)
-  - Firebase/Messaging (7.10.0):
+    - FirebaseCrashlytics (~> 9.0.0)
+  - Firebase/Messaging (9.0.0):
     - Firebase/CoreOnly
-    - FirebaseMessaging (~> 7.10.0)
-  - FirebaseAnalytics (7.10.0):
-    - FirebaseCore (~> 7.0)
-    - FirebaseInstallations (~> 7.0)
-    - GoogleAppMeasurement (= 7.10.0)
-    - GoogleUtilities/AppDelegateSwizzler (~> 7.0)
-    - GoogleUtilities/MethodSwizzler (~> 7.0)
-    - GoogleUtilities/Network (~> 7.0)
-    - "GoogleUtilities/NSData+zlib (~> 7.0)"
+    - FirebaseMessaging (~> 9.0.0)
+  - FirebaseAnalytics (9.0.0):
+    - FirebaseAnalytics/AdIdSupport (= 9.0.0)
+    - FirebaseCore (~> 9.0)
+    - FirebaseInstallations (~> 9.0)
+    - GoogleUtilities/AppDelegateSwizzler (~> 7.7)
+    - GoogleUtilities/MethodSwizzler (~> 7.7)
+    - GoogleUtilities/Network (~> 7.7)
+    - "GoogleUtilities/NSData+zlib (~> 7.7)"
     - nanopb (~> 2.30908.0)
-  - FirebaseCore (7.10.0):
-    - FirebaseCoreDiagnostics (~> 7.4)
-    - GoogleUtilities/Environment (~> 7.0)
-    - GoogleUtilities/Logger (~> 7.0)
-  - FirebaseCoreDiagnostics (7.10.0):
-    - GoogleDataTransport (~> 8.4)
-    - GoogleUtilities/Environment (~> 7.0)
-    - GoogleUtilities/Logger (~> 7.0)
+  - FirebaseAnalytics/AdIdSupport (9.0.0):
+    - FirebaseCore (~> 9.0)
+    - FirebaseInstallations (~> 9.0)
+    - GoogleAppMeasurement (= 9.0.0)
+    - GoogleUtilities/AppDelegateSwizzler (~> 7.7)
+    - GoogleUtilities/MethodSwizzler (~> 7.7)
+    - GoogleUtilities/Network (~> 7.7)
+    - "GoogleUtilities/NSData+zlib (~> 7.7)"
     - nanopb (~> 2.30908.0)
-  - FirebaseCrashlytics (7.10.0):
-    - FirebaseCore (~> 7.0)
-    - FirebaseInstallations (~> 7.0)
-    - GoogleDataTransport (~> 8.4)
+  - FirebaseCore (9.0.0):
+    - FirebaseCoreDiagnostics (~> 9.0)
+    - FirebaseCoreInternal (~> 9.0)
+    - GoogleUtilities/Environment (~> 7.7)
+    - GoogleUtilities/Logger (~> 7.7)
+  - FirebaseCoreDiagnostics (9.0.0):
+    - GoogleDataTransport (~> 9.1)
+    - GoogleUtilities/Environment (~> 7.7)
+    - GoogleUtilities/Logger (~> 7.7)
     - nanopb (~> 2.30908.0)
-    - PromisesObjC (~> 1.2)
-  - FirebaseInstallations (7.10.0):
-    - FirebaseCore (~> 7.0)
-    - GoogleUtilities/Environment (~> 7.0)
-    - GoogleUtilities/UserDefaults (~> 7.0)
-    - PromisesObjC (~> 1.2)
-  - FirebaseInstanceID (7.10.0):
-    - FirebaseCore (~> 7.0)
-    - FirebaseInstallations (~> 7.0)
-    - GoogleUtilities/Environment (~> 7.0)
-    - GoogleUtilities/UserDefaults (~> 7.0)
-  - FirebaseMessaging (7.10.0):
-    - FirebaseCore (~> 7.0)
-    - FirebaseInstanceID (~> 7.0)
-    - GoogleUtilities/AppDelegateSwizzler (~> 7.0)
-    - GoogleUtilities/Environment (~> 7.0)
-    - GoogleUtilities/Reachability (~> 7.0)
-    - GoogleUtilities/UserDefaults (~> 7.0)
-  - Google-Mobile-Ads-SDK (8.3.0):
-    - GoogleAppMeasurement (~> 7.0)
+  - FirebaseCoreInternal (9.0.0):
+    - "GoogleUtilities/NSData+zlib (~> 7.7)"
+  - FirebaseCrashlytics (9.0.0):
+    - FirebaseCore (~> 9.0)
+    - FirebaseInstallations (~> 9.0)
+    - GoogleDataTransport (~> 9.1)
+    - GoogleUtilities/Environment (~> 7.7)
+    - nanopb (~> 2.30908.0)
+    - PromisesObjC (~> 2.1)
+  - FirebaseInstallations (9.0.0):
+    - FirebaseCore (~> 9.0)
+    - GoogleUtilities/Environment (~> 7.7)
+    - GoogleUtilities/UserDefaults (~> 7.7)
+    - PromisesObjC (~> 2.1)
+  - FirebaseMessaging (9.0.0):
+    - FirebaseCore (~> 9.0)
+    - FirebaseInstallations (~> 9.0)
+    - GoogleDataTransport (~> 9.1)
+    - GoogleUtilities/AppDelegateSwizzler (~> 7.7)
+    - GoogleUtilities/Environment (~> 7.7)
+    - GoogleUtilities/Reachability (~> 7.7)
+    - GoogleUtilities/UserDefaults (~> 7.7)
+    - nanopb (~> 2.30908.0)
+  - Google-Mobile-Ads-SDK (9.4.0):
+    - GoogleAppMeasurement (< 10.0, >= 7.0)
     - GoogleUserMessagingPlatform (>= 1.1)
-  - GoogleAppMeasurement (7.10.0):
-    - GoogleUtilities/AppDelegateSwizzler (~> 7.0)
-    - GoogleUtilities/MethodSwizzler (~> 7.0)
-    - GoogleUtilities/Network (~> 7.0)
-    - "GoogleUtilities/NSData+zlib (~> 7.0)"
+  - GoogleAppMeasurement (9.0.0):
+    - GoogleAppMeasurement/AdIdSupport (= 9.0.0)
+    - GoogleUtilities/AppDelegateSwizzler (~> 7.7)
+    - GoogleUtilities/MethodSwizzler (~> 7.7)
+    - GoogleUtilities/Network (~> 7.7)
+    - "GoogleUtilities/NSData+zlib (~> 7.7)"
     - nanopb (~> 2.30908.0)
-  - GoogleDataTransport (8.4.0):
-    - GoogleUtilities/Environment (~> 7.2)
+  - GoogleAppMeasurement/AdIdSupport (9.0.0):
+    - GoogleAppMeasurement/WithoutAdIdSupport (= 9.0.0)
+    - GoogleUtilities/AppDelegateSwizzler (~> 7.7)
+    - GoogleUtilities/MethodSwizzler (~> 7.7)
+    - GoogleUtilities/Network (~> 7.7)
+    - "GoogleUtilities/NSData+zlib (~> 7.7)"
     - nanopb (~> 2.30908.0)
-    - PromisesObjC (~> 1.2)
+  - GoogleAppMeasurement/WithoutAdIdSupport (9.0.0):
+    - GoogleUtilities/AppDelegateSwizzler (~> 7.7)
+    - GoogleUtilities/MethodSwizzler (~> 7.7)
+    - GoogleUtilities/Network (~> 7.7)
+    - "GoogleUtilities/NSData+zlib (~> 7.7)"
+    - nanopb (~> 2.30908.0)
+  - GoogleDataTransport (9.1.4):
+    - GoogleUtilities/Environment (~> 7.7)
+    - nanopb (< 2.30910.0, >= 2.30908.0)
+    - PromisesObjC (< 3.0, >= 1.2)
   - GoogleUserMessagingPlatform (2.0.0)
-  - GoogleUtilities/AppDelegateSwizzler (7.3.1):
+  - GoogleUtilities/AppDelegateSwizzler (7.7.0):
     - GoogleUtilities/Environment
     - GoogleUtilities/Logger
     - GoogleUtilities/Network
-  - GoogleUtilities/Environment (7.3.1):
-    - PromisesObjC (~> 1.2)
-  - GoogleUtilities/Logger (7.3.1):
+  - GoogleUtilities/Environment (7.7.0):
+    - PromisesObjC (< 3.0, >= 1.2)
+  - GoogleUtilities/Logger (7.7.0):
     - GoogleUtilities/Environment
-  - GoogleUtilities/MethodSwizzler (7.3.1):
+  - GoogleUtilities/MethodSwizzler (7.7.0):
     - GoogleUtilities/Logger
-  - GoogleUtilities/Network (7.3.1):
+  - GoogleUtilities/Network (7.7.0):
     - GoogleUtilities/Logger
     - "GoogleUtilities/NSData+zlib"
     - GoogleUtilities/Reachability
-  - "GoogleUtilities/NSData+zlib (7.3.1)"
-  - GoogleUtilities/Reachability (7.3.1):
+  - "GoogleUtilities/NSData+zlib (7.7.0)"
+  - GoogleUtilities/Reachability (7.7.0):
     - GoogleUtilities/Logger
-  - GoogleUtilities/UserDefaults (7.3.1):
+  - GoogleUtilities/UserDefaults (7.7.0):
     - GoogleUtilities/Logger
   - nanopb (2.30908.0):
     - nanopb/decode (= 2.30908.0)
     - nanopb/encode (= 2.30908.0)
   - nanopb/decode (2.30908.0)
   - nanopb/encode (2.30908.0)
-  - PromisesObjC (1.2.12)
+  - PromisesObjC (2.1.0)
   - Solar (2.1.0)
 
 DEPENDENCIES:
@@ -108,9 +132,9 @@ SPEC REPOS:
     - FirebaseAnalytics
     - FirebaseCore
     - FirebaseCoreDiagnostics
+    - FirebaseCoreInternal
     - FirebaseCrashlytics
     - FirebaseInstallations
-    - FirebaseInstanceID
     - FirebaseMessaging
     - Google-Mobile-Ads-SDK
     - GoogleAppMeasurement
@@ -123,23 +147,23 @@ SPEC REPOS:
 
 SPEC CHECKSUMS:
   DZNEmptyDataSet: 9525833b9e68ac21c30253e1d3d7076cc828eaa7
-  Firebase: fffddd0bab8677d07376538365faa93ff3889b39
-  FirebaseAnalytics: 4641d7ae4220174f6ca5626163ffc5de2e90391e
-  FirebaseCore: ec566d917b2195fc2610aeb148dae99f57a788f9
-  FirebaseCoreDiagnostics: 5662a3823ffcc0acbaa9a21ba5ed302fac634705
-  FirebaseCrashlytics: e7669d368a22d202f1d0c7546ffdfdff496e1a8c
-  FirebaseInstallations: bf2ec8dbf36ff4c91af6b9a003d15855757680c1
-  FirebaseInstanceID: 5ad92c898e1328b66e8dd58811964d6fe4d334c3
-  FirebaseMessaging: 76b3058cef7f339cf10db196e03bbbb2165fb5d7
-  Google-Mobile-Ads-SDK: c14f5a63db1414b4ca0ee1539c9f3d700ace96c2
-  GoogleAppMeasurement: 1c863b1161fc3c8cf614a7460d1be6a7c262aab3
-  GoogleDataTransport: cd9db2180fcecd8da1b561aea31e3e56cf834aa7
+  Firebase: a876fadc5ea653a377693376fd4f885c62704512
+  FirebaseAnalytics: ea4f6f4b604a20b4de4d3c7f7a2cb51d9a989040
+  FirebaseCore: e4c0b5d9727eaee0b43f9ed00baff7500c188d7b
+  FirebaseCoreDiagnostics: 54410e5d156bf406a764c2722d9f77d682723b4c
+  FirebaseCoreInternal: 5b8f4f2e2970a4cb9bd1cf7ada16c8ba69a29530
+  FirebaseCrashlytics: 08561398868790fc9694b85efb4c080940926fcc
+  FirebaseInstallations: e693c0dfe404af44afbd553de42498b2ca1ca189
+  FirebaseMessaging: 411a61cde991cbd00b5b11c7a25e0c8f28c44990
+  Google-Mobile-Ads-SDK: 5a1d44987c82e441811ecaa5ae824e100ea819d7
+  GoogleAppMeasurement: 2c2792d43ebdea0524adbc90cba9139721f3039b
+  GoogleDataTransport: 5fffe35792f8b96ec8d6775f5eccd83c998d5a3b
   GoogleUserMessagingPlatform: ab890ce5f6620f293a21b6bdd82e416a2c73aeca
-  GoogleUtilities: e1d9ed4e544fc32a93e00e721400cbc3f377200d
+  GoogleUtilities: e0913149f6b0625b553d70dae12b49fc62914fd1
   nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96
-  PromisesObjC: 3113f7f76903778cf4a0586bd1ab89329a0b7b97
+  PromisesObjC: 99b6f43f9e1044bd87a95a60beff28c2c44ddb72
   Solar: 2dc6e7cc39186cb0c8228fa08df76fb50c7d8f24
 
 PODFILE CHECKSUM: dd5131b6d7a83fb7c22ecc161ed4fc143eda0ac1
 
-COCOAPODS: 1.10.1
+COCOAPODS: 1.11.3