Recent migration attempt

.gitignore

@@ -1,6 +1,7 @@
+**/.DS_Store
+
 .gradle/
 .idea/
-.vscode/
 bin/
 build/
 *.iml

.vscode/settings.json

@@ -0,0 +1,55 @@
+{
+    "files.exclude": {
+        "**/.DS_Store": true,
+        "**/.git": true,
+        "**/.gitmodules": true,
+        "**/*.booproj": true,
+        "**/*.pidb": true,
+        "**/*.suo": true,
+        "**/*.user": true,
+        "**/*.userprefs": true,
+        "**/*.unityproj": true,
+        "**/*.dll": true,
+        "**/*.exe": true,
+        "**/*.pdf": true,
+        "**/*.mid": true,
+        "**/*.midi": true,
+        "**/*.wav": true,
+        "**/*.gif": true,
+        "**/*.ico": true,
+        "**/*.jpg": true,
+        "**/*.jpeg": true,
+        "**/*.png": true,
+        "**/*.psd": true,
+        "**/*.tga": true,
+        "**/*.tif": true,
+        "**/*.tiff": true,
+        "**/*.3ds": true,
+        "**/*.3DS": true,
+        "**/*.fbx": true,
+        "**/*.FBX": true,
+        "**/*.lxo": true,
+        "**/*.LXO": true,
+        "**/*.ma": true,
+        "**/*.MA": true,
+        "**/*.obj": true,
+        "**/*.OBJ": true,
+        "**/*.asset": true,
+        "**/*.cubemap": true,
+        "**/*.flare": true,
+        "**/*.mat": true,
+        "**/*.meta": true,
+        "**/*.prefab": true,
+        "**/*.unity": true,
+        "build/": true,
+        "Build/": true,
+        "Library/": true,
+        "library/": true,
+        "obj/": true,
+        "Obj/": true,
+        "ProjectSettings/": true,
+        "temp/": true,
+        "Temp/": true
+    },
+    "dotnet.defaultSolution": "TestGoogleSignIn.sln"
+}

Editor/iOS/PListImporter.cs

@@ -0,0 +1,21 @@
+#if UNITY_EDITOR
+using System.IO;
+
+using UnityEngine;
+
+using UnityEditor.AssetImporters;
+
+[ScriptedImporter(1, "plist")]
+public class PListImporter : ScriptedImporter
+{
+	public override void OnImportAsset(AssetImportContext ctx)
+	{
+		if(ctx.mainObject is TextAsset)
+			return;
+
+		var subAsset = new TextAsset(File.ReadAllText(ctx.assetPath));
+		ctx.AddObjectToAsset("text", subAsset);
+		ctx.SetMainObject(subAsset);
+	}
+}
+#endif

Editor/iOS/PListProcessor.cs

