[Infra] Favor SWIFTPM_MODULE_BUNDLE macro over C function across repo (#10625)

ncooke3 · web-flow · commit 96d07fe973f9 · 2022-12-29T18:23:29.000-05:00
* [Infra] Favor SWIFTPM_MODULE_BUNDLE in RC unit tests

* Favor across repo
diff --git a/Crashlytics/UnitTests/FIRCLSCompactUnwindTests.m b/Crashlytics/UnitTests/FIRCLSCompactUnwindTests.m
@@ -43,7 +43,7 @@ - (void)tearDown {
 
 - (NSString*)resourcePath {
 #if SWIFT_PACKAGE
-  NSBundle* bundle = Firebase_FirebaseCrashlyticsUnit_SWIFTPM_MODULE_BUNDLE();
+  NSBundle* bundle = SWIFTPM_MODULE_BUNDLE;
   return [bundle.resourcePath stringByAppendingPathComponent:@"Data"];
 #else
   NSBundle *bundle = [NSBundle bundleForClass:[self class]];
diff --git a/Crashlytics/UnitTests/FIRCLSDwarfTests.m b/Crashlytics/UnitTests/FIRCLSDwarfTests.m
@@ -43,7 +43,7 @@ - (void)tearDown {
 
 - (NSString*)resourcePath {
 #if SWIFT_PACKAGE
-  NSBundle* bundle = Firebase_FirebaseCrashlyticsUnit_SWIFTPM_MODULE_BUNDLE();
+  NSBundle* bundle = SWIFTPM_MODULE_BUNDLE;
   return [bundle.resourcePath stringByAppendingPathComponent:@"Data"];
 #else
   NSBundle *bundle = [NSBundle bundleForClass:[self class]];
diff --git a/Crashlytics/UnitTests/FIRCLSInternalReportTests.m b/Crashlytics/UnitTests/FIRCLSInternalReportTests.m
@@ -24,7 +24,7 @@ @implementation FIRCLSInternalReportTests
 
 - (NSString *)resourcePath {
 #if SWIFT_PACKAGE
-  NSBundle *bundle = Firebase_FirebaseCrashlyticsUnit_SWIFTPM_MODULE_BUNDLE();
+  NSBundle *bundle = SWIFTPM_MODULE_BUNDLE;
   return [bundle.resourcePath stringByAppendingPathComponent:@"Data"];
 #else
   NSBundle *bundle = [NSBundle bundleForClass:[self class]];
diff --git a/Crashlytics/UnitTests/FIRCLSMachO/FIRCLSMachOBinaryTests.m b/Crashlytics/UnitTests/FIRCLSMachO/FIRCLSMachOBinaryTests.m
@@ -20,7 +20,7 @@ @implementation FIRCLSMachOBinaryTests
 
 - (NSString*)resourcePath {
 #if SWIFT_PACKAGE
-  NSBundle* bundle = Firebase_FirebaseCrashlyticsUnit_SWIFTPM_MODULE_BUNDLE();
+  NSBundle* bundle = SWIFTPM_MODULE_BUNDLE;
 #else
   NSBundle* bundle = [NSBundle bundleForClass:[self class]];
 #endif
diff --git a/Crashlytics/UnitTests/FIRCLSMachO/FIRCLSMachOTests.m b/Crashlytics/UnitTests/FIRCLSMachO/FIRCLSMachOTests.m
@@ -24,7 +24,7 @@ @implementation FIRCLSMachOTests
 
 - (NSString*)resourcePath {
 #if SWIFT_PACKAGE
-  NSBundle* bundle = Firebase_FirebaseCrashlyticsUnit_SWIFTPM_MODULE_BUNDLE();
+  NSBundle* bundle = SWIFTPM_MODULE_BUNDLE;
 #else
   NSBundle* bundle = [NSBundle bundleForClass:[self class]];
 #endif
diff --git a/Crashlytics/UnitTests/FIRCLSMachO/FIRCLSdSYMTests.m b/Crashlytics/UnitTests/FIRCLSMachO/FIRCLSdSYMTests.m
@@ -20,7 +20,7 @@ @implementation FIRCLSdSYMTests
 
 - (NSString*)resourcePath {
 #if SWIFT_PACKAGE
-  NSBundle* bundle = Firebase_FirebaseCrashlyticsUnit_SWIFTPM_MODULE_BUNDLE();
+  NSBundle* bundle = SWIFTPM_MODULE_BUNDLE;
 #else
   NSBundle* bundle = [NSBundle bundleForClass:[self class]];
 #endif
diff --git a/Crashlytics/UnitTests/FIRCLSProcessReportOperationTests.m b/Crashlytics/UnitTests/FIRCLSProcessReportOperationTests.m
@@ -43,7 +43,7 @@ - (void)tearDown {
 
 - (NSString *)resourcePath {
 #if SWIFT_PACKAGE
-  NSBundle *bundle = Firebase_FirebaseCrashlyticsUnit_SWIFTPM_MODULE_BUNDLE();
+  NSBundle *bundle = SWIFTPM_MODULE_BUNDLE;
   return [bundle.resourcePath stringByAppendingPathComponent:@"Data"];
 #else
   NSBundle *bundle = [NSBundle bundleForClass:[self class]];
diff --git a/Crashlytics/UnitTests/FIRCLSReportAdapterTests.m b/Crashlytics/UnitTests/FIRCLSReportAdapterTests.m
@@ -169,7 +169,7 @@ - (FIRCLSReportAdapter *)adapterForValidMetadata {
 
 + (NSString *)resourcePath {
 #if SWIFT_PACKAGE
-  NSBundle *bundle = Firebase_FirebaseCrashlyticsUnit_SWIFTPM_MODULE_BUNDLE();
+  NSBundle *bundle = SWIFTPM_MODULE_BUNDLE;
   return [bundle.resourcePath stringByAppendingPathComponent:@"Data"];
 #else
   NSBundle *bundle = [NSBundle bundleForClass:[self class]];
diff --git a/Crashlytics/UnitTests/FIRCLSReportManagerTests.m b/Crashlytics/UnitTests/FIRCLSReportManagerTests.m
@@ -131,7 +131,7 @@ - (void)tearDown {
 #pragma mark - Path Helpers
 - (NSString *)resourcePath {
 #if SWIFT_PACKAGE
-  NSBundle *bundle = Firebase_FirebaseCrashlyticsUnit_SWIFTPM_MODULE_BUNDLE();
+  NSBundle *bundle = SWIFTPM_MODULE_BUNDLE;
   return [bundle.resourcePath stringByAppendingPathComponent:@"Data"];
 #else
   NSBundle *bundle = [NSBundle bundleForClass:[self class]];
diff --git a/Crashlytics/UnitTests/FIRCLSSymbolResolverTests.m b/Crashlytics/UnitTests/FIRCLSSymbolResolverTests.m
@@ -32,7 +32,7 @@ - (void)tearDown {
 
 - (NSString*)resourcePath {
 #if SWIFT_PACKAGE
-  NSBundle* bundle = Firebase_FirebaseCrashlyticsUnit_SWIFTPM_MODULE_BUNDLE();
+  NSBundle* bundle = SWIFTPM_MODULE_BUNDLE;
   return [bundle.resourcePath stringByAppendingPathComponent:@"Data"];
 #else
   NSBundle* bundle = [NSBundle bundleForClass:[self class]];
diff --git a/Crashlytics/UnitTests/FIRCrashlyticsReportTests.m b/Crashlytics/UnitTests/FIRCrashlyticsReportTests.m
@@ -56,7 +56,7 @@ - (void)tearDown {
 
 - (NSString *)resourcePath {
 #if SWIFT_PACKAGE
-  NSBundle *bundle = Firebase_FirebaseCrashlyticsUnit_SWIFTPM_MODULE_BUNDLE();
+  NSBundle *bundle = SWIFTPM_MODULE_BUNDLE;
   return [bundle.resourcePath stringByAppendingPathComponent:@"Data"];
 #else
   NSBundle *bundle = [NSBundle bundleForClass:[self class]];
diff --git a/FirebaseABTesting/Tests/Unit/Utilities/ABTTestUtilities.m b/FirebaseABTesting/Tests/Unit/Utilities/ABTTestUtilities.m
@@ -22,7 +22,7 @@ @implementation ABTTestUtilities
 
 + (NSBundle *)getBundle {
 #if SWIFT_PACKAGE
-  return Firebase_ABTestingUnit_SWIFTPM_MODULE_BUNDLE();
+  return SWIFTPM_MODULE_BUNDLE;
 #else
   return [NSBundle bundleForClass:[ABTTestUtilities class]];
 #endif
diff --git a/FirebaseDatabase/Tests/Unit/FSyncPointTests.m b/FirebaseDatabase/Tests/Unit/FSyncPointTests.m
@@ -465,7 +465,7 @@ - (void)runTest:(NSDictionary *)testSpec atBasePath:(NSString *)basePath {
 - (NSArray *)loadSpecs {
   static NSArray *json;
 #if SWIFT_PACKAGE
-  NSBundle *bundle = Firebase_DatabaseUnit_SWIFTPM_MODULE_BUNDLE();
+  NSBundle *bundle = SWIFTPM_MODULE_BUNDLE;
 #else
   NSBundle *bundle = [NSBundle bundleForClass:[FSyncPointTests class]];
 #endif
diff --git a/FirebasePerformance/Tests/Unit/FPRTestUtils.m b/FirebasePerformance/Tests/Unit/FPRTestUtils.m
@@ -31,7 +31,7 @@ @implementation FPRTestUtils
 
 + (NSBundle *)getBundle {
 #if SWIFT_PACKAGE
-  return Firebase_PerformanceUnit_SWIFTPM_MODULE_BUNDLE();
+  return SWIFTPM_MODULE_BUNDLE;
 #else
   return [NSBundle bundleForClass:[FPRTestUtils class]];
 #endif
diff --git a/FirebaseRemoteConfig/Tests/Unit/RCNConfigExperimentTest.m b/FirebaseRemoteConfig/Tests/Unit/RCNConfigExperimentTest.m
@@ -255,7 +255,7 @@ - (int64_t)convertTimeToMillis:(NSString *)time {
 
 + (NSData *)payloadDataFromTestFile {
 #if SWIFT_PACKAGE
-  NSBundle *bundle = Firebase_RemoteConfigUnit_SWIFTPM_MODULE_BUNDLE();
+  NSBundle *bundle = SWIFTPM_MODULE_BUNDLE;
 #else
   NSBundle *bundle = [NSBundle bundleForClass:[self class]];
 #endif
diff --git a/FirebaseRemoteConfig/Tests/Unit/RCNRemoteConfigTest.m b/FirebaseRemoteConfig/Tests/Unit/RCNRemoteConfigTest.m
@@ -1270,7 +1270,7 @@ - (void)testInvalidKeyOrNamespace {
 // Manage different bundle locations for Swift Package Manager, CocoaPods static, CocoaPods dynamic.
 - (void)setDefaultsFor:(FIRRemoteConfig *)config {
 #if SWIFT_PACKAGE
-  NSBundle *bundle = Firebase_RemoteConfigUnit_SWIFTPM_MODULE_BUNDLE();
+  NSBundle *bundle = SWIFTPM_MODULE_BUNDLE;
   NSString *plistFile = [bundle pathForResource:@"Defaults-testInfo" ofType:@"plist"];
 #else
   NSBundle *bundle = [NSBundle mainBundle];
@@ -1497,7 +1497,7 @@ - (FIROptions *)firstAppOptions {
 - (FIROptions *)secondAppOptions {
   NSBundle *bundle = [NSBundle bundleForClass:[self class]];
 #if SWIFT_PACKAGE
-  bundle = Firebase_RemoteConfigUnit_SWIFTPM_MODULE_BUNDLE();
+  bundle = SWIFTPM_MODULE_BUNDLE;
 #endif
   NSString *plistPath = [bundle pathForResource:@"SecondApp-GoogleService-Info" ofType:@"plist"];
   FIROptions *options = [[FIROptions alloc] initWithContentsOfFile:plistPath];
