Fix compiler checks for xcode 13 (#8679)

Author: elenadoty

Crashlytics/Crashlytics/Controllers/FIRCLSMetricKitManager.h

@@ -15,11 +15,7 @@
 #include <Availability.h>
 #import <Foundation/Foundation.h>
 
-#if defined(__IPHONE_15_0)
-#define CLS_METRICKIT_SUPPORTED (__has_include(<MetricKit/MetricKit.h>) && TARGET_OS_IOS)
-#else
-#define CLS_METRICKIT_SUPPORTED 0
-#endif
+#import "Crashlytics/Crashlytics/Helpers/FIRCLSDefines.h"
 
 #if CLS_METRICKIT_SUPPORTED
 #import <MetricKit/MetricKit.h>
@@ -44,7 +40,6 @@ NS_ASSUME_NONNULL_BEGIN
 - (instancetype)init NS_UNAVAILABLE;
 - (void)registerMetricKitManager;
 - (FBLPromise *)waitForMetricKitDataAvailable;
-- (void)processDiagnosticPayloads:(NSArray<MXDiagnosticPayload *> *)payloads;
 
 @end
 

Crashlytics/Crashlytics/Controllers/FIRCLSMetricKitManager.m

@@ -56,7 +56,7 @@ - (instancetype)initWithManagerData:(FIRCLSManagerData *)managerData
  * last run of the app, this promise is immediately resolved so that the upload of any nonfatal
  * events can proceed.
  */
-- (void)registerMetricKitManager {
+- (void)registerMetricKitManager API_AVAILABLE(ios(14)) {
   [[MXMetricManager sharedManager] addSubscriber:self];
   self.metricKitDataAvailable = [FBLPromise pendingPromise];
 
@@ -95,7 +95,8 @@ - (void)registerMetricKitManager {
  * immediately after the event. Since we send nonfatal events on the next run of the app, we can
  * write out the information but won't need to resolve the promise.
  */
-- (void)didReceiveDiagnosticPayloads:(NSArray<MXDiagnosticPayload *> *)payloads {
+- (void)didReceiveDiagnosticPayloads:(NSArray<MXDiagnosticPayload *> *)payloads
+    API_AVAILABLE(ios(14)) {
   BOOL processedFatalPayload = NO;
   for (MXDiagnosticPayload *diagnosticPayload in payloads) {
     if (!diagnosticPayload) {
@@ -118,7 +119,7 @@ - (void)didReceiveDiagnosticPayloads:(NSArray<MXDiagnosticPayload *> *)payloads
 
 // Helper method to write a MetricKit payload's data to file.
 - (BOOL)processMetricKitPayload:(MXDiagnosticPayload *)diagnosticPayload
-                 skipCrashEvent:(BOOL)skipCrashEvent {
+                 skipCrashEvent:(BOOL)skipCrashEvent API_AVAILABLE(ios(14)) {
   BOOL writeFailed = NO;
 
   // Write out each type of diagnostic if it exists in the report
@@ -144,7 +145,6 @@ - (BOOL)processMetricKitPayload:(MXDiagnosticPayload *)diagnosticPayload
   // Also ensure that there is a report from the last run of the app that we can write to.
   NSString *metricKitFatalReportFile;
   NSString *metricKitNonfatalReportFile;
-  NSString *metricKitReportFile;
   NSString *newestUnsentReportID =
       [self.existingReportManager.newestUnsentReport.reportID stringByAppendingString:@"/"];
   NSString *currentReportID =
@@ -316,7 +316,7 @@ - (BOOL)processMetricKitPayload:(MXDiagnosticPayload *)diagnosticPayload
  * Required for MXMetricManager subscribers. Since we aren't currently collecting any MetricKit
  * metrics, this method is left empty.
  */
-- (void)didReceiveMetricPayloads:(NSArray<MXMetricPayload *> *)payloads {
+- (void)didReceiveMetricPayloads:(NSArray<MXMetricPayload *> *)payloads API_AVAILABLE(ios(13)) {
 }
 
 - (FBLPromise *)waitForMetricKitDataAvailable {
@@ -330,15 +330,16 @@ - (FBLPromise *)waitForMetricKitDataAvailable {
 /*
  * Helper method to convert threads for a MetricKit fatal diagnostic event to an array of threads.
  */
-- (NSArray *)convertThreadsToArray:(MXCallStackTree *)mxCallStackTree {
+- (NSArray *)convertThreadsToArray:(MXCallStackTree *)mxCallStackTree API_AVAILABLE(ios(14)) {
   FIRCLSCallStackTree *tree = [[FIRCLSCallStackTree alloc] initWithMXCallStackTree:mxCallStackTree];
   return [tree getArrayRepresentation];
 }
 
 /*
  * Helper method to convert threads for a MetricKit nonfatal diagnostic event to an array of frames.
  */
-- (NSArray *)convertThreadsToArrayForNonfatal:(MXCallStackTree *)mxCallStackTree {
+- (NSArray *)convertThreadsToArrayForNonfatal:(MXCallStackTree *)mxCallStackTree
+    API_AVAILABLE(ios(14)) {
   FIRCLSCallStackTree *tree = [[FIRCLSCallStackTree alloc] initWithMXCallStackTree:mxCallStackTree];
   return [tree getFramesOfBlamedThread];
 }
@@ -347,7 +348,7 @@ - (NSArray *)convertThreadsToArrayForNonfatal:(MXCallStackTree *)mxCallStackTree
  * Helper method to convert metadata for a MetricKit diagnostic event to a dictionary. MXMetadata
  * has a dictionaryRepresentation method but it is deprecated.
  */
-- (NSDictionary *)convertMetadataToDictionary:(MXMetaData *)metadata {
+- (NSDictionary *)convertMetadataToDictionary:(MXMetaData *)metadata API_AVAILABLE(ios(14)) {
   NSError *error = nil;
   NSDictionary *metadataDictionary =
       [NSJSONSerialization JSONObjectWithData:[metadata JSONRepresentation] options:0 error:&error];

Crashlytics/Crashlytics/Controllers/FIRCLSReportManager.m

@@ -183,11 +183,13 @@ - (instancetype)initWithManagerData:(FIRCLSManagerData *)managerData
 
   _notificationManager = [[FIRCLSNotificationManager alloc] init];
 #if CLS_METRICKIT_SUPPORTED
-  if (@available(iOS 15, *) && self.settings.metricKitCollectionEnabled) {
-    FIRCLSDebugLog(@"MetricKit data collection enabled.");
-    _metricKitManager = [[FIRCLSMetricKitManager alloc] initWithManagerData:managerData
-                                                      existingReportManager:existingReportManager
-                                                                fileManager:_fileManager];
+  if (@available(iOS 15, *)) {
+    if (self.settings.metricKitCollectionEnabled) {
+      FIRCLSDebugLog(@"MetricKit data collection enabled.");
+      _metricKitManager = [[FIRCLSMetricKitManager alloc] initWithManagerData:managerData
+                                                        existingReportManager:existingReportManager
+                                                                  fileManager:_fileManager];
+    }
   }
 #endif
 
@@ -226,14 +228,16 @@ - (instancetype)initWithManagerData:(FIRCLSManagerData *)managerData
 - (FBLPromise *)waitForMetricKitData {
   // If the platform is not iOS or the iOS version is less than 15, immediately resolve the promise
   // since no MetricKit diagnostics will be available.
+  FBLPromise *promise = [FBLPromise resolvedWith:nil];
 #if CLS_METRICKIT_SUPPORTED
-  if (@available(iOS 15, *) && self.settings.metricKitCollectionEnabled) {
-    return [self.metricKitManager waitForMetricKitDataAvailable];
-  } else {
-    return [FBLPromise resolvedWith:nil];
+  if (@available(iOS 15, *)) {
+    if (self.settings.metricKitCollectionEnabled) {
+      promise = [self.metricKitManager waitForMetricKitDataAvailable];
+    }
   }
+  return promise;
 #endif
-  return [FBLPromise resolvedWith:nil];
+  return promise;
 }
 
 - (FBLPromise<FIRCrashlyticsReport *> *)checkForUnsentReports {
@@ -292,8 +296,10 @@ - (FBLPromise *)deleteUnsentReports {
   }
 
 #if CLS_METRICKIT_SUPPORTED
-  if (@available(iOS 15, *) && self.settings.metricKitCollectionEnabled) {
-    [self.metricKitManager registerMetricKitManager];
+  if (@available(iOS 15, *)) {
+    if (self.settings.metricKitCollectionEnabled) {
+      [self.metricKitManager registerMetricKitManager];
+    }
   }
 #endif
 

Crashlytics/Crashlytics/Helpers/FIRCLSCallStackTree.m

@@ -58,7 +58,10 @@ - (instancetype)initWithMXCallStackTree:(MXCallStackTree *)callStackTree {
     NSLog(@"Crashlytics: error creating json");
     return nil;
   }
-
+  self = [super init];
+  if (!self) {
+    return nil;
+  }
   _callStackPerThread = [[jsonDictionary objectForKey:@"callStackPerThread"] boolValue];
 
   // Recurse through the frames in the callStackTree and add them all to an array

Crashlytics/Crashlytics/Helpers/FIRCLSDefines.h

@@ -41,6 +41,13 @@
 #define TARGET_OS_TV 0
 #endif
 
+// Whether MetricKit should be supported
+#if defined(__IPHONE_15_0)
+#define CLS_METRICKIT_SUPPORTED (__has_include(<MetricKit/MetricKit.h>) && TARGET_OS_IOS)
+#else
+#define CLS_METRICKIT_SUPPORTED 0
+#endif
+
 // These help compile based on availability of technologies/frameworks.
 #define CLS_TARGET_OS_OSX (TARGET_OS_MAC && !TARGET_OS_IPHONE)
 #define CLS_TARGET_OS_HAS_UIKIT (TARGET_OS_IOS || TARGET_OS_TV)

Crashlytics/UnitTests/FIRCLSMetricKitManagerTests.m

@@ -51,6 +51,7 @@
 
 #define TEST_GOOGLE_APP_ID (@"1:632950151350:ios:d5b0d08d4f00f4b1")
 
+API_AVAILABLE(ios(14))
 @interface FIRCLSMetricKitManagerTests : XCTestCase
 
 @property(nonatomic, strong) FIRCLSMockReportManager *reportManager;

Crashlytics/UnitTests/Mocks/FIRCLSMockMXCPUExceptionDiagnostic.h

@@ -15,11 +15,7 @@
 #include <Availability.h>
 #import <Foundation/Foundation.h>
 
-#if defined(__IPHONE_15_0)
-#define CLS_METRICKIT_SUPPORTED (__has_include(<MetricKit/MetricKit.h>) && TARGET_OS_IOS)
-#else
-#define CLS_METRICKIT_SUPPORTED 0
-#endif
+#import "Crashlytics/Crashlytics/Helpers/FIRCLSDefines.h"
 
 #if CLS_METRICKIT_SUPPORTED
 #import <MetricKit/MetricKit.h>
@@ -28,6 +24,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+API_AVAILABLE(ios(14))
 @interface FIRCLSMockMXCPUExceptionDiagnostic : MXCPUExceptionDiagnostic
 
 - (instancetype)initWithCallStackTree:(FIRCLSMockMXCallStackTree *)callStackTree

Crashlytics/UnitTests/Mocks/FIRCLSMockMXCallStackTree.h

@@ -15,17 +15,14 @@
 #include <Availability.h>
 #import <Foundation/Foundation.h>
 
-#if defined(__IPHONE_15_0)
-#define CLS_METRICKIT_SUPPORTED (__has_include(<MetricKit/MetricKit.h>) && TARGET_OS_IOS)
-#else
-#define CLS_METRICKIT_SUPPORTED 0
-#endif
+#import "Crashlytics/Crashlytics/Helpers/FIRCLSDefines.h"
 
 #if CLS_METRICKIT_SUPPORTED
 #import <MetricKit/MetricKit.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
+API_AVAILABLE(ios(14))
 @interface FIRCLSMockMXCallStackTree : MXCallStackTree
 
 - (instancetype)initWithStringData:(NSString *)stringData;

Crashlytics/UnitTests/Mocks/FIRCLSMockMXCrashDiagnostic.h

@@ -15,11 +15,7 @@
 #include <Availability.h>
 #import <Foundation/Foundation.h>
 
-#if defined(__IPHONE_15_0)
-#define CLS_METRICKIT_SUPPORTED (__has_include(<MetricKit/MetricKit.h>) && TARGET_OS_IOS)
-#else
-#define CLS_METRICKIT_SUPPORTED 0
-#endif
+#import "Crashlytics/Crashlytics/Helpers/FIRCLSDefines.h"
 
 #if CLS_METRICKIT_SUPPORTED
 #import <MetricKit/MetricKit.h>
@@ -28,6 +24,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+API_AVAILABLE(ios(14))
 @interface FIRCLSMockMXCrashDiagnostic : MXCrashDiagnostic
 
 - (instancetype)initWithCallStackTree:(FIRCLSMockMXCallStackTree *)callStackTree

Crashlytics/UnitTests/Mocks/FIRCLSMockMXDiagnosticPayload.h

@@ -15,11 +15,7 @@
 #include <Availability.h>
 #import <Foundation/Foundation.h>
 
-#if defined(__IPHONE_15_0)
-#define CLS_METRICKIT_SUPPORTED (__has_include(<MetricKit/MetricKit.h>) && TARGET_OS_IOS)
-#else
-#define CLS_METRICKIT_SUPPORTED 0
-#endif
+#import "Crashlytics/Crashlytics/Helpers/FIRCLSDefines.h"
 
 #if CLS_METRICKIT_SUPPORTED
 #import <MetricKit/MetricKit.h>
@@ -28,6 +24,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+API_AVAILABLE(ios(14))
 @interface FIRCLSMockMXDiagnosticPayload : MXDiagnosticPayload
 
 - (instancetype)initWithDiagnostics:(NSDictionary *)diagnostics