Skip to content

Update iOS pod to >= 5.0.0 and apply migrations for native plugin code. #126

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

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Update iOS pod to >= 5.0.0 and apply migrations for native plugin code. #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
acaaf79
Update iOS pod to >= 5.0.0 and apply migrations for native plugin code.
lukezbihlyj Feb 10, 2020
52e27e0
Fix an issue with the view controller not being set correctly.
lukezbihlyj Feb 11, 2020
48a6b89
Fix an issue with the view controller not being set correctly.
lukezbihlyj Feb 11, 2020
6051fa8
Remove this unnecessary file.
lukezbihlyj Feb 11, 2020
cb46070
Merge branch 'master' of github.com:lukezbihlyj/google-signin-unity
lukezbihlyj Feb 11, 2020
cb3f705
Revert meta files.
lukezbihlyj Feb 11, 2020
7af67e1
Lock to ~> 5.0.0 because of the 6.0.0 release
lukezbihlyj Aug 26, 2021
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
2 changes: 1 addition & 1 deletion GoogleSignInPlugin/Assets/GoogleSignIn/Editor/GoogleSignInDependencies.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<!-- iOS Cocoapod dependencies can be specified by each iosPod element. -->
<iosPods>
<iosPod name="GoogleSignIn" version=">= 4.0.2" bitcodeEnabled="false"
<iosPod name="GoogleSignIn" version="~> 5.0.0" bitcodeEnabled="false"
minTargetSdk="6.0">
</iosPod>
</iosPods>
Expand Down
2 changes: 1 addition & 1 deletion GoogleSignInPlugin/Assets/Plugins/iOS/GoogleSignIn/GoogleSignIn.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
*/
#import <GoogleSignIn/GIDSignIn.h>
@interface GoogleSignInHandler
: NSObject <GIDSignInDelegate, GIDSignInUIDelegate>
: NSObject <GIDSignInDelegate>

@end
7 changes: 3 additions & 4 deletions GoogleSignInPlugin/Assets/Plugins/iOS/GoogleSignIn/GoogleSignIn.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,6 @@ - (void)signIn:(GIDSignIn *)signIn
case kGIDSignInErrorCodeKeychain:
currentResult_->result_code = kStatusCodeInternalError;
break;
case kGIDSignInErrorCodeNoSignInHandlersInstalled:
currentResult_->result_code = kStatusCodeDeveloperError;
break;
case kGIDSignInErrorCodeHasNoAuthInKeychain:
currentResult_->result_code = kStatusCodeError;
break;
Expand Down Expand Up @@ -192,6 +189,8 @@ bool GoogleSignIn_Configure(void *unused, bool useGameSignIn,
[NSString stringWithUTF8String:accountName];
}

[GIDSignIn sharedInstance].presentingViewController = UnityGetGLViewController();

return !useGameSignIn;
}

Expand Down Expand Up @@ -239,7 +238,7 @@ bool GoogleSignIn_Configure(void *unused, bool useGameSignIn,
void *GoogleSignIn_SignInSilently() {
SignInResult *result = startSignIn();
if (!result) {
[[GIDSignIn sharedInstance] signInSilently];
[[GIDSignIn sharedInstance] restorePreviousSignIn];
result = currentResult_.get();
}
return result;
Expand Down
12 changes: 2 additions & 10 deletions GoogleSignInPlugin/Assets/Plugins/iOS/GoogleSignIn/GoogleSignInAppController.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ - (BOOL)GoogleSignInAppController:(UIApplication *)application
// Setup the Sign-In instance.
GIDSignIn *signIn = [GIDSignIn sharedInstance];
signIn.clientID = clientId;
signIn.uiDelegate = gsiHandler;
signIn.delegate = gsiHandler;

// looks like it's just calling itself, but the implementations were swapped
Expand All @@ -96,9 +95,7 @@ - (BOOL)GoogleSignInAppController:(UIApplication *)application
sourceApplication:sourceApplication
annotation:annotation];

return [[GIDSignIn sharedInstance] handleURL:url
sourceApplication:sourceApplication
annotation:annotation] ||
return [[GIDSignIn sharedInstance] handleURL:url] ||
handled;
}

Expand All @@ -112,12 +109,7 @@ - (BOOL)GoogleSignInAppController:(UIApplication *)app
BOOL handled =
[self GoogleSignInAppController:app openURL:url options:options];

return [[GIDSignIn sharedInstance]
handleURL:url
sourceApplication:
options[UIApplicationOpenURLOptionsSourceApplicationKey]
annotation:
options[UIApplicationOpenURLOptionsAnnotationKey]] ||
return [[GIDSignIn sharedInstance] handleURL:url] ||
handled;
}

Expand Down