From 108efb1c26e1768072e9dcad2b19e3589f0152a1 Mon Sep 17 00:00:00 2001 From: Brian Rojas Date: Wed, 11 Dec 2019 18:13:53 -0600 Subject: [PATCH] Change iOS plugin so compiles for Xcode 11, remove Parse dependency, set presenting view controller on sign in --- GoogleSignInPlugin/Assets/Parse.meta | 9 ----- GoogleSignInPlugin/Assets/Parse/LICENSE | 30 --------------- GoogleSignInPlugin/Assets/Parse/LICENSE.meta | 10 ----- GoogleSignInPlugin/Assets/Parse/Plugins.meta | 9 ----- .../Assets/Parse/Plugins/Unity.Compat.dll | Bin 22016 -> 0 bytes .../Parse/Plugins/Unity.Compat.dll.meta | 36 ------------------ .../Assets/Parse/Plugins/Unity.Tasks.dll | Bin 26624 -> 0 bytes .../Assets/Parse/Plugins/Unity.Tasks.dll.meta | 36 ------------------ .../Plugins/iOS/GoogleSignIn/GoogleSignIn.h | 2 +- .../Plugins/iOS/GoogleSignIn/GoogleSignIn.mm | 9 +++-- .../GoogleSignIn/GoogleSignInAppController.mm | 11 +----- build.gradle | 1 - 12 files changed, 8 insertions(+), 145 deletions(-) delete mode 100644 GoogleSignInPlugin/Assets/Parse.meta delete mode 100755 GoogleSignInPlugin/Assets/Parse/LICENSE delete mode 100644 GoogleSignInPlugin/Assets/Parse/LICENSE.meta delete mode 100644 GoogleSignInPlugin/Assets/Parse/Plugins.meta delete mode 100644 GoogleSignInPlugin/Assets/Parse/Plugins/Unity.Compat.dll delete mode 100644 GoogleSignInPlugin/Assets/Parse/Plugins/Unity.Compat.dll.meta delete mode 100644 GoogleSignInPlugin/Assets/Parse/Plugins/Unity.Tasks.dll delete mode 100644 GoogleSignInPlugin/Assets/Parse/Plugins/Unity.Tasks.dll.meta diff --git a/GoogleSignInPlugin/Assets/Parse.meta b/GoogleSignInPlugin/Assets/Parse.meta deleted file mode 100644 index 351c7ed2..00000000 --- a/GoogleSignInPlugin/Assets/Parse.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: d1a8f2ea2fc954f4db9d55a59d097a7d -folderAsset: yes -timeCreated: 1500403331 -licenseType: Pro -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/GoogleSignInPlugin/Assets/Parse/LICENSE b/GoogleSignInPlugin/Assets/Parse/LICENSE deleted file mode 100755 index 4abeb6e9..00000000 --- a/GoogleSignInPlugin/Assets/Parse/LICENSE +++ /dev/null @@ -1,30 +0,0 @@ -BSD License - -For Parse .NET SDK software - -Copyright (c) 2015-present, Parse, LLC. All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - * Neither the name Parse nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/GoogleSignInPlugin/Assets/Parse/LICENSE.meta b/GoogleSignInPlugin/Assets/Parse/LICENSE.meta deleted file mode 100644 index f817f8d8..00000000 --- a/GoogleSignInPlugin/Assets/Parse/LICENSE.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 9dd0e3c9dea104831bc092afe2f6eb5e -labels: -- gvh -timeCreated: 1503959774 -licenseType: Pro -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/GoogleSignInPlugin/Assets/Parse/Plugins.meta b/GoogleSignInPlugin/Assets/Parse/Plugins.meta deleted file mode 100644 index 2b04519c..00000000 --- a/GoogleSignInPlugin/Assets/Parse/Plugins.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: aecfff8cf5706409e93b95c9c1081553 -folderAsset: yes -timeCreated: 1500403331 -licenseType: Pro -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/GoogleSignInPlugin/Assets/Parse/Plugins/Unity.Compat.dll b/GoogleSignInPlugin/Assets/Parse/Plugins/Unity.Compat.dll deleted file mode 100644 index 4b8c275e689246aef94d629fc2923f0c995713d5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 22016 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 bhPKO&Q_8LC?;9P @interface GoogleSignInHandler - : NSObject + : NSObject @end diff --git a/GoogleSignInPlugin/Assets/Plugins/iOS/GoogleSignIn/GoogleSignIn.mm b/GoogleSignInPlugin/Assets/Plugins/iOS/GoogleSignIn/GoogleSignIn.mm index 9b82a370..5cffbc90 100644 --- a/GoogleSignInPlugin/Assets/Plugins/iOS/GoogleSignIn/GoogleSignIn.mm +++ b/GoogleSignInPlugin/Assets/Plugins/iOS/GoogleSignIn/GoogleSignIn.mm @@ -21,6 +21,8 @@ #import +#import "UnityAppController.h" + // These values are in the Unity plugin code. The iOS specific // codes are mapped to these. static const int kStatusCodeSuccessCached = -1; @@ -105,9 +107,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; @@ -226,6 +225,7 @@ bool GoogleSignIn_Configure(void *unused, bool useGameSignIn, void *GoogleSignIn_SignIn() { SignInResult *result = startSignIn(); if (!result) { + [GIDSignIn sharedInstance].presentingViewController = GetAppController().rootViewController; [[GIDSignIn sharedInstance] signIn]; result = currentResult_.get(); } @@ -239,7 +239,8 @@ bool GoogleSignIn_Configure(void *unused, bool useGameSignIn, void *GoogleSignIn_SignInSilently() { SignInResult *result = startSignIn(); if (!result) { - [[GIDSignIn sharedInstance] signInSilently]; + [GIDSignIn sharedInstance].presentingViewController = GetAppController().rootViewController; + [[GIDSignIn sharedInstance] signIn]; result = currentResult_.get(); } return result; diff --git a/GoogleSignInPlugin/Assets/Plugins/iOS/GoogleSignIn/GoogleSignInAppController.mm b/GoogleSignInPlugin/Assets/Plugins/iOS/GoogleSignIn/GoogleSignInAppController.mm index 33631489..c4cbc551 100644 --- a/GoogleSignInPlugin/Assets/Plugins/iOS/GoogleSignIn/GoogleSignInAppController.mm +++ b/GoogleSignInPlugin/Assets/Plugins/iOS/GoogleSignIn/GoogleSignInAppController.mm @@ -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 @@ -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; } @@ -113,11 +110,7 @@ - (BOOL)GoogleSignInAppController:(UIApplication *)app [self GoogleSignInAppController:app openURL:url options:options]; return [[GIDSignIn sharedInstance] - handleURL:url - sourceApplication: - options[UIApplicationOpenURLOptionsSourceApplicationKey] - annotation: - options[UIApplicationOpenURLOptionsAnnotationKey]] || + handleURL:url] || handled; } diff --git a/build.gradle b/build.gradle index 50f8d7ec..9d47abbc 100644 --- a/build.gradle +++ b/build.gradle @@ -257,7 +257,6 @@ task package_plugin () { "-importPackage", jarresolver_package, "-exportPackage", "Assets/GoogleSignIn", - "Assets/Parse", "Assets/PlayServicesResolver", "Assets/Plugins", "${exportPath}",