Crashlytics allow for both types of Promise imports (#4624)

Author: samedson

Crashlytics/Crashlytics/Controllers/FIRCLSReportManager.m

@@ -14,7 +14,11 @@
 
 #include <stdatomic.h>
 
+#if __has_include(<FBLPromises/FBLPromises.h>)
+#import <FBLPromises/FBLPromises.h>
+#else
 #import "FBLPromises.h"
+#endif
 
 #import "FIRCLSApplication.h"
 #import "FIRCLSDataCollectionArbiter.h"

Crashlytics/Crashlytics/DataCollection/FIRCLSDataCollectionArbiter.m

@@ -14,7 +14,11 @@
 
 #import "FIRCLSDataCollectionArbiter.h"
 
+#if __has_include(<FBLPromises/FBLPromises.h>)
+#import <FBLPromises/FBLPromises.h>
+#else
 #import "FBLPromises.h"
+#endif
 
 #import "FIRApp.h"
 #import "FIRCLSUserDefaults.h"

Crashlytics/Crashlytics/FIRCrashlytics.m

@@ -14,7 +14,11 @@
 
 #include <stdatomic.h>
 
+#if __has_include(<FBLPromises/FBLPromises.h>)
+#import <FBLPromises/FBLPromises.h>
+#else
 #import "FBLPromises.h"
+#endif
 
 #include "FIRCLSCrashedMarkerFile.h"
 #import "FIRCLSDataCollectionArbiter.h"

Crashlytics/Crashlytics/Models/FIRCLSSettings.h

@@ -14,7 +14,11 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FBLPromise.h"
+#if __has_include(<FBLPromises/FBLPromises.h>)
+#import <FBLPromises/FBLPromises.h>
+#else
+#import "FBLPromises.h"
+#endif
 
 @class FIRCLSApplicationIdentifierModel;
 @class FIRCLSFileManager;

Crashlytics/Crashlytics/Models/FIRCLSSettings.m

@@ -14,7 +14,11 @@
 
 #import "FIRCLSSettings.h"
 
-#import "FBLPromise.h"
+#if __has_include(<FBLPromises/FBLPromises.h>)
+#import <FBLPromises/FBLPromises.h>
+#else
+#import "FBLPromises.h"
+#endif
 
 #import "FIRCLSApplicationIdentifierModel.h"
 #import "FIRCLSConstants.h"

Crashlytics/Crashlytics/Settings/FIRCLSSettingsOnboardingManager.h

@@ -14,7 +14,11 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FBLPromise.h"
+#if __has_include(<FBLPromises/FBLPromises.h>)
+#import <FBLPromises/FBLPromises.h>
+#else
+#import "FBLPromises.h"
+#endif
 
 @class FIRCLSApplicationIdentifierModel;
 @class FIRCLSDataCollectionToken;

Crashlytics/UnitTests/FIRCLSDataCollectionArbiterTest.m

@@ -16,7 +16,11 @@
 
 #import <XCTest/XCTest.h>
 
+#if __has_include(<FBLPromises/FBLPromises.h>)
+#import <FBLPromises/FBLPromises.h>
+#else
 #import "FBLPromises.h"
+#endif
 
 #import "FIRAppFake.h"
 #import "FIRCLSUserDefaults.h"

Crashlytics/UnitTests/FIRCLSReportManagerTests.m

@@ -17,7 +17,11 @@
 
 #import <FirebaseCore/FIRLogger.h>
 
+#if __has_include(<FBLPromises/FBLPromises.h>)
+#import <FBLPromises/FBLPromises.h>
+#else
 #import "FBLPromises.h"
+#endif
 
 #include "FIRAEvent+Internal.h"
 #include "FIRCLSContext.h"

Crashlytics/UnitTests/FIRCLSSettingsTests.m

@@ -17,7 +17,11 @@
 #import <Foundation/Foundation.h>
 #import <XCTest/XCTest.h>
 
+#if __has_include(<FBLPromises/FBLPromises.h>)
+#import <FBLPromises/FBLPromises.h>
+#else
 #import "FBLPromises.h"
+#endif
 
 #import "FABMockApplicationIdentifierModel.h"
 #import "FIRCLSFileManager.h"