Fix Catalyst define checks (#3958)

Author: paulb777

.travis.yml

@@ -346,7 +346,6 @@ jobs:
         - travis_wait 45 ./scripts/pod_lib_lint.rb FirebaseFirestore.podspec --use-libraries --allow-warnings --no-subspecs
 
     - stage: test
-      osx_image: xcode10.3
       env:
         - PROJECT=GoogleDataTransport METHOD=pod-lib-lint
       script:

Example/InstanceID/Tests/FIRInstanceIDKeyPairMigrationTest.m

@@ -155,7 +155,7 @@ - (void)testMigrationIfLegacyKeyPairsExist {
 #endif
 }
 
-#if (TARGET_OS_IOS || TARGET_OS_TV) && !defined(TARGET_OS_MACCATALYST)
+#if (TARGET_OS_IOS || TARGET_OS_TV) && !TARGET_OS_MACCATALYST
 - (void)testUpdateKeyRefWithTagRetainsAndReleasesKeyRef {
   __weak id weakKeyRef;
 
@@ -200,6 +200,6 @@ - (SecKeyRef)generateKeyRef {
 
   return publicKey;
 }
-#endif  // (TARGET_OS_IOS || TARGET_OS_TV) && !defined(TARGET_OS_MACCATALYST)
+#endif  // (TARGET_OS_IOS || TARGET_OS_TV) && !TARGET_OS_MACCATALYST
 
 @end

GoogleDataTransport/GDTCORLibrary/GDTCORStorage.m

@@ -126,7 +126,7 @@ - (void)storeEvent:(GDTCOREvent *)event {
                                                              error:&error];
         [data writeToFile:[GDTCORStorage archivePath] atomically:YES];
       } else {
-#if !defined(TARGET_OS_MACCATALYST)
+#if !TARGET_OS_MACCATALYST
         [NSKeyedArchiver archiveRootObject:self toFile:[GDTCORStorage archivePath]];
 #endif
       }
@@ -222,7 +222,7 @@ - (void)appWillForeground:(GDTCORApplication *)app {
     NSData *data = [NSData dataWithContentsOfFile:[GDTCORStorage archivePath]];
     [NSKeyedUnarchiver unarchivedObjectOfClass:[GDTCORStorage class] fromData:data error:&error];
   } else {
-#if !defined(TARGET_OS_MACCATALYST)
+#if !TARGET_OS_MACCATALYST
     [NSKeyedUnarchiver unarchiveObjectWithFile:[GDTCORStorage archivePath]];
 #endif
   }
@@ -238,7 +238,7 @@ - (void)appWillBackground:(GDTCORApplication *)app {
                                                            error:&error];
       [data writeToFile:[GDTCORStorage archivePath] atomically:YES];
     } else {
-#if !defined(TARGET_OS_MACCATALYST)
+#if !TARGET_OS_MACCATALYST
       [NSKeyedArchiver archiveRootObject:self toFile:[GDTCORStorage archivePath]];
 #endif
     }
@@ -267,7 +267,7 @@ - (void)appWillTerminate:(GDTCORApplication *)application {
                                                          error:&error];
     [data writeToFile:[GDTCORStorage archivePath] atomically:YES];
   } else {
-#if !defined(TARGET_OS_MACCATALYST)
+#if !TARGET_OS_MACCATALYST
     [NSKeyedArchiver archiveRootObject:self toFile:[GDTCORStorage archivePath]];
 #endif
   }

GoogleDataTransport/GDTCORTests/Unit/GDTCORClockTest.m

@@ -60,7 +60,7 @@ - (void)testEncoding {
                                                         fromData:clockData
                                                            error:nil];
   } else {
-#if !defined(TARGET_OS_MACCATALYST)
+#if !TARGET_OS_MACCATALYST
     NSData *clockData = [NSKeyedArchiver archivedDataWithRootObject:clock];
     unarchivedClock = [NSKeyedUnarchiver unarchiveObjectWithData:clockData];
 #endif

GoogleDataTransport/GDTCORTests/Unit/GDTCOREventTest.m

@@ -49,7 +49,7 @@ - (void)testArchiving {
                                         requiringSecureCoding:YES
                                                         error:nil];
   } else {
-#if !defined(TARGET_OS_MACCATALYST)
+#if !TARGET_OS_MACCATALYST
     archiveData = [NSKeyedArchiver archivedDataWithRootObject:event];
 #endif
   }
@@ -61,7 +61,7 @@ - (void)testArchiving {
                                                      fromData:archiveData
                                                         error:nil];
   } else {
-#if !defined(TARGET_OS_MACCATALYST)
+#if !TARGET_OS_MACCATALYST
     decodedEvent = [NSKeyedUnarchiver unarchiveObjectWithData:archiveData];
 #endif
   }

GoogleDataTransport/GDTCORTests/Unit/GDTCORStorageTest.m

@@ -271,7 +271,7 @@ - (void)testNSSecureCoding {
                                           requiringSecureCoding:YES
                                                           error:nil];
     } else {
-#if !defined(TARGET_OS_MACCATALYST)
+#if !TARGET_OS_MACCATALYST
       storageData = [NSKeyedArchiver archivedDataWithRootObject:[GDTCORStorage sharedInstance]];
 #endif
     }
@@ -290,7 +290,7 @@ - (void)testNSSecureCoding {
                                                           fromData:storageData
                                                              error:&error];
   } else {
-#if !defined(TARGET_OS_MACCATALYST)
+#if !TARGET_OS_MACCATALYST
     unarchivedStorage = [NSKeyedUnarchiver unarchiveObjectWithData:storageData];
 #endif
   }
@@ -311,7 +311,7 @@ - (void)testNSSecureCodingWithSharedInstance {
                                           requiringSecureCoding:YES
                                                           error:nil];
     } else {
-#if !defined(TARGET_OS_MACCATALYST)
+#if !TARGET_OS_MACCATALYST
       storageData = [NSKeyedArchiver archivedDataWithRootObject:[GDTCORStorage sharedInstance]];
 #endif
     }
@@ -329,7 +329,7 @@ - (void)testNSSecureCodingWithSharedInstance {
                                                           fromData:storageData
                                                              error:nil];
   } else {
-#if !defined(TARGET_OS_MACCATALYST)
+#if !TARGET_OS_MACCATALYST
     unarchivedStorage = [NSKeyedUnarchiver unarchiveObjectWithData:storageData];
 #endif
   }

GoogleDataTransport/GDTCORTests/Unit/GDTCORUploadPackageTest.m

@@ -124,7 +124,7 @@ - (void)testEncoding {
                                                             error:&error];
     XCTAssertNil(error);
   } else {
-#if !defined(TARGET_OS_MACCATALYST)
+#if !TARGET_OS_MACCATALYST
     NSData *packageData = [NSKeyedArchiver archivedDataWithRootObject:uploadPackage];
     recreatedPackage = [NSKeyedUnarchiver unarchiveObjectWithData:packageData];
 #endif

scripts/build.sh

@@ -94,7 +94,6 @@ function RunXcodebuild() {
 
 # Remove each product when it moves up to Xcode 11
 if [[ $product == 'Firestore' || # #3949
-      $product == 'GoogleDataTransport' || # #3947
       $product == 'InAppMessagingDisplay' # #3948
    ]]; then
   ios_flags=(