npm - gg.easy.airship - Versions diffs - 0.1.2106 → 0.1.2108 - Mend

gg.easy.airship 0.1.2106 → 0.1.2108

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (48) hide show

package/AuthenticationForUnity/Runtime/Browser/AndroidBrowser.cs ADDED Viewed

@@ -0,0 +1,85 @@
+using System;
+using System.Net;
+using System.Threading;
+using System.Threading.Tasks;
+using UnityEngine;
+namespace Cdm.Authentication.Browser {
+    /// <summary>
+    /// OAuth 2.0 verification browser that runs a local server and waits for a call with
+    /// the authorization verification code.
+    /// </summary>
+    public class AndroidBrowser : IBrowser {
+        private string _prefix;
+        public AndroidBrowser(string prefix) {
+            _prefix = prefix;
+        }
+        private TaskCompletionSource<BrowserResult> _taskCompletionSource;
+        /// <summary>
+        /// Gets or sets the close page response. This HTML response is shown to the user after redirection is done.
+        /// </summary>
+        public string closePageResponse { get; set; } =
+            "<html><body><b>DONE!</b><br>(You can close this tab/window now)</body></html>";
+        public async Task<BrowserResult> StartAsync(string loginUrl, string redirectUrl, CancellationToken cancellationToken = default) {
+            _taskCompletionSource = new TaskCompletionSource<BrowserResult>();
+            cancellationToken.Register(() => {
+                _taskCompletionSource?.TrySetCanceled();
+            });
+            using var httpListener = new HttpListener();
+            try {
+                var prefix = _prefix;
+                prefix = AddForwardSlashIfNecessary(prefix);
+                httpListener.Prefixes.Add(prefix);
+                if (httpListener.IsListening) {
+                    httpListener.Stop();
+                }
+                httpListener.Start();
+                httpListener.BeginGetContext(IncomingHttpRequest, httpListener);
+                Application.OpenURL(loginUrl);
+                return await _taskCompletionSource.Task;
+            } finally {
+                httpListener.Stop();
+            }
+        }
+        private void IncomingHttpRequest(IAsyncResult result) {
+            var httpListener = (HttpListener)result.AsyncState;
+            var httpContext = httpListener.EndGetContext(result);
+            var httpRequest = httpContext.Request;
+            // Build a response to send an "ok" back to the browser for the user to see.
+            var httpResponse = httpContext.Response;
+            var buffer = System.Text.Encoding.UTF8.GetBytes(closePageResponse);
+            // Send the output to the client browser.
+            httpResponse.ContentLength64 = buffer.Length;
+            var output = httpResponse.OutputStream;
+            output.Write(buffer, 0, buffer.Length);
+            output.Close();
+            _taskCompletionSource.SetResult(new BrowserResult(BrowserStatus.Success, httpRequest.Url.ToString()));
+        }
+        /// <summary>
+        /// Prefixes must end in a forward slash ("/")
+        /// </summary>
+        /// <see href="https://learn.microsoft.com/en-us/dotnet/api/system.net.httplistener?view=net-7.0#remarks" />
+        private string AddForwardSlashIfNecessary(string url) {
+            string forwardSlash = "/";
+            if (!url.EndsWith(forwardSlash)) {
+                url += forwardSlash;
+            }
+            return url;
+        }
+    }
+}

package/AuthenticationForUnity/Runtime/Browser/AndroidBrowser.cs.meta ADDED Viewed

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 8f64d370a4f941beaf2c599b91c73adc
+timeCreated: 1741806451

package/Editor/Accessories/Clothing/PlatformGearBundleManifestEditor.cs CHANGED Viewed

