[App Check] Add SPM AppCheckCore 12.x support

CHANGELOG.md

@@ -1,6 +1,7 @@
 # Unreleased
 - Fix a crash when a server error response carries a non-string value under its `error` key. The EMM error handler sent `-hasPrefix:` to whatever value was present, raising an unrecognized selector exception on a number, array or object.
 - Fix a custom `nonce` and requested token `claims` being dropped when a sign-in is continued after a Device Policy app restart.
+- Added Swift Package Manager support for AppCheckCore 12.x, enabling compatibility with Firebase 13. CocoaPods installations remain restricted to AppCheckCore 11.x
 
 # 10.0.0
 - **BREAKING**: Update to AppAuth 3.0.0 and GTMAppAuth 6.0.0, which raises the minimum deployment targets to iOS 15.0 and macOS 12.0, widens the `GTMSessionFetcher` dependency to allow 4.x and 5.x, and renames the version-specific Swift Package Manager manifest to `Package@swift-5.7.swift`. Projects that must keep supporting earlier OS versions should stay on GoogleSignIn 9.2.0. ([#628](https://github.com/google/GoogleSignIn-iOS/pull/628))

GoogleSignIn/Sources/GIDAppCheck/Implementations/Fake/GIDAppCheckProviderFake.h

@@ -16,7 +16,7 @@
 #import <Foundation/Foundation.h>
 
 #if TARGET_OS_IOS && !TARGET_OS_MACCATALYST
-#import <AppCheckCore/GACAppCheckProvider.h>
+@import AppCheckCore;
 
 @class GACAppCheckToken;
 

GoogleSignIn/Sources/GIDAppCheck/Implementations/Fake/GIDAppCheckProviderFake.m

@@ -16,7 +16,7 @@
 
 #if TARGET_OS_IOS && !TARGET_OS_MACCATALYST
 
-#import <AppCheckCore/GACAppCheckToken.h>
+@import AppCheckCore;
 
 NSUInteger const kGIDAppCheckProviderFakeError = 1;
 

GoogleSignIn/Sources/GIDAppCheck/Implementations/GIDAppCheck.m

@@ -18,11 +18,7 @@
 
 #if TARGET_OS_IOS && !TARGET_OS_MACCATALYST
 
-#import <AppCheckCore/GACAppCheck.h>
-#import <AppCheckCore/GACAppCheckSettings.h>
-#import <AppCheckCore/GACAppCheckTokenResult.h>
-#import <AppCheckCore/GACAppAttestProvider.h>
-#import <AppCheckCore/GACAppCheckDebugProvider.h>
+@import AppCheckCore;
 
 #import "GoogleSignIn/Sources/GIDAppCheck/Implementations/GIDAppCheck.h"
 #import "GoogleSignIn/Sources/Public/GoogleSignIn/GIDAppCheckError.h"
@@ -117,13 +113,7 @@ - (void)prepareForAppCheckWithCompletion:(nullable GIDAppCheckPrepareCompletion)
     [self.appCheck limitedUseTokenWithCompletion:^(GACAppCheckTokenResult * _Nonnull result) {
       NSError * __block maybeError = result.error;
       @synchronized (self) {
-        if (!result.token && !result.error) {
-          maybeError = [NSError errorWithDomain:kGIDAppCheckErrorDomain
-                                           code:kGIDAppCheckUnexpectedError
-                                       userInfo:nil];
-        }
-
-        if (result.token) {
+        if (!result.error) {
           [self.userDefaults setBool:YES forKey:kGIDAppCheckPreparedKey];
         }
 
@@ -143,7 +133,7 @@ - (void)prepareForAppCheckWithCompletion:(nullable GIDAppCheckPrepareCompletion)
 - (void)getLimitedUseTokenWithCompletion:(nullable GIDAppCheckTokenCompletion)completion {
   dispatch_async(self.workerQueue, ^{
     [self.appCheck limitedUseTokenWithCompletion:^(GACAppCheckTokenResult * _Nonnull result) {
-      if (result.token) {
+      if (!result.error) {
         [self.userDefaults setBool:YES forKey:kGIDAppCheckPreparedKey];
       }
       if (completion) {

GoogleSignIn/Sources/GIDSignIn.m

@@ -30,7 +30,7 @@
 #import "GoogleSignIn/Sources/GIDSignInCallbackSchemes.h"
 #import "GoogleSignIn/Sources/GIDClaimsInternalOptions.h"
 #if TARGET_OS_IOS && !TARGET_OS_MACCATALYST
-#import <AppCheckCore/GACAppCheckToken.h>
+@import AppCheckCore;
 #import "GoogleSignIn/Sources/GIDAppCheck/Implementations/GIDAppCheck.h"
 #import "GoogleSignIn/Sources/GIDAppCheck/UI/GIDActivityIndicatorViewController.h"
 #import "GoogleSignIn/Sources/GIDEMMErrorHandler.h"

GoogleSignIn/Tests/Unit/GIDAppCheckTest.m

@@ -17,7 +17,7 @@
 #if TARGET_OS_IOS && !TARGET_OS_MACCATALYST
 
 #import <XCTest/XCTest.h>
-#import <AppCheckCore/GACAppCheckToken.h>
+@import AppCheckCore;
 #import "GoogleSignIn/Sources/GIDAppCheck/Implementations/GIDAppCheck.h"
 #import "GoogleSignIn/Sources/GIDAppCheck/Implementations/Fake/GIDAppCheckProviderFake.h"
 #import "GoogleSignIn/Sources/Public/GoogleSignIn/GIDAppCheckError.h"

GoogleSignIn/Tests/Unit/GIDSignInTest.m

@@ -35,7 +35,7 @@
 #import "GoogleSignIn/Sources/GIDClaimsInternalOptions.h"
 
 #if TARGET_OS_IOS && !TARGET_OS_MACCATALYST
-#import <AppCheckCore/GACAppCheckToken.h>
+@import AppCheckCore;
 #import "GoogleSignIn/Sources/GIDAppCheck/Implementations/GIDAppCheck.h"
 #import "GoogleSignIn/Sources/GIDAppCheck/Implementations/Fake/GIDAppCheckProviderFake.h"
 #import "GoogleSignIn/Sources/GIDEMMErrorHandler.h"
@@ -426,8 +426,11 @@ - (void)testConfigureFailsNoTokenOrError {
     XCTestExpectation *configureFailsExpecation =
     [self expectationWithDescription:@"Configure fails expectation"];
 
+    NSError *expectedError = [NSError errorWithDomain:kGIDAppCheckErrorDomain
+                                                 code:kGIDAppCheckUnexpectedError
+                                             userInfo:nil];
     GIDAppCheckProviderFake *fakeProvider =
-        [[GIDAppCheckProviderFake alloc] initWithAppCheckToken:nil error:nil];
+        [[GIDAppCheckProviderFake alloc] initWithAppCheckToken:nil error:expectedError];
     GIDAppCheck *appCheck =
         [[GIDAppCheck alloc] initWithAppCheckProvider:fakeProvider
                                          userDefaults:_testUserDefaults];

Package.swift

@@ -46,7 +46,7 @@ let package = Package(
       from: "3.0.0"),
     .package(
       url: "https://github.com/google/app-check.git",
-      from: "11.0.0"),
+      "11.0.0" ..< "13.0.0"),
     .package(
       url: "https://github.com/google/GTMAppAuth.git",
       from: "6.0.0"),