Skip to content

Fix macro in GIDGoogleUser.m #259

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 28, 2022
Merged

Fix macro in GIDGoogleUser.m #259

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions GoogleSignIn/Sources/GIDGoogleUser.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,11 +184,11 @@ - (OIDAuthState *) authState{
}

- (void)addScopes:(NSArray<NSString *> *)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
Copy link
Contributor

@petea petea Nov 29, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Alex-4-Git note that you missed an instance of the same platform check mistake below and the build action is now failing for that reason:

https://github.com/google/GoogleSignIn-iOS/actions/runs/3572147376/jobs/6004706482

completion:(nullable void (^)(GIDUserAuth *_Nullable userAuth,
NSError *_Nullable error))completion {
if (self != GIDSignIn.sharedInstance.currentUser) {
Expand Down