@@ -26,6 +26,30 @@ namespace Editor.Accessories.Clothing {
         private static string easyOrgId = "6b62d6e3-9d74-449c-aeac-b4feed2012b1";
         private bool skipBuild = false;
+        [MenuItem("Airship/Internal/Publish All Platform Gear")]
+        public static async void PublishAllPlatformGearBundles() {
+            List<PlatformGearBundleManifest> gearBundles = new();
+            // Get all asset GUIDs
+            string[] guids = AssetDatabase.FindAssets("t:PlatformGearBundleManifest");
+            foreach (string guid in guids) {
+                string path = AssetDatabase.GUIDToAssetPath(guid);
+                var obj = AssetDatabase.LoadAssetAtPath<PlatformGearBundleManifest>(path);
+                if (obj != null) {
+                    gearBundles.Add(obj);
+                }
+            }
+            int counter = 0;
+            foreach (var gearBundle in gearBundles) {
+                var editor = CreateEditor(gearBundle) as PlatformGearBundleManifestEditor;
+                await editor.BuildAllPlatforms();
+                counter++;
+                Debug.Log($"Gear publish progress: {counter}/{guids.Length}");
+                await Awaitable.WaitForSecondsAsync(0.1f);
+            }
+        }
         private void OnEnable() {
             skipBuild = false;
         }
@@ -45,7 +69,7 @@ namespace Editor.Accessories.Clothing {
             this.skipBuild = EditorGUILayout.Toggle("Skip Build", this.skipBuild);
         }
-        private async void BuildAllPlatforms() {
+        public async Task BuildAllPlatforms() {
             var st = Stopwatch.StartNew();
             bool success = true;
@@ -109,22 +133,21 @@ namespace Editor.Accessories.Clothing {
                 (string category, string subcategory) = GetGearCategory(gear);
                 // Create a new class id
-                var req = UnityWebRequest.PostWwwForm($"{AirshipPlatformUrl.contentService}/gear/resource-id/{easyOrgId}",
-                    JsonUtility.ToJson(new GearCreateRequest() {
-                        name = gear.name,
-                        imageId = "c0e07e88-09d4-4962-b42d-7794a7ad4cb2",
-                        description = "Clothing",
-                        gear = new GearCreateRequest() {
-                            airAssets = new string[]{},
-                            category = category,
-                            subcategory = subcategory
-                        }
-                    }));
+                var data = JsonUtility.ToJson(new GearCreateRequest() {
+                    name = gear.name,
+                    imageId = "64351892-40d4-409b-ab3a-501818213b50",
+                    description = "Clothing",
+                    airAssets = new string[] { },
+                    category = category,
+                    subcategory = subcategory,
+                });
+                var req = UnityWebRequest.Post($"{AirshipPlatformUrl.contentService}/gear/resource-id/{easyOrgId}", data, "application/json");
                 req.SetRequestHeader("Authorization", "Bearer " + InternalHttpManager.editorAuthToken);
                 req.SetRequestHeader("x-airship-ignore-rate-limit", "true");
                 await req.SendWebRequest();
                 if (req.result != UnityWebRequest.Result.Success) {
-                    Debug.LogError("Failed to update air asset: " + req.downloadHandler.text);
+                    Debug.Log("Post request: " + data);
+                    Debug.LogError("Failed to create gear class: " + req.downloadHandler.text);
                     return;
                 }
                 Debug.Log("Create classId response: " + req.downloadHandler.text);

package/Editor/BuildMenu.cs CHANGED Viewed

@@ -41,6 +41,8 @@ namespace Editor {
         private static void OnBuild() {
             PhysicsSetup.Setup(null);
         }
         public static void BuildLinuxServerStaging() {
@@ -218,6 +220,38 @@ namespace Editor {
 #endif
         }
+        public static void BuildAndroidClient(bool development) {
+            OnBuild();
+            CreateAssetBundles.ResetScenes();
+            PlayerSettings.SplashScreen.show = false;
+            PlayerSettings.SetScriptingBackend(NamedBuildTarget.Android, ScriptingImplementation.IL2CPP);
+            var options = new BuildPlayerOptions();
+            options.scenes = scenes;
+            options.locationPathName = $"build/client_android/{ClientExecutableName}.apk";
+            options.target = BuildTarget.Android;
+            if (development == true) {
+                options.options = BuildOptions.Development;
+            }
+            var report = BuildPipeline.BuildPlayer(options);
+            var summary = report.summary;
+            switch (summary.result) {
+                case BuildResult.Succeeded:
+                    Debug.Log($"Build Android succeeded with size: {FormatBytes(summary)}");
+                    EditorUtility.RevealInFinder(report.summary.outputPath);
+                    break;
+                case BuildResult.Failed:
+                    Debug.LogError("Build Android failed");
+                    break;
+                default:
+                    Debug.LogError("Build Android unexpected result:" + summary.result);
+                    break;
+            }
+            CreateAssetBundles.AddAllGameBundleScenes();
+        }
 #if AIRSHIP_PLAYER
         [MenuItem("Airship/Create Binary/Client/iOS", priority = 80)]
         public static void BuildIOSClientMenuItem() {
@@ -228,6 +262,16 @@ namespace Editor {
         public static void BuildIOSDevelopmentClientMenuItem() {
             BuildIOSClient(true);
         }
+        [MenuItem("Airship/Create Binary/Client/Android", priority = 80)]
+        public static void BuildAndroidClientMenuItem() {
+            BuildAndroidClient(false);
+        }
+        [MenuItem("Airship/Create Binary/Client/Android (Development)", priority = 80)]
+        public static void BuildAndroidDevelopmentClientMenuItem() {
+            BuildAndroidClient(true);
+        }
 #endif
         public static void BuildWindowsClientStaging() {

package/Editor/CreateAssetBundles.cs CHANGED Viewed

@@ -10,6 +10,7 @@ using UnityEditor.Build.Pipeline;
 using UnityEditor.Build.Pipeline.Interfaces;
 using UnityEditor.Build.Pipeline.Tasks;
 using UnityEngine;
+using UnityEngine.Rendering;
 #if UNITY_EDITOR
 using UnityEditor;
 #endif
@@ -356,8 +357,18 @@ public static class CreateAssetBundles {
 				});
 			}
 		}
 		// var tasks = DefaultBuildTasks.Create(DefaultBuildTasks.Preset.AssetBundleBuiltInShaderExtraction);
 		var buildTarget = AirshipPlatformUtil.ToBuildTarget(platform);
+		if (platform == AirshipPlatform.Android) {
+			PlayerSettings.SetUseDefaultGraphicsAPIs(buildTarget, false);
+			PlayerSettings.SetGraphicsAPIs(buildTarget, new GraphicsDeviceType[]
+			{
+				GraphicsDeviceType.OpenGLES3
+			});
+		}
 		var buildTargetGroup = BuildPipeline.GetBuildTargetGroup(buildTarget);
 		if (platform is AirshipPlatform.Windows or AirshipPlatform.Mac or AirshipPlatform.Linux) {
 			buildTargetGroup = BuildTargetGroup.Standalone;

package/Editor/GameConfig/GameConfigEditor.cs CHANGED Viewed

@@ -17,6 +17,8 @@ public class GameConfigEditor : UnityEditor.Editor {
     private Action<UpdateSelectedGame> updateSelectedGame;
     private Action requestRefresh;
+    private SerializedProperty supportsMobile;
     Rect buttonRect;
     public override void OnInspectorGUI() {
         serializedObject.Update();
@@ -41,6 +43,14 @@ public class GameConfigEditor : UnityEditor.Editor {
         }
         GUILayout.EndHorizontal();
+        GUILayout.Space(20);
+        EditorGUILayout.LabelField("Platforms", EditorStyles.boldLabel);
+        EditorGUI.BeginDisabledGroup(true);
+        EditorGUILayout.Toggle(new GUIContent("Desktop"), true);
+        EditorGUI.EndDisabledGroup();
+        EditorGUILayout.PropertyField(this.supportsMobile, new GUIContent("Mobile"));
+        GUILayout.Space(20);
         foreach (var field in typeof(GameConfig).GetFields()) {
             if (field.Name is "gameId" or "gameLayers" || Attribute.IsDefined(field, typeof(HideInInspector))) continue; // Rendered above
@@ -95,6 +105,8 @@ public class GameConfigEditor : UnityEditor.Editor {
             markPublishTargetPinged = false;
             publishTargetPinged = true;
         }
+        this.supportsMobile = serializedObject.FindProperty("supportsMobile");
         updateSelectedGame += (update) => {
             var gameId = update.gameId;

package/Editor/Packages/AirshipPackagesWindow.cs CHANGED Viewed

@@ -24,6 +24,7 @@ using UnityEditor;
 using UnityEditor.Build.Pipeline;
 using UnityEngine;
 using UnityEngine.Networking;
+using UnityEngine.Rendering;
 using Debug = UnityEngine.Debug;
 using Object = UnityEngine.Object;
 using ZipFile = Unity.VisualScripting.IonicZip.ZipFile;
@@ -373,27 +374,24 @@ namespace Editor.Packages {
                 break;
             }
-            var didVerify = AirshipPackagesWindow.VerifyBuildModules();
+            var didVerify = AirshipPackagesWindow.VerifyBuildModules(true);
             if (!didVerify) {
                 Debug.LogErrorFormat("Missing build modules. Install missing modules in Unity Hub and restart Unity to publish package ({0}).", packageDoc.id);
                 yield break;
             }
-            // Sort the current platform first to speed up build time
             List<AirshipPlatform> platforms = new() {
-                // AirshipPlatform.iOS,
+                AirshipPlatform.iOS,
                 AirshipPlatform.Mac,
                 AirshipPlatform.Windows,
+                AirshipPlatform.Android,
             };
-            // var currentPlatform = AirshipPlatformUtil.GetLocalPlatform();
-            // if (AirshipPlatformUtil.livePlatforms.Contains(currentPlatform)) {
-            //     platforms.Add(currentPlatform);
-            // }
-            // foreach (var platform in AirshipPlatformUtil.livePlatforms) {
-            //     if (platform == currentPlatform) continue;
-            //     platforms.Add(platform);
-            // }
-            // platforms.Remove(AirshipPlatform.Linux);
+            // Uncomment to just build iOS
+            if (isCoreMaterials) {
+                platforms.Clear();
+                // platforms.Add(AirshipPlatform.iOS);
+                platforms.Add(AirshipPlatform.Android);
+            }
             if (!CreateAssetBundles.PrePublishChecks()) {
                 yield break;
@@ -426,6 +424,13 @@ namespace Editor.Packages {
                     if (platform is AirshipPlatform.Windows or AirshipPlatform.Mac or AirshipPlatform.Linux) {
                         buildTargetGroup = BuildTargetGroup.Standalone;
                     }
+                    if (platform == AirshipPlatform.Android) {
+                        PlayerSettings.SetUseDefaultGraphicsAPIs(buildTarget, false);
+                        PlayerSettings.SetGraphicsAPIs(buildTarget, new GraphicsDeviceType[]
+                        {
+                            GraphicsDeviceType.OpenGLES3
+                        });
+                    }
                     var buildParams = new BundleBuildParameters(
                         buildTarget,
@@ -435,7 +440,11 @@ namespace Editor.Packages {
                     buildParams.UseCache = this.publishOptionUseCache;
                     Debug.Log("Building package " + packageDoc.id + " with cache: " + this.publishOptionUseCache);
                     if (isCoreMaterials) {
-                        buildParams.BundleCompression = BuildCompression.Uncompressed;
+                        if (platform is AirshipPlatform.iOS or AirshipPlatform.Android) {
+                            buildParams.BundleCompression = BuildCompression.LZ4;
+                        } else {
+                            buildParams.BundleCompression = BuildCompression.Uncompressed;
+                        }
                     } else {
                         buildParams.BundleCompression = BuildCompression.LZ4;
                     }
@@ -466,6 +475,10 @@ namespace Editor.Packages {
                 }
             }
+            if (isCoreMaterials) {
+                yield break;
+            }
             var importsFolder = Path.Join("Assets", "AirshipPackages");
             var sourceAssetsFolder = Path.Join(importsFolder, packageDoc.id);
             var typesFolder = Path.Join(Path.Join("Assets", "AirshipPackages", "Types~"), packageDoc.id);
@@ -590,8 +603,11 @@ namespace Editor.Packages {
                     // UploadSingleGameFile(urls.iOS_client_resources, $"{AirshipPlatform.iOS}/{orgScope}/{packageIdOnly}_client/resources", packageDoc),
                     // UploadSingleGameFile(urls.iOS_client_scenes, $"{AirshipPlatform.iOS}/{orgScope}/{packageIdOnly}_client/scenes", packageDoc),
-                    // UploadSingleGameFile(urls.iOS_shared_resources, $"{AirshipPlatform.iOS}/{orgScope}/{packageIdOnly}_shared/resources", packageDoc),
-                    // UploadSingleGameFile(urls.iOS_shared_scenes, $"{AirshipPlatform.iOS}/{orgScope}/{packageIdOnly}_shared/scenes", packageDoc),
+                    UploadSingleGameFile(urls.iOS_shared_resources, $"{AirshipPlatform.iOS}/{orgScope}/{packageIdOnly}_shared/resources", packageDoc),
+                    UploadSingleGameFile(urls.iOS_shared_scenes, $"{AirshipPlatform.iOS}/{orgScope}/{packageIdOnly}_shared/scenes", packageDoc),
+                    UploadSingleGameFile(urls.Android_shared_resources, $"{AirshipPlatform.Android}/{orgScope}/{packageIdOnly}_shared/resources", packageDoc),
+                    UploadSingleGameFile(urls.Android_shared_scenes, $"{AirshipPlatform.Android}/{orgScope}/{packageIdOnly}_shared/scenes", packageDoc),
                 });
             }
@@ -659,7 +675,8 @@ namespace Editor.Packages {
                                 // "Linux_shared_resources",
                                 "Mac_shared_resources",
                                 "Windows_shared_resources",
-                                // "iOS_shared_resources",
+                                "iOS_shared_resources",
+                                "Android_shared_resources",
                                 // "Linux_shared_scenes",
                                 // "Mac_shared_scenes",
@@ -690,7 +707,7 @@ namespace Editor.Packages {
             Repaint();
         }
-        public static bool VerifyBuildModules() {
+        public static bool VerifyBuildModules(bool mobileSupport) {
             // var linux64 = ModuleUtil.IsModuleInstalled(BuildTarget.StandaloneLinux64);
             // if (!linux64) {
             //     Debug.LogError("Linux Build Support (<b>Mono</b>) module not found.");
@@ -706,11 +723,20 @@ namespace Editor.Packages {
                 Debug.LogError("Windows Build Support (<b>Mono</b>) module not found.");
             }
+            if (!mobileSupport) {
+                return mac && windows;
+            }
             var iOS = ModuleUtil.IsModuleInstalled(BuildTarget.iOS);
             if (!iOS) {
                 Debug.LogError("iOS Build Support module not found.");
             }
-            return mac && windows && iOS;
+            var android = ModuleUtil.IsModuleInstalled(BuildTarget.Android);
+            if (!iOS) {
+                Debug.LogError("Android Build Support module not found.");
+            }
+            return mac && windows && iOS && android;
         }
         private static IEnumerator UploadSingleGameFile(string url, string filePath, AirshipPackageDocument packageDoc, bool absoluteFilePath = false) {

package/Editor/Publish/API/CreateGameDeploymentDto.cs CHANGED Viewed

@@ -8,6 +8,7 @@ public class CreateGameDeploymentDto {
     public bool deployCode;
     public bool deployAssets;
     public string[] packageSlugs;
+    public string[] platforms;
 }
 [Serializable]

package/Editor/Publish/API/DeploymentDto.cs CHANGED Viewed

@@ -40,6 +40,9 @@ public class DeploymentUrls {
     public string iOS_client_scenes;
     public string iOS_shared_scenes;
+    public string Android_shared_resources;
+    public string Android_shared_scenes;
     public string gameConfig;
     public string source;
     public string code;

package/Editor/Publish/Deploy.cs CHANGED Viewed

@@ -35,31 +35,27 @@ public class Deploy {
 	private static GameDto activeDeployTarget;
 	public const ulong MAX_UPLOAD_KB = 500_000;
-	public static void DeployToStaging()
+	public static void PublishGame()
 	{
 		// Make sure we generate and write all `NetworkPrefabCollection`s before we
 		// build the game.
 		// NetworkPrefabManager.WriteAllCollections();
 		// Sort the current platform first to speed up build time
-		List<AirshipPlatform> platforms = new() {
-			// AirshipPlatform.iOS,
-		#if UNITY_EDITOR_OSX // Run Mac build last if on OSX
-			AirshipPlatform.Windows,
-			AirshipPlatform.Mac,
-		#else
-			AirshipPlatform.Mac,
-			AirshipPlatform.Windows,
-		#endif
-		};
-		// List<AirshipPlatform> platforms = new();
-		// var currentPlatform = AirshipPlatformUtil.GetLocalPlatform();
-		// if (AirshipPlatformUtil.livePlatforms.Contains(currentPlatform)) {
-		// 	platforms.Add(currentPlatform);
-		// }
-		// foreach (var platform in AirshipPlatformUtil.livePlatforms) {
-  //           if (platform == currentPlatform) continue;
-  //           platforms.Add(platform);
-  //       }
+		List<AirshipPlatform> platforms = new();
+		var gameConfig = GameConfig.Load();
+		if (gameConfig.supportsMobile) {
+			platforms.Add(AirshipPlatform.iOS);
+			platforms.Add(AirshipPlatform.Android);
+		}
+		// We want to end up on our editor machine's platform
+#if UNITY_EDITOR_OSX
+		platforms.Add(AirshipPlatform.Windows);
+		platforms.Add(AirshipPlatform.Mac);
+#else
+		platforms.Add(AirshipPlatform.Mac);
+		platforms.Add(AirshipPlatform.Windows);
+#endif
 		EditorCoroutines.Execute((BuildAndDeploy(platforms.ToArray(), false)));
 	}
@@ -86,19 +82,21 @@ public class Deploy {
 			yield break;
 		}
+		var gameConfig = AssetDatabase.LoadAssetAtPath<GameConfig>("Assets/GameConfig.asset");
+		if (gameConfig == null) {
+			Debug.LogError("Missing GameConfig.");
+			yield break;
+		}
 		if (!skipBuild) {
-			var didVerify = AirshipPackagesWindow.VerifyBuildModules();
+			var didVerify = AirshipPackagesWindow.VerifyBuildModules(gameConfig.supportsMobile);
 			if (!didVerify) {
 				Debug.LogErrorFormat("Missing build modules. Install missing modules in Unity Hub and restart Unity to publish game.");
 				yield break;
 			}
 		}
-		var gameConfig = AssetDatabase.LoadAssetAtPath<GameConfig>("Assets/GameConfig.asset");
-		if (gameConfig == null) {
-			Debug.LogError("Missing GameConfig.");
-			yield break;
-		}
 		var confirmedSaveState = EditorSceneManager.SaveCurrentModifiedScenesIfUserWantsTo();
 		if (!confirmedSaveState  || SceneManager.GetActiveScene().isDirty) { // User clicked "cancel"
@@ -152,6 +150,13 @@ public class Deploy {
 		DeploymentDto deploymentDto = null;
 		string devKey = null;
 		{
+			List<string> platformStrings = new();
+			platformStrings.Add("Mac");
+			platformStrings.Add("Windows");
+			if (gameConfig.supportsMobile) {
+				platformStrings.Add("iOS");
+				platformStrings.Add("Android");
+			}
 			var packageSlugs = gameConfig.packages.Select((p) => p.id);
 			for (int i = 0; i < possibleKeys.Count; i++) {
 				devKey = possibleKeys[i];
@@ -163,7 +168,8 @@ public class Deploy {
 							defaultScene = gameConfig.startingScene.name,
 							deployCode = true,
 							deployAssets = platforms.Length > 0,
-							packageSlugs = packageSlugs.ToArray()
+							packageSlugs = packageSlugs.ToArray(),
+							platforms = platformStrings.ToArray(),
 						}), "application/json");
 				req.SetRequestHeader("Authorization", "Bearer " + devKey);
 				yield return req.SendWebRequest();
@@ -300,8 +306,11 @@ public class Deploy {
 				// UploadSingleGameFile(urls.iOS_client_resources, $"{AirshipPlatform.iOS}/client/resources", AirshipPlatform.iOS),
 				// UploadSingleGameFile(urls.iOS_client_scenes, $"{AirshipPlatform.iOS}/client/scenes", AirshipPlatform.iOS),
-				// UploadSingleGameFile(urls.iOS_shared_resources, $"{AirshipPlatform.iOS}/shared/resources", AirshipPlatform.iOS),
-				// UploadSingleGameFile(urls.iOS_shared_scenes, $"{AirshipPlatform.iOS}/shared/scenes", AirshipPlatform.iOS),
+				UploadSingleGameFile(urls.iOS_shared_resources, $"{AirshipPlatform.iOS}/shared/resources", AirshipPlatform.iOS),
+				UploadSingleGameFile(urls.iOS_shared_scenes, $"{AirshipPlatform.iOS}/shared/scenes", AirshipPlatform.iOS),
+				UploadSingleGameFile(urls.Android_shared_resources, $"{AirshipPlatform.Android}/shared/resources", AirshipPlatform.Android),
+				UploadSingleGameFile(urls.Android_shared_scenes, $"{AirshipPlatform.Android}/shared/scenes", AirshipPlatform.Android),
 			});
 		}
@@ -381,6 +390,18 @@ public class Deploy {
 		// Complete deployment
 		{
+			List<string> uploadedFileIds = new();
+			uploadedFileIds.Add("Mac_shared_resources");
+			uploadedFileIds.Add("Mac_shared_scenes");
+			uploadedFileIds.Add("Windows_shared_resources");
+			uploadedFileIds.Add("Windows_shared_scenes");
+			if (gameConfig.supportsMobile) {
+				uploadedFileIds.Add("iOS_shared_resources");
+				uploadedFileIds.Add("iOS_shared_scenes");
+				uploadedFileIds.Add("Android_shared_resources");
+				uploadedFileIds.Add("Android_shared_scenes");
+			}
 			int attemptNum = 0;
 			while (attemptNum < 5) {
 				// Debug.Log("Complete. GameId: " + gameConfig.gameId + ", assetVersionId: " + deploymentDto.version.assetVersionNumber);
@@ -389,17 +410,7 @@ public class Deploy {
 						new CompleteGameDeploymentDto() {
 							gameId = gameConfig.gameId,
 							gameVersionId = deploymentDto.version.gameVersionId,
-							uploadedFileIds = new [] {
-								// "Linux_shared_resources",
-								"Mac_shared_resources",
-								"Windows_shared_resources",
-								// "iOS_shared_resources",
-								// "Linux_shared_scenes",
-								"Mac_shared_scenes",
-								"Windows_shared_scenes",
-								// "iOS_shared_scenes",
-							},
+							uploadedFileIds = uploadedFileIds.ToArray(),
 						}), "application/json");
 				req.SetRequestHeader("Authorization", "Bearer " + devKey);
 				yield return req.SendWebRequest();
@@ -617,7 +628,7 @@ public class Deploy {
         switch (option) {
             case 0: // Publish
-                Deploy.DeployToStaging();
+                Deploy.PublishGame();
                 break;
             case 1: // Cancel
                 break;

package/Runtime/Code/Auth/AuthManager.cs CHANGED Viewed

@@ -121,6 +121,8 @@ 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);

package/Runtime/Code/Bootstrap/BundleDownloader.cs CHANGED Viewed

@@ -92,9 +92,15 @@ public class BundleDownloader : Singleton<BundleDownloader> {
 				long totalBytes = 0;
 				foreach (var request in preRequests) {
+					if (request.webRequest.result != UnityWebRequest.Result.Success) continue;
 					var contentLength = request.webRequest.GetResponseHeader("content-length");
-					var bytes = long.Parse(contentLength);
-					totalBytes += bytes;
+					try {
+						var bytes = long.Parse(contentLength);
+						totalBytes += bytes;
+					} catch (Exception e) {
+						Debug.LogError("Failed to parse content-length header: " + e);
+					}
 				}
 				if (loadingScreen) {

package/Runtime/Code/Bootstrap/SignalHandler.cs CHANGED Viewed

@@ -1,8 +1,10 @@
 using System.Collections;
 using System.Threading;
 using Code.Util;
+#if UNITY_STANDALONE_LINUX || UNITY_EDITOR_LINUX
 using Mono.Unix;
 using Mono.Unix.Native;
+#endif
 using UnityEngine;
 namespace Code.Bootstrap {

package/Runtime/Code/Bundles/AirshipPlatform.cs CHANGED Viewed

@@ -16,21 +16,11 @@ namespace Code.Bootstrap {
     public class AirshipPlatformUtil {
         public static AirshipPlatform[] livePlatforms = new[]
         {
-            // AirshipPlatform.iOS,
-            AirshipPlatform.Mac,
-            AirshipPlatform.Windows,
-            AirshipPlatform.Linux
-        };
-        /// <summary>
-        /// Just another list that includes mobile.
-        /// You probably shouldn't use this -- instead use livePlatforms.
-        /// </summary>
-        public static AirshipPlatform[] betaPlatforms = new[] {
             AirshipPlatform.iOS,
             AirshipPlatform.Mac,
             AirshipPlatform.Windows,
             AirshipPlatform.Linux,
+            AirshipPlatform.Android,
         };
         public static string GetStringName(AirshipPlatform platform) {