@@ -0,0 +1,67 @@
+#if UNITY_EDITOR
+using UnityEngine;
+
+using UnityEditor;
+using UnityEditor.iOS.Xcode;
+
+using UnityEditor.Build;
+using UnityEditor.Build.Reporting;
+
+using System;
+using System.IO;
+using System.Linq;
+using System.Collections.Generic;
+
+public class PListProcessor : IPostprocessBuildWithReport
+{
+    public int callbackOrder => 99999;
+
+    public void OnPostprocessBuild(BuildReport report)
+    {
+#if UNITY_IOS
+		string projectBundleId = PlayerSettings.GetApplicationIdentifier(BuildTargetGroup.iOS);
+		var plistFiles = AssetDatabase.FindAssets("glob:\"**/*.plist\"").Select((guid) => {
+			var doc = new PlistDocument();
+			doc.ReadFromFile(AssetDatabase.GUIDToAssetPath(guid));
+			return doc;
+		}).Where((doc) => {
+			return doc.root.values.TryGetValue("BUNDLE_ID",out var element) && element.AsString() == projectBundleId;
+		}).ToArray();
+
+		if(!(plistFiles?.Length > 0))
+			return;
+
+		var google = plistFiles.FirstOrDefault();
+
+		if(!(google.root.values.TryGetValue("CLIENT_ID",out var CLIENT_ID) && CLIENT_ID?.AsString() is string clientID && clientID.EndsWith("googleusercontent.com")))
+			throw new KeyNotFoundException("CLIENT_ID");
+		if(!(google.root.values.TryGetValue("REVERSED_CLIENT_ID",out var REVERSED_CLIENT_ID) && REVERSED_CLIENT_ID?.AsString() is string reversedClientID && reversedClientID.StartsWith("com.googleusercontent")))
+			throw new KeyNotFoundException("REVERSED_CLIENT_ID");
+
+		string plistPath = Path.Combine( report.summary.outputPath, "Info.plist" );
+
+		var info = new PlistDocument();
+		info.ReadFromFile(plistPath);
+
+		info.root.SetString("GIDClientID",clientID);
+		var CFBundleURLTypes = (info.root.values.TryGetValue("CFBundleURLTypes",out var element) ? element.AsArray() : null) ?? info.root.CreateArray("CFBundleURLTypes");
+		if(!(CFBundleURLTypes?.values?.Count > 0 && CFBundleURLTypes.values.OfType<PlistElementDict>().Select((dict) => dict.values.TryGetValue("CFBundleURLSchemes",out var value) ? value?.AsArray() : null).OfType<PlistElementArray>().SelectMany((array) => array.values).Any((item) => item?.AsString() == reversedClientID)))
+		{
+			var dict = CFBundleURLTypes.AddDict();
+			dict.SetString("CFBundleTypeRole","Editor");
+			dict.CreateArray("CFBundleURLSchemes").AddString(reversedClientID);
+		}
+
+		if(google.root.values.TryGetValue("WEB_CLIENT_ID",out var WEB_CLIENT_ID) && WEB_CLIENT_ID?.AsString() is string webClientID && !string.IsNullOrWhiteSpace(webClientID))
+		{
+			if(webClientID.EndsWith("googleusercontent.com"))
+				info.root.SetString("GIDServerClientID",webClientID);
+			else throw new ArgumentException("WebClientID");
+		}
+
+		info.WriteToFile(plistPath);
+#endif
+    }
+}
+
+#endif

GoogleSignIn.asmdef

@@ -0,0 +1,3 @@
+{
+	"name": "GoogleSignin"
+}

GoogleSignInPlugin/Assets/GoogleSignIn/Editor/GoogleSignInDependencies.xml → GoogleSignIn/Editor/GoogleSignInDependencies.xml

@@ -3,17 +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.0.2" bitcodeEnabled="false"
-        minTargetSdk="6.0">
-    </iosPod>
+    <iosPod name="GoogleSignIn" version="~> 7.1.0" bitcodeEnabled="false" />
   </iosPods>
 </dependencies>

GoogleSignInPlugin/Assets/GoogleSignIn/Editor/google-signin-plugin_v1.0.1.txt → GoogleSignIn/Editor/google-signin-plugin_v1.0.4.txt

@@ -1,27 +1,33 @@
-Assets/GoogleSignIn/Editor/GoogleSignInDependencies.xml
-Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.1/google-signin-support-1.0.1.aar
-Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.1/google-signin-support-1.0.1.aar.md5
-Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.1/google-signin-support-1.0.1.aar.sha1
-Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.1/google-signin-support-1.0.1.pom
-Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.1/google-signin-support-1.0.1.pom.md5
-Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.1/google-signin-support-1.0.1.pom.sha1
-Assets/GoogleSignIn/Future.cs
-Assets/GoogleSignIn/GoogleSignIn.cs
-Assets/GoogleSignIn/GoogleSignInConfiguration.cs
-Assets/GoogleSignIn/GoogleSignInStatusCode.cs
-Assets/GoogleSignIn/GoogleSignInUser.cs
-Assets/GoogleSignIn/Impl/BaseObject.cs
-Assets/GoogleSignIn/Impl/GoogleSignInImpl.cs
-Assets/GoogleSignIn/Impl/NativeFuture.cs
-Assets/GoogleSignIn/Impl/SignInHelperObject.cs
+Assets/PlayServicesResolver/Editor/Google.VersionHandlerImpl_v1.2.89.0.dll
+Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.89.0.dll
+Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll
+Assets/PlayServicesResolver/Editor/Google.JarResolver_v1.2.89.0.dll
+Assets/Plugins/iOS/GoogleSignIn/GoogleSignInAppController.mm
+Assets/Plugins/iOS/GoogleSignIn/GoogleSignInAppController.h
+Assets/Plugins/iOS/GoogleSignIn/GoogleSignIn.h
+Assets/Plugins/iOS/GoogleSignIn/GoogleSignIn.mm
 Assets/Parse/LICENSE
 Assets/Parse/Plugins/Unity.Compat.dll
 Assets/Parse/Plugins/Unity.Tasks.dll
-Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.54.0.dll
-Assets/PlayServicesResolver/Editor/Google.JarResolver_v1.2.54.0.dll
-Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll
-Assets/PlayServicesResolver/Editor/Google.VersionHandlerImpl_v1.2.54.0.dll
-Assets/PlayServicesResolver/Editor/play-services-resolver_v1.2.54.0.txt
-Assets/Plugins/Android/native-googlesignin-release.aar
-Assets/Plugins/iOS/GoogleSignIn/GoogleSignInAppController.h
-Assets/Plugins/iOS/GoogleSignIn/GoogleSignInAppController.mm
+Assets/SignInSample/MainScene.unity
+Assets/SignInSample/SigninSampleScript.cs
+Assets/GoogleSignIn/Impl/GoogleSignInImpl.cs
+Assets/GoogleSignIn/Impl/SignInHelperObject.cs
+Assets/GoogleSignIn/Impl/NativeFuture.cs
+Assets/GoogleSignIn/Impl/BaseObject.cs
+Assets/GoogleSignIn/GoogleSignIn.cs
+Assets/GoogleSignIn/GoogleSignInConfiguration.cs
+Assets/GoogleSignIn/Future.cs
+Assets/GoogleSignIn/GoogleSignInUser.cs
+Assets/GoogleSignIn/GoogleSignInStatusCode.cs
+Assets/GoogleSignIn/Editor/GoogleSignInDependencies.xml
+Assets/GoogleSignIn/Editor/GoogleSignInSupportDependencies.xml
+Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/maven-metadata.xml
+Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/maven-metadata.xml.md5
+Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/maven-metadata.xml.sha1
+Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.pom.md5
+Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.srcaar.sha1
+Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.pom.sha1
+Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.srcaar
+Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.pom
+Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.srcaar.md5

GoogleSignInPlugin/Assets/GoogleSignIn/Future.cs → GoogleSignIn/Future.cs

@@ -55,14 +55,14 @@ internal Future(FutureAPIImpl<T> impl) {
     /// Gets the status.
     /// </summary>
     /// <value>The status is set when Pending == false.</value>
-    GoogleSignInStatusCode Status { get { return apiImpl.Status; } }
+    public GoogleSignInStatusCode Status { get { return apiImpl.Status; } }
 
     /// <summary>
     /// Gets the result.
     /// </summary>
     /// <value>The result is set when Pending == false and there is no error.
     /// </value>
-    T Result { get { return apiImpl.Result; } }
+    public T Result { get { return apiImpl.Result; } }
 
     /// <summary>
     /// Waits for result then completes the TaskCompleationSource.
@@ -71,14 +71,29 @@ internal Future(FutureAPIImpl<T> impl) {
     /// <param name="tcs">Tcs.</param>
     internal IEnumerator WaitForResult(TaskCompletionSource<T> tcs) {
       yield return new WaitUntil(() => !Pending);
-      if (Status == GoogleSignInStatusCode.Canceled) {
+      yield return null;
+      if (Status == GoogleSignInStatusCode.CANCELED) {
         tcs.SetCanceled();
-      } else if (Status == GoogleSignInStatusCode.Success ||
-            Status == GoogleSignInStatusCode.SuccessCached) {
+      } else if (Status == GoogleSignInStatusCode.SUCCESS ||
+            Status == GoogleSignInStatusCode.SUCCESS_CACHE) {
+        tcs.SetResult(Result);
+      } else {
+        tcs.SetException(new GoogleSignIn.SignInException(Status));
+      }
+    }
+
+    internal async Task WaitForResultAsync(TaskCompletionSource<T> tcs)
+    {
+      while (Pending) await Task.Yield();
+      await Task.Yield();
+      if (Status == GoogleSignInStatusCode.CANCELED) {
+        tcs.SetCanceled();
+      } else if (Status == GoogleSignInStatusCode.SUCCESS ||
+            Status == GoogleSignInStatusCode.SUCCESS_CACHE) {
         tcs.SetResult(Result);
       } else {
         tcs.SetException(new GoogleSignIn.SignInException(Status));
       }
     }
   }
-}
+}