From 20dda826ee4f0e37928fdab739b51d638d444823 Mon Sep 17 00:00:00 2001 From: pinlu Date: Wed, 23 Nov 2022 19:40:25 -0800 Subject: [PATCH 1/2] Fix macro in GIDGoogleUser.m --- GoogleSignIn/Sources/GIDGoogleUser.m | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/GoogleSignIn/Sources/GIDGoogleUser.m b/GoogleSignIn/Sources/GIDGoogleUser.m index 4291ba38..c1112ea8 100644 --- a/GoogleSignIn/Sources/GIDGoogleUser.m +++ b/GoogleSignIn/Sources/GIDGoogleUser.m @@ -184,11 +184,11 @@ - (OIDAuthState *) authState{ } - (void)addScopes:(NSArray *)scopes -#if TARGET_OS_IOS && !TARGET_OS_MACCATALYST +#if TARGET_OS_IOS || TARGET_OS_MACCATALYST presentingViewController:(UIViewController *)presentingViewController -#elif TARGET_OS_OSX || TARGET_OS_MACCATALYST +#elif TARGET_OS_OSX presentingWindow:(NSWindow *)presentingWindow -#endif // TARGET_OS_IOS && !TARGET_OS_MACCATALYST +#endif // TARGET_OS_IOS || TARGET_OS_MACCATALYST completion:(nullable void (^)(GIDUserAuth *_Nullable userAuth, NSError *_Nullable error))completion { if (self != GIDSignIn.sharedInstance.currentUser) { From c80aade4f71a0cd2affe115ac855906d35968d17 Mon Sep 17 00:00:00 2001 From: pinlu Date: Tue, 29 Nov 2022 10:58:15 -0800 Subject: [PATCH 2/2] Update macro in GIDGoogleUser --- GoogleSignIn/Sources/GIDGoogleUser.m | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/GoogleSignIn/Sources/GIDGoogleUser.m b/GoogleSignIn/Sources/GIDGoogleUser.m index c1112ea8..d6ab89b7 100644 --- a/GoogleSignIn/Sources/GIDGoogleUser.m +++ b/GoogleSignIn/Sources/GIDGoogleUser.m @@ -204,11 +204,11 @@ - (void)addScopes:(NSArray *)scopes } [GIDSignIn.sharedInstance addScopes:scopes -#if TARGET_OS_IOS && !TARGET_OS_MACCATALYST +#if TARGET_OS_IOS || TARGET_OS_MACCATALYST presentingViewController:presentingViewController -#elif TARGET_OS_OSX || TARGET_OS_MACCATALYST +#elif TARGET_OS_OSX presentingWindow:presentingWindow -#endif // TARGET_OS_IOS && !TARGET_OS_MACCATALYST +#endif // TARGET_OS_IOS || TARGET_OS_MACCATALYST completion:completion]; }