Migrate android to CredentialManager

Migrate ios to 7.1.0

Author: Thaina

GoogleSignIn/Editor/GoogleSignInDependencies.xml

@@ -3,16 +3,14 @@
   <!-- See https://github.com/googlesamples/unity-jar-resolver#usage for
     how to configure dependencies -->
   <androidPackages>
-    <androidPackage spec="com.google.android.gms:play-services-auth:20+">
-      <androidSdkPackageIds>
-        <androidSdkPackageId>extra-google-m2repository</androidSdkPackageId>
-      </androidSdkPackageIds>
-    </androidPackage>
+    <androidPackage spec="androidx.credentials:credentials:1.2.2" />
+    <androidPackage spec="androidx.credentials:credentials-play-services-auth:1.2.2" />
+    <androidPackage spec="com.google.android.libraries.identity.googleid:googleid:1.1.0" />
+    <androidPackage spec="com.google.android.gms:play-services-auth:21.2.0" />
   </androidPackages>
 
   <!-- iOS Cocoapod dependencies can be specified by each iosPod element. -->
   <iosPods>
-    <iosPod name="GoogleSignIn" version="~> 6.2.4" bitcodeEnabled="false" minTargetSdk="6.0">
-    </iosPod>
+    <iosPod name="GoogleSignIn" version="~> 7.1.0" bitcodeEnabled="false" />
   </iosPods>
 </dependencies>

GoogleSignIn/GoogleSignIn.cs

@@ -69,9 +69,7 @@ public static GoogleSignInConfiguration Configuration {
         if (theInstance == null || theConfiguration == value || theConfiguration == null) {
           theConfiguration = value;
         } else {
-          throw new SignInException(GoogleSignInStatusCode.DEVELOPER_ERROR,
-              "DefaultInstance already created. " +
-              " Cannot change configuration after creation.");
+          throw new SignInException(GoogleSignInStatusCode.DEVELOPER_ERROR,"DefaultInstance already created. Cannot change configuration after creation.");
         }
       }
 
@@ -105,7 +103,7 @@ internal GoogleSignIn(ISignInImpl impl) {
     }
 
     public void EnableDebugLogging(bool flag) {
-            impl.EnableDebugLogging(flag);
+      impl.EnableDebugLogging(flag);
     }
 
     /// <summary>Starts the authentication process.</summary>
@@ -116,14 +114,13 @@ public void EnableDebugLogging(bool flag) {
     /// </remarks>
     public Task<GoogleSignInUser> SignIn() {
       var tcs = new TaskCompletionSource<GoogleSignInUser>();
-      SignInHelperObject.Instance.StartCoroutine(
-        impl.SignIn().WaitForResult(tcs));
+      SignInHelperObject.Instance.StartCoroutine(impl.SignIn().WaitForResult(tcs));
       return tcs.Task;
     }
 
     public Task<GoogleSignInUser> SignInAsync() {
       var tcs = new TaskCompletionSource<GoogleSignInUser>();
-      impl.SignIn().WaitForResultAsync(tcs);
+      impl.SignIn().WaitForResultAsync(tcs).ContinueWith((task) => {});
       return tcs.Task;
     }
 
@@ -137,14 +134,13 @@ public Task<GoogleSignInUser> SignInAsync() {
     /// </remarks>
     public Task<GoogleSignInUser> SignInSilently() {
       var tcs = new TaskCompletionSource<GoogleSignInUser>();
-      SignInHelperObject.Instance.StartCoroutine(
-          impl.SignInSilently().WaitForResult(tcs));
+      SignInHelperObject.Instance.StartCoroutine(impl.SignInSilently().WaitForResult(tcs));
       return tcs.Task;
     }
 
     public Task<GoogleSignInUser> SignInSilentlyAsync() {
       var tcs = new TaskCompletionSource<GoogleSignInUser>();
-      impl.SignInSilently().WaitForResultAsync(tcs);
+      impl.SignIn().WaitForResultAsync(tcs).ContinueWith((task) => {});
       return tcs.Task;
     }
 

GoogleSignIn/Impl/BaseObject.cs

@@ -35,8 +35,7 @@ public BaseObject(IntPtr intPtr) {
 
     protected HandleRef SelfPtr() {
       if (selfHandleRef.Equals(nullSelf)) {
-        throw new InvalidOperationException(
-          "Attempted to use object after it was cleaned up");
+        throw new InvalidOperationException("Attempted to use object after it was cleaned up");
       }
       return selfHandleRef;
     }
@@ -45,8 +44,7 @@ public virtual void Dispose() {
       selfHandleRef = nullSelf;
     }
 
-    internal delegate UIntPtr OutStringMethod([In, Out] byte[] out_bytes,
-        UIntPtr out_size);
+    internal delegate UIntPtr OutStringMethod([In, Out] byte[] out_bytes,UIntPtr out_size);
 
     internal static String OutParamsToString(OutStringMethod outStringMethod) {
       UIntPtr requiredSize = outStringMethod(null, UIntPtr.Zero);
@@ -58,8 +56,7 @@ internal static String OutParamsToString(OutStringMethod outStringMethod) {
       try {
         byte[] array = new byte[requiredSize.ToUInt32()];
         outStringMethod(array, requiredSize);
-        str = Encoding.UTF8.GetString(array, 0,
-                (int)requiredSize.ToUInt32() - 1);
+        str = Encoding.UTF8.GetString(array, 0, (int)requiredSize.ToUInt32() - 1);
       } catch (Exception e) {
         Debug.LogError("Exception creating string from char array: " + e);
         str = string.Empty;