Remove references to deprecated CTCarrier

Author: samedson

GoogleUtilities/Environment/NetworkInfo/GULNetworkInfo.m

@@ -20,7 +20,6 @@
 #if __has_include("CoreTelephony/CTTelephonyNetworkInfo.h") && !TARGET_OS_MACCATALYST && \
                   !TARGET_OS_OSX && !TARGET_OS_TV && !TARGET_OS_WATCH
 #define TARGET_HAS_MOBILE_CONNECTIVITY
-#import <CoreTelephony/CTCarrier.h>
 #import <CoreTelephony/CTTelephonyNetworkInfo.h>
 #import <SystemConfiguration/SystemConfiguration.h>
 #endif
@@ -38,61 +37,6 @@ + (CTTelephonyNetworkInfo *)getNetworkInfo {
 }
 #endif
 
-+ (NSString *_Nullable)getNetworkMobileCountryCode {
-#ifdef TARGET_HAS_MOBILE_CONNECTIVITY
-  CTTelephonyNetworkInfo *networkInfo = [GULNetworkInfo getNetworkInfo];
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-  CTCarrier *provider = networkInfo.subscriberCellularProvider;
-#pragma clang diagnostic push
-  return provider.mobileCountryCode;
-#endif
-  return nil;
-}
-
-+ (NSString *_Nullable)getNetworkMobileNetworkCode {
-#ifdef TARGET_HAS_MOBILE_CONNECTIVITY
-  CTTelephonyNetworkInfo *networkInfo = [GULNetworkInfo getNetworkInfo];
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-  CTCarrier *provider = networkInfo.subscriberCellularProvider;
-#pragma clang diagnostic push
-  return provider.mobileNetworkCode;
-#endif
-  return nil;
-}
-
-/**
- * Returns the formatted MccMnc if the inputs are valid, otherwise nil
- * @param mcc The Mobile Country Code returned from `getNetworkMobileCountryCode`
- * @param mnc The Mobile Network Code returned from `getNetworkMobileNetworkCode`
- * @returns A string with the concatenated mccMnc if both inputs are valid, otherwise nil
- */
-+ (NSString *_Nullable)formatMcc:(NSString *)mcc andMNC:(NSString *)mnc {
-  // These are both nil if the target does not support mobile connectivity
-  if (mcc == nil && mnc == nil) {
-    return nil;
-  }
-
-  if (mcc.length != 3 || mnc.length < 2 || mnc.length > 3) {
-    return nil;
-  }
-
-  // If the resulting appended mcc + mnc contains characters that are not
-  // decimal digits, return nil
-  static NSCharacterSet *notDigits;
-  static dispatch_once_t token;
-  dispatch_once(&token, ^{
-    notDigits = [[NSCharacterSet decimalDigitCharacterSet] invertedSet];
-  });
-  NSString *mccMnc = [mcc stringByAppendingString:mnc];
-  if ([mccMnc rangeOfCharacterFromSet:notDigits].location != NSNotFound) {
-    return nil;
-  }
-
-  return mccMnc;
-}
-
 + (GULNetworkType)getNetworkType {
   GULNetworkType networkType = GULNetworkTypeNone;
 

GoogleUtilities/Environment/Public/GoogleUtilities/GULNetworkInfo.h

@@ -27,20 +27,6 @@ typedef NS_ENUM(NSInteger, GULNetworkType) {
 /// Collection of utilities to read network status information
 @interface GULNetworkInfo : NSObject
 
-/// Returns the cellular mobile country code (mcc) if CoreTelephony is supported, otherwise nil
-+ (NSString *_Nullable)getNetworkMobileCountryCode;
-
-/// Returns the cellular mobile network code (mnc) if CoreTelephony is supported, otherwise nil
-+ (NSString *_Nullable)getNetworkMobileNetworkCode;
-
-/**
- * Returns the formatted MccMnc if the inputs are valid, otherwise nil
- * @param mcc The Mobile Country Code returned from `getNetworkMobileCountryCode`
- * @param mnc The Mobile Network Code returned from `getNetworkMobileNetworkCode`
- * @returns A string with the concatenated mccMnc if both inputs are valid, otherwise nil
- */
-+ (NSString *_Nullable)formatMcc:(NSString *_Nullable)mcc andMNC:(NSString *_Nullable)mnc;
-
 /// Returns an enum indicating the network type. The enum values should be easily transferrable to
 /// the NetworkType value in android/play/playlog/proto/clientanalytics.proto. Right now this always
 /// returns None on platforms other than iOS. This should be updated in the future to return Wi-Fi