Fix AppCheck Catalyst build on Xcode 12.4 (#8184)

Author: paulb777

.github/workflows/app_check.yml

@@ -22,6 +22,17 @@ jobs:
     - name: FirebaseAppCheck
       run: scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseAppCheck.podspec --platforms=${{ matrix.target }}
 
+  catalyst:
+    # Don't run on private repo unless it is a PR.
+    if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
+    runs-on: macOS-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Setup Bundler
+      run: scripts/setup_bundler.sh
+    - name: Setup project and Build for Catalyst
+      run: scripts/test_catalyst.sh FirebaseAppCheck test FirebaseAppCheck-Unit-unit
+
   diagnostics:
     # Don't run on private repo unless it is a PR.
     if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'

FirebaseAppCheck/Sources/AppAttestProvider/DCAppAttestService+FIRAppAttestService.h

@@ -15,7 +15,7 @@
  */
 
 // Currently DCAppAttestService is available on iOS only.
-#if TARGET_OS_IOS
+#if TARGET_OS_IOS && !TARGET_OS_MACCATALYST  // Catalyst should be possible with Xcode 12.5+
 
 #import <DeviceCheck/DeviceCheck.h>
 
@@ -31,4 +31,4 @@ API_UNAVAILABLE(macos, tvos, watchos)
 
 NS_ASSUME_NONNULL_END
 
-#endif  // TARGET_OS_IOS
+#endif  // TARGET_OS_IOS && !TARGET_OS_MACCATALYST

FirebaseAppCheck/Sources/AppAttestProvider/FIRAppAttestProvider.m

@@ -132,7 +132,7 @@ - (instancetype)initWithAppAttestService:(id<FIRAppAttestService>)appAttestServi
 }
 
 - (nullable instancetype)initWithApp:(FIRApp *)app {
-#if TARGET_OS_IOS
+#if TARGET_OS_IOS && !TARGET_OS_MACCATALYST  // Catalyst should be possible with Xcode 12.5+
   NSURLSession *URLSession = [NSURLSession
       sessionWithConfiguration:[NSURLSessionConfiguration ephemeralSessionConfiguration]];
 
@@ -159,9 +159,9 @@ - (nullable instancetype)initWithApp:(FIRApp *)app {
                              APIService:appAttestAPIService
                            keyIDStorage:keyIDStorage
                         artifactStorage:artifactStorage];
-#else   // TARGET_OS_IOS
+#else   // TARGET_OS_IOS && !TARGET_OS_MACCATALYST
   return nil;
-#endif  // TARGET_OS_IOS
+#endif  // TARGET_OS_IOS && !TARGET_OS_MACCATALYST
 }
 
 #pragma mark - FIRAppCheckProvider

FirebaseAppCheck/Tests/Unit/AppAttestProvider/FIRAppAttestProviderTests.m

@@ -92,6 +92,9 @@ - (void)tearDown {
 
 #pragma mark - Init tests
 
+#if !TARGET_OS_MACCATALYST  // Catalyst should be possible with Xcode 12.5+
+// Keychain dependent logic require additional configuration on Catalyst (enabling Keychain
+// sharing). For now, keychain dependent tests are disabled for Catalyst.
 - (void)testInitWithValidApp {
   FIROptions *options = [[FIROptions alloc] initWithGoogleAppID:@"app_id" GCMSenderID:@"sender_id"];
   options.APIKey = @"api_key";
@@ -100,6 +103,7 @@ - (void)testInitWithValidApp {
 
   XCTAssertNotNil([[FIRAppAttestProvider alloc] initWithApp:app]);
 }
+#endif  // !TARGET_OS_MACCATALYST
 
 #pragma mark - Initial handshake (attestation)
 

FirebaseAppCheck/Tests/Unit/AppAttestProvider/Storage/FIRAppAttestArtifactStorageTests.m

@@ -46,6 +46,8 @@ - (void)tearDown {
   [super tearDown];
 }
 
+#if !TARGET_OS_MACCATALYST  // Catalyst should be possible with Xcode 12.5+
+
 - (void)testSetAndGetArtifact {
   [self assertSetGetForStorage];
 }
@@ -185,5 +187,6 @@ - (void)assertIndependentSetGetForStoragesWithAppName1:(NSString *)appName1
   [storage2 setArtifact:nil forKey:keyID];
   XCTAssert(FBLWaitForPromisesWithTimeout(0.5));
 }
+#endif  // !TARGET_OS_MACCATALYST
 
 @end

FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckIntegrationTests.m

@@ -125,6 +125,7 @@ - (void)testDefaultAppCheckProvider {
   }
 }
 
+#if !TARGET_OS_MACCATALYST  // Catalyst should be possible with Xcode 12.5+
 - (void)testSetAppCheckProviderFactoryWithDefaultApp {
   NSString *appName = kFIRDefaultAppName;
 
@@ -168,6 +169,7 @@ - (void)testSetAppCheckProviderFactoryWithDefaultApp {
   OCMVerifyAll(self.mockProviderFactory);
   OCMVerifyAll(self.mockAppCheckProvider);
 }
+#endif  // !TARGET_OS_MACCATALYST
 
 #pragma mark - Helpers
 

FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckStorageTests.m

@@ -45,6 +45,8 @@ - (void)tearDown {
   [super tearDown];
 }
 
+#if !TARGET_OS_MACCATALYST  // Catalyst should be possible with Xcode 12.5+
+
 - (void)testSetAndGetToken {
   FIRAppCheckToken *tokenToStore = [[FIRAppCheckToken alloc] initWithToken:@"token"
                                                             expirationDate:[NSDate distantPast]];
@@ -93,5 +95,6 @@ - (void)testSetTokenPerApp {
   XCTAssertNil(getPromise.value);
   XCTAssertNil(getPromise.error);
 }
+#endif  // !TARGET_OS_MACCATALYST
 
 @end