Skip to content

Commit af9540c

Browse files
committed
Merge branch 'main' into refactorGSI
2 parents e95e502 + 625dc9e commit af9540c

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

GoogleSignIn/Sources/GIDSignIn_Private.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ typedef void (^GIDDisconnectCompletion)(NSError *_Nullable error);
7878
/// instance will be returned reflecting the new scopes and saved sign-in state will be updated.
7979
///
8080
/// @param scopes The scopes to ask the user to consent to.
81-
/// @param presentingViewController The view controller used to present `SFSafariViewContoller` on
81+
/// @param presentingViewController The view controller used to present `SFSafariViewController` on
8282
/// iOS 9 and 10 and to supply `presentationContextProvider` for `ASWebAuthenticationSession` on
8383
/// iOS 13+.
8484
/// @param completion The block that is called on completion. This block will be called asynchronously

GoogleSignIn/Sources/Public/GoogleSignIn/GIDGoogleUser.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ NS_ASSUME_NONNULL_BEGIN
8686
/// instance will be returned reflecting the new scopes and saved sign-in state will be updated.
8787
///
8888
/// @param scopes The scopes to ask the user to consent to.
89-
/// @param presentingViewController The view controller used to present `SFSafariViewContoller` on
89+
/// @param presentingViewController The view controller used to present `SFSafariViewController` on
9090
/// iOS 9 and 10 and to supply `presentationContextProvider` for `ASWebAuthenticationSession` on
9191
/// iOS 13+.
9292
/// @param completion The optional block that is called on completion. This block will be called

GoogleSignIn/Sources/Public/GoogleSignIn/GIDSignIn.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ typedef NS_ERROR_ENUM(kGIDSignInErrorDomain, GIDSignInErrorCode) {
111111
/// starting up, (e.g in `application:didFinishLaunchingWithOptions:`); instead use the
112112
/// `restorePreviousSignInWithCompletion:` method to restore a previous sign-in.
113113
///
114-
/// @param presentingViewController The view controller used to present `SFSafariViewContoller` on
114+
/// @param presentingViewController The view controller used to present `SFSafariViewController` on
115115
/// iOS 9 and 10 and to supply `presentationContextProvider` for `ASWebAuthenticationSession` on
116116
/// iOS 13+.
117117
/// @param completion The optional block that is called on completion. This block will
@@ -129,7 +129,7 @@ typedef NS_ERROR_ENUM(kGIDSignInErrorDomain, GIDSignInErrorCode) {
129129
/// starting up, (e.g in `application:didFinishLaunchingWithOptions:`); instead use the
130130
/// `restorePreviousSignInWithCompletion:` method to restore a previous sign-in.
131131
///
132-
/// @param presentingViewController The view controller used to present `SFSafariViewContoller` on
132+
/// @param presentingViewController The view controller used to present `SFSafariViewController` on
133133
/// iOS 9 and 10 and to supply `presentationContextProvider` for `ASWebAuthenticationSession` on
134134
/// iOS 13+.
135135
/// @param hint An optional hint for the authorization server, for example the user's ID or email
@@ -150,7 +150,7 @@ typedef NS_ERROR_ENUM(kGIDSignInErrorDomain, GIDSignInErrorCode) {
150150
/// starting up, (e.g in `application:didFinishLaunchingWithOptions:`); instead use the
151151
/// `restorePreviousSignInWithCompletion:` method to restore a previous sign-in.
152152
///
153-
/// @param presentingViewController The view controller used to present `SFSafariViewContoller` on
153+
/// @param presentingViewController The view controller used to present `SFSafariViewController` on
154154
/// iOS 9 and 10.
155155
/// @param hint An optional hint for the authorization server, for example the user's ID or email
156156
/// address, to be prefilled if possible.

0 commit comments

Comments
 (0)