gg.easy.airship 0.1.2133 → 0.1.2134

package/AuthenticationForUnity/Runtime/Cdm.Authentication.asmdef

@@ -1,7 +1,9 @@
 {
     "name": "Cdm.Authentication",
     "rootNamespace": "Cdm.Authentication",
-    "references": [],
+    "references": [
+        "GUID:2a0340569ab0e1245a38e0d6c7b2529b"
+    ],
     "includePlatforms": [],
     "excludePlatforms": [],
     "allowUnsafeCode": false,

package/Editor/CreateAssetBundles.cs

@@ -532,6 +532,11 @@ public static class CreateAssetBundles {
 	public static void BuildiOSAssetBundles() {
 		BuildGameAssetBundles(AirshipPlatform.iOS);
 	}
+	
+	[MenuItem("Airship/Internal/Build Android Game Bundles")]
+	public static void BuildAndroidAssetBundles() {
+		BuildGameAssetBundles(AirshipPlatform.Android);
+	}
 #endif
 
 #if AIRSHIP_INTERNAL

package/Editor/Easy.Airship.Editor.asmdef

@@ -65,7 +65,8 @@
         "GUID:627104647b9c04b4ebb8978a92ecac63",
         "GUID:6e5063adab271564ba0098a06a8cebda",
         "GUID:3b5390adca4e2bb4791cb930316d6f3e",
-        "GUID:725ee7191c021de4dbf9269590ded755"
+        "GUID:725ee7191c021de4dbf9269590ded755",
+        "GUID:2a0340569ab0e1245a38e0d6c7b2529b"
     ],
     "includePlatforms": [
         "Editor"

package/Editor/LuauImporter.cs

@@ -15,8 +15,7 @@ using Newtonsoft.Json;
 using Debug = UnityEngine.Debug;
 
 [UnityEditor.AssetImporters.ScriptedImporter(2, "lua")]
-public class LuauImporter : UnityEditor.AssetImporters.ScriptedImporter
-{
+public class LuauImporter : UnityEditor.AssetImporters.ScriptedImporter {
     private const string IconOk = "Packages/gg.easy.airship/Editor/LuauAssetIcon.png";
     private const string IconFail = "Packages/gg.easy.airship/Editor/LuauAssetIconError.png";
 
@@ -32,13 +31,6 @@ public class LuauImporter : UnityEditor.AssetImporters.ScriptedImporter
 
     private static bool _mutableGlobalsSet = false;
 
-    protected struct CompilationResult
-    {
-        public IntPtr Data;
-        public long DataSize;
-        public bool Compiled;
-    }
-
     private static Dictionary<string, string> ParseLuauDirectives(string source) {
         Dictionary<string, string> directives = null;
         
@@ -92,7 +84,7 @@ public class LuauImporter : UnityEditor.AssetImporters.ScriptedImporter
         Debug.Log("Byte count: " + byteCounter);
     }
 
-    protected (string fileName, CompilationResult? result) CompileLuauAsset(UnityEditor.AssetImporters.AssetImportContext ctx, AirshipScript subAsset, string assetPath) {
+    protected (string fileName, LuauCompiler.CompilationResult? result) CompileLuauAsset(UnityEditor.AssetImporters.AssetImportContext ctx, AirshipScript subAsset, string assetPath) {
         ClearStopOfCompilationCoroutine();
 
         if (!_mutableGlobalsSet) {
@@ -114,8 +106,8 @@ public class LuauImporter : UnityEditor.AssetImporters.ScriptedImporter
         // Read Lua source
         var data = File.ReadAllText(assetPath);
 
-        IntPtr filenameStr = Marshal.StringToCoTaskMemUTF8(assetPath); //Ok
-        IntPtr dataStr = Marshal.StringToCoTaskMemUTF8(data); //Ok
+        var filenameStr = Marshal.StringToCoTaskMemUTF8(assetPath);
+        var dataStr = Marshal.StringToCoTaskMemUTF8(data);
 
         // Parse and store Luau directives:
         var directives = ParseLuauDirectives(data);
@@ -133,28 +125,24 @@ public class LuauImporter : UnityEditor.AssetImporters.ScriptedImporter
         // Compile
         StopwatchCompile.Start();
         var len = Encoding.UTF8.GetByteCount(data);
-        IntPtr res = LuauPlugin.LuauCompileCode(dataStr, len, filenameStr, ctx.assetPath.Length, 1);
+        var res = LuauPlugin.LuauCompileCode(dataStr, len, filenameStr, ctx.assetPath.Length, LuauPlugin.LuauOptimizationLevel.Baseline);
         StopwatchCompile.Stop();
 
         Marshal.FreeCoTaskMem(dataStr);
         Marshal.FreeCoTaskMem(filenameStr);
 
         // Figure out what happened
-        var resStruct = Marshal.PtrToStructure<CompilationResult>(res);
-        // Debug.Log("Compilation of " + ctx.assetPath + ": " + resStruct.Compiled.ToString());
+        var compilationResult = Marshal.PtrToStructure<LuauCompiler.CompilationResult>(res);
 
         var ext = Path.GetExtension(ctx.assetPath);
         var fileName = assetPath.Substring(0, assetPath.Length - ext.Length) + ".bytes";
 
-        // var subAsset = ScriptableObject.CreateInstance<Luau.BinaryFile>();
-
-        bool compileSuccess = true;
-        string compileErrMessage = "none";
+        var compileSuccess = true;
+        var compileErrMessage = "none";
         
         // Get metadata from JSON file (if it's found):
         var metadataFilepath = $"{assetPath}.json~";
-        if (File.Exists(metadataFilepath))
-        {
+        if (File.Exists(metadataFilepath)) {
             var json = File.ReadAllText(metadataFilepath);
             var (metadata, err) = LuauMetadata.FromJson(json);
 
@@ -170,11 +158,10 @@ public class LuauImporter : UnityEditor.AssetImporters.ScriptedImporter
             }
         }
 
-        subAsset.m_path = FileExtensions.Transform( ctx.assetPath, FileExtensions.Typescript, FileExtensions.Lua);
+        subAsset.m_path = FileExtensions.Transform(ctx.assetPath, FileExtensions.Typescript, FileExtensions.Lua);
 
-        if (!resStruct.Compiled)
-        {
-            var resString = Marshal.PtrToStringUTF8(resStruct.Data, (int)resStruct.DataSize);
+        if (!compilationResult.Compiled) {
+            var resString = Marshal.PtrToStringUTF8(compilationResult.Data, (int)compilationResult.DataSize);
             compileSuccess = false;
             compileErrMessage = resString;
             ctx.LogImportError($"Failed to compile {ctx.assetPath}: {resString}");
@@ -183,21 +170,19 @@ public class LuauImporter : UnityEditor.AssetImporters.ScriptedImporter
         subAsset.m_compiled = compileSuccess;
         subAsset.m_compilationError = compileErrMessage;
 
-        var bytes = new byte[resStruct.DataSize];
-        Marshal.Copy(resStruct.Data, bytes, 0, (int)resStruct.DataSize);
+        var bytes = new byte[compilationResult.DataSize];
+        Marshal.Copy(compilationResult.Data, bytes, 0, (int)compilationResult.DataSize);
 
         subAsset.m_bytes = bytes;
         byteCounter += bytes.Length;
 
         CompiledFiles.Add(subAsset);
         _elapsed = Stopwatch.ElapsedMilliseconds;
-        
-       
 
         ClearStopOfCompilationCoroutine();
         _stopOfCompilationCoroutine = EditorCoroutineUtility.StartCoroutineOwnerless(ScheduleStopOfCompilation());
 
-        return (fileName, resStruct);
+        return (fileName, compilationResult);
     }
 
     public override unsafe void OnImportAsset(UnityEditor.AssetImporters.AssetImportContext ctx) {
@@ -212,16 +197,14 @@ public class LuauImporter : UnityEditor.AssetImporters.ScriptedImporter
         ctx.SetMainObject(luauScript);
     }
 
-    private static void ClearStopOfCompilationCoroutine()
-    {
+    private static void ClearStopOfCompilationCoroutine() {
         if (_stopOfCompilationCoroutine == null) return;
 
         EditorCoroutineUtility.StopCoroutine(_stopOfCompilationCoroutine);
         _stopOfCompilationCoroutine = null;
     }
 
-    private static IEnumerator ScheduleStopOfCompilation()
-    {
+    private static IEnumerator ScheduleStopOfCompilation() {
         // Wait 1 frame
         yield return null;
 
@@ -235,14 +218,12 @@ public class LuauImporter : UnityEditor.AssetImporters.ScriptedImporter
     }
 
     private static bool previouslyCompiledWithErrors = false;
-    private static void LogResults()
-    {
+    private static void LogResults() {
         // Count success & failure compilations
         var numCompiled = CompiledFiles.Count;
         var numSuccess = 0;
         var numFailure = 0;
-        foreach (var binaryFile in CompiledFiles)
-        {
+        foreach (var binaryFile in CompiledFiles) {
             if (binaryFile.m_compiled) numSuccess++;
             else numFailure++;
         }
@@ -257,8 +238,6 @@ public class LuauImporter : UnityEditor.AssetImporters.ScriptedImporter
         var successFormat = numSuccess > 0 ? "<color=#77f777>{0} succeeded</color>" : "{0} succeeded";
         var failureFormat = numFailure > 0 ? "<color=#ff534a>{1} failed</color>" : "{1} failed";
 
-        
-
         if (EditorIntegrationsConfig.instance.typescriptVerbose || numFailure > 0 || previouslyCompiledWithErrors) {
             Debug.LogFormat(
                 $"{numCompiled} lua source{(numCompiled == 1 ? "" : "s")} compiled in {elapsedTime} ({successFormat}, {failureFormat})", numSuccess, numFailure);

package/Runtime/Code/Airship/Resources/Scripts/Editor/Airship.Airship.Editor.asmdef

@@ -57,7 +57,8 @@
         "GUID:6e5063adab271564ba0098a06a8cebda",
         "GUID:3b5390adca4e2bb4791cb930316d6f3e",
         "GUID:725ee7191c021de4dbf9269590ded755",
-        "GUID:77ccaf49895b0d64e87cd4b4faf83c49"
+        "GUID:77ccaf49895b0d64e87cd4b4faf83c49",
+        "GUID:2a0340569ab0e1245a38e0d6c7b2529b"
     ],
     "includePlatforms": [
         "Editor"

package/Runtime/Code/AirshipConst.cs

@@ -1,11 +1,11 @@
 // ReSharper disable InconsistentNaming
 namespace Code {
     public static class AirshipConst {
-        public const int playerVersion = 5;
+        public const int playerVersion = 8;
 
         /// <summary>
         /// The server will kick clients that have a playerVersion lower than this value.
         /// </summary>
-        public const int minAcceptedPlayerVersionOnServer = 5;
+        public const int minAcceptedPlayerVersionOnServer = 8;
     }
 }

package/Runtime/Code/Auth/AuthManager.cs

@@ -5,6 +5,7 @@ using Cdm.Authentication.Browser;
 using Cdm.Authentication.Clients;
 using Cdm.Authentication.OAuth2;
 using Code.Http.Internal;
+using Google;
 using JetBrains.Annotations;
 using Proyecto26;
 using RSG;
@@ -16,9 +17,9 @@ public class AuthManager {
     public static Action authed;
 
 	private static string GetAccountJSONPath() {
-       var stagingExtension = "";
+		var stagingExtension = "";
 #if AIRSHIP_STAGING
-       stagingExtension = "_staging"; 
+		stagingExtension = "_staging"; 
 #endif
 #if DEVELOPMENT_BUILD
 		return Path.Combine(Application.persistentDataPath, $"account_devbuild{stagingExtension}.json");
@@ -84,8 +85,8 @@ public class AuthManager {
         string clientId = "987279961241-0mjidme48us0fis0vtqk4jqrsmk7ar0n.apps.googleusercontent.com";
         string clientSecret = "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";
 #else
-       string clientId = "457451560440-fvhufuvt3skas9m046jqin0l10h8uaph.apps.googleusercontent.com";
-       string clientSecret = "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";
+		string clientId = "457451560440-fvhufuvt3skas9m046jqin0l10h8uaph.apps.googleusercontent.com";
+		string clientSecret = "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";
 #endif
         string redirectUri = "http://localhost:8080";
 
@@ -99,16 +100,6 @@ public class AuthManager {
         clientSecret = null;
         redirectUri = "gg.easy.airship:/oauth2";
 #endif
-#endif
-	   
-#if UNITY_ANDROID && !UNITY_EDITOR
-#if AIRSHIP_STAGING
-		// TODO
-#else
-		clientId = "457451560440-htottasd1788to2boc7lg08jrkduotg1.apps.googleusercontent.com";
-		clientSecret = null;
-	    redirectUri = "https://airship.gg/oauth2";
-#endif
 #endif
 
         var auth = new GoogleAuth(new AuthorizationCodeFlow.Configuration() {
@@ -120,9 +111,32 @@ public class AuthManager {
             redirectUri = redirectUri,
             scope = "openid email profile",
         });
+
+        GoogleSignIn.Configuration = new GoogleSignInConfiguration() {
+			RequestEmail = true,
+			RequestProfile = true,
+			RequestAuthCode = true,
+			WebClientId = clientId,
+#if UNITY_EDITOR || UNITY_STANDALONE
+			ClientSecret = clientSecret,
+#endif
+        };
         
-        Debug.Log($"Redirect URI: {redirectUri}");
+#if AIRSHIP_ANDROID_DEBUG
+        GoogleSignIn.DefaultInstance.EnableDebugLogging(true);
+#endif
 
+        var accessToken = "";
+        
+#if UNITY_ANDROID
+		var (user, err) = await AuthWithGoogleAndroid();
+		if (err != null) {
+			return (false, err);
+		}
+
+		var accessTokenRes = await auth.ExchangeCodeForAccessTokenAsync($"http://localhost?code={user.AuthCode}");
+		accessToken = accessTokenRes.accessToken;
+#else
         var crossPlatformBrowser = new CrossPlatformBrowser();
         var standaloneBrowser = new StandaloneBrowser();
         standaloneBrowser.closePageResponse =
@@ -133,16 +147,16 @@ public class AuthManager {
         crossPlatformBrowser.platformBrowsers.Add(RuntimePlatform.OSXEditor, standaloneBrowser);
         crossPlatformBrowser.platformBrowsers.Add(RuntimePlatform.OSXPlayer, standaloneBrowser);
         crossPlatformBrowser.platformBrowsers.Add(RuntimePlatform.IPhonePlayer, new ASWebAuthenticationSessionBrowser());
-        crossPlatformBrowser.platformBrowsers.Add(RuntimePlatform.Android, new DeepLinkBrowser());
-        // crossPlatformBrowser.platformBrowsers.Add(RuntimePlatform.Android, new AndroidBrowser("http://*:8080"));
 
         using var authenticationSession = new AuthenticationSession(auth, crossPlatformBrowser);
 
         // Opens a browser to log user in
         AccessTokenResponse accessTokenResponse = await authenticationSession.AuthenticateAsync();
-        if (accessTokenResponse.accessToken != "") {
+		accessToken = accessTokenResponse.accessToken;
+#endif
+        if (accessToken != "") {
             var reqBody = new SignInWithIdpRequest() {
-                postBody = "access_token=" + accessTokenResponse.accessToken + "&providerId=google.com",
+                postBody = "access_token=" + accessToken + "&providerId=google.com",
                 requestUri = "http://localhost",
                 returnSecureToken = true
             };
@@ -177,5 +191,33 @@ public class AuthManager {
             Debug.Log("Login cancelled.");
             return (false, ""); // Don't return a display error
         }
-    }
+	}
+
+#if UNITY_ANDROID
+	private static Task<(GoogleSignInUser user, string error)> AuthWithGoogleAndroid() {
+		GoogleSignIn.Configuration.UseGameSignIn = false;
+
+		return GoogleSignIn.DefaultInstance.SignIn().ContinueWith(OnAuthGoogleAndroidFinished, TaskScheduler.FromCurrentSynchronizationContext());
+	}
+
+	private static (GoogleSignInUser user, string error) OnAuthGoogleAndroidFinished(Task<GoogleSignInUser> task) {
+		if (task.IsFaulted) {
+			// Attempt to get the SignInException and return the message:
+			if (task.Exception != null) {
+				using var enumerator = task.Exception.InnerExceptions.GetEnumerator();
+				if (enumerator.MoveNext()) {
+					var err = (GoogleSignIn.SignInException)enumerator.Current;
+					return (null, $"{err!.Status}: {err!.Message}");
+				}
+			}
+			return (null, "Unknown sign in exception");
+		}
+		
+		if (task.IsCanceled) {
+			return (null, "Sign in cancelled");
+		}
+
+		return (task.Result, null);
+	}
+#endif
 }

package/Runtime/Code/Bootstrap/ClientBundleLoader.cs

@@ -177,7 +177,7 @@ namespace Code.Bootstrap {
                 NetworkClient.Send(new ClientFinishedPreparingMessage());
             }, false);
 
-            NetworkClient.RegisterHandler<LuauBytesMessage>(async data => {
+            NetworkClient.RegisterHandler<LuauBytesMessage>(data => {
                 int totalCounter = 0;
                 foreach (var files in data.scriptsDto.files) {
                     totalCounter += files.Value.Count;

package/Runtime/Code/Bundles/SystemRoot.cs

@@ -185,7 +185,16 @@ public class SystemRoot : Singleton<SystemRoot> {
 		var enums = new List<IEnumerator>();
 		foreach (var bundleId in unloadList) {
 			var loadedBundle = this.loadedAssetBundles[bundleId];
-			enums.Add(this.UnloadBundleAsync(loadedBundle));
+			
+			// We keep code.zip when we will re-loading this same package (code.zip update)
+			// Code.zip is always downloaded on join before this code runs, so we know it'll be up-to-date.
+			bool keepCodeZip = false;
+			var samePackageIdBeingLoaded = packages.Find(p => p.id.ToLower() == loadedBundle.airshipPackage.id.ToLower());
+			if (samePackageIdBeingLoaded != null) {
+				keepCodeZip = true;
+			}
+			
+			enums.Add(this.UnloadBundleAsync(loadedBundle, keepCodeZip));
 		}
 		yield return this.WaitAll(enums.ToArray());
 
@@ -413,19 +422,25 @@ public class SystemRoot : Singleton<SystemRoot> {
 #endif
 	}
 
-	public IEnumerator UnloadBundleAsync(LoadedAssetBundle loadedBundle) {
-		Debug.Log($"[SystemRoot]: Unloading bundle {loadedBundle.bundleId}/{loadedBundle.assetBundleFile}");
+	public IEnumerator UnloadBundleAsync(LoadedAssetBundle loadedBundle, bool keepCodeZip) {
+		var msg = $"[SystemRoot]: Unloading bundle {loadedBundle.bundleId}/{loadedBundle.assetBundleFile}";
+		if (keepCodeZip) {
+			msg += ". Keeping code.zip";
+		}
+		Debug.Log(msg);
 		this.networkNetworkPrefabLoader.UnloadNetCollectionId(loadedBundle.netCollectionId);
-
-		if (this.luauFiles.TryGetValue(loadedBundle.bundleId, out var files)) {
-			int count = files.Count;
-			foreach (var s in files.Values) {
-				Object.Destroy(s);
+		
+		if (!keepCodeZip) {
+			if (this.luauFiles.TryGetValue(loadedBundle.bundleId, out var files)) {
+				int count = files.Count;
+				foreach (var s in files.Values) {
+					Object.Destroy(s);
+				}
+				this.luauFiles.Remove(loadedBundle.bundleId);
+				Debug.Log($"Unloaded {count} script files.");
 			}
-			this.luauFiles.Remove(loadedBundle.bundleId);
-			Debug.Log($"Unloaded {count} script files.");
 		}
-
+		
 		var ao = loadedBundle.assetBundle.UnloadAsync(true);
 		while (!ao.isDone) {
 			yield return null;

package/Runtime/Code/Easy.Airship.asmdef

@@ -51,7 +51,8 @@
         "GUID:6806a62c384838046a3c66c44f06d75f",
         "GUID:325984b52e4128546bc7558552f8b1d2",
         "GUID:3b5390adca4e2bb4791cb930316d6f3e",
-        "GUID:725ee7191c021de4dbf9269590ded755"
+        "GUID:725ee7191c021de4dbf9269590ded755",
+        "GUID:2a0340569ab0e1245a38e0d6c7b2529b"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

package/Runtime/Code/GoogleSignIn/.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"
+}

package/Runtime/Code/GoogleSignIn/CONTRIBUTING.md

@@ -0,0 +1,24 @@
+Want to contribute? Great! First, read this page (including the small print at the end).
+
+### Before you contribute
+Before we can use your code, you must sign the
+[Google Individual Contributor License Agreement](https://developers.google.com/open-source/cla/individual?csw=1)
+(CLA), which you can do online. The CLA is necessary mainly because you own the
+copyright to your changes, even after your contribution becomes part of our
+codebase, so we need your permission to use and distribute your code. We also
+need to be sure of various other things — for instance that you'll tell us if you
+know that your code infringes on other people's patents. You don't have to sign
+the CLA until after you've submitted your code for review and a member has
+approved it, but you must do it before we can put your code into our codebase.
+Before you start working on a larger contribution, you should get in touch with
+us first through the issue tracker with your idea so that we can help out and
+possibly guide you. Coordinating up front makes it much easier to avoid
+frustration later on.
+
+### Code reviews
+All submissions, including submissions by project members, require review. We
+use Github pull requests for this purpose.
+
+### The small print
+Contributions made by corporations are covered by a different agreement than
+the one above, the Software Grant and Corporate Contributor License Agreement.

package/Runtime/Code/GoogleSignIn/CONTRIBUTING.md.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: bf5b818b5e6f1fb4b920c2d651dd2f82
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/Code/GoogleSignIn/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

package/Runtime/Code/GoogleSignIn/Editor/iOS/PListImporter.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 57db1ee44933e4015a8e5b4f29a487e8
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/Code/GoogleSignIn/Editor/iOS/PListProcessor.cs

@@ -0,0 +1,69 @@
+#if UNITY_EDITOR
+using UnityEngine;
+
+using UnityEditor;
+#if UNITY_IOS
+using UnityEditor.iOS.Xcode;
+#endif
+
+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

package/Runtime/Code/GoogleSignIn/Editor/iOS/PListProcessor.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 97598a1b92cb146879db81f44bfeb14d
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/Code/GoogleSignIn/Editor/iOS.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 71aabb773a37445bb8dcac856c8c672e
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/Code/GoogleSignIn/Editor.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b15db503f08f84da789165e1557fdd7b
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: