Merge pull request #1107 from PlayEveryWare/release-3.3.5

Release 3.3.5 (into `development`)

Author: paulhazen

.github/workflows/update-package-description.yml

@@ -0,0 +1,55 @@
+name: Update EOS SDK Version in package.json
+
+on:
+  workflow_dispatch:
+
+jobs:
+  update-version:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.x'
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install pywin32
+
+      - name: Extract EOS SDK version from DLL
+        id: extract_version
+        run: |
+          import win32api
+          import sys
+          import json
+
+          dll_path = 'Assets/Plugins/Windows/x64/EOSSDK-Win64-Shipping.dll'
+          info = win32api.GetFileVersionInfo(dll_path, '\\')
+          ms = info['FileVersionMS']
+          ls = info['FileVersionLS']
+          version = f"{(ms >> 16) & 0xffff}.{ms & 0xffff}.{(ls >> 16) & 0xffff}.{ls & 0xffff}"
+          print(f"::set-output name=eos_version::{version}")
+
+      - name: Debug new package.json description
+        run: |
+          import json
+
+          package_json_path = 'com.playeveryware.eos/package.json'
+          with open(package_json_path, 'r') as file:
+              data = json.load(file)
+
+          eos_version = "${{ steps.extract_version.outputs.eos_version }}"
+          description = data.get("description", "")
+
+          updated_description = '\n'.join([
+              line if not line.startswith("EOS SDK ") else f"EOS SDK {eos_version}"
+              for line in description.splitlines()
+          ])
+
+          print("Updated package.json description:")
+          print(updated_description)

Assets/Plugins/Android/login.java.meta

@@ -179,7 +179,12 @@ public void Load()
             Task.Run(LoadAsync).GetAwaiter().GetResult();
         }
 
-        public async Task Save(bool prettyPrint = true)
+        public void Save(bool prettyPrint = true)
+        {
+            config.Write(prettyPrint);
+        }
+
+        public async Task SaveAsync(bool prettyPrint = true)
         {
             await config.WriteAsync(prettyPrint);
         }

Assets/Plugins/Source/Editor/ConfigEditors/ConfigEditor.cs

@@ -61,12 +61,20 @@ public interface IConfigEditor : IDisposable
         void Load();
 
         /// <summary>
-        /// Saves the configuration to disk.
+        /// Saves the configuration to disk synchronously.
+        /// </summary>
+        /// <param name="prettyPrint">
+        /// Whether to format the JSON in a more human-readable manner.
+        /// </param>
+        void Save(bool prettyPrint = true);
+
+        /// <summary>
+        /// Saves the configuration to disk asynchronously.
         /// </summary>
         /// <param name="prettyPrint">
         /// Whether or not to format the JSON in a more human-readable manner.
         /// </param>
-        Task Save(bool prettyPrint = true);
+        Task SaveAsync(bool prettyPrint = true);
 
         /// <summary>
         /// Render the editor for the configuration values.

Assets/Plugins/Source/Editor/ConfigEditors/IConfigEditor.cs

@@ -20,6 +20,8 @@
 * SOFTWARE.
 */
 
+#if !EOS_DISABLE
+
 namespace PlayEveryWare.EpicOnlineServices.Editor
 {
     using UnityEngine;
@@ -36,6 +38,14 @@ public interface IPlatformConfigEditor : IConfigEditor
         /// </returns>
         bool IsPlatformAvailable();
 
+        void SetClientCredentials(EOSClientCredentials credentials);
+        
+        void SetDeployment(Deployment deployment);
+
+        PlatformManager.Platform GetPlatform();
+
         Texture GetPlatformIconTexture();
     }
-}
+}
+
+#endif

Assets/Plugins/Source/Editor/ConfigEditors/IPlatformConfigEditor.cs

@@ -54,6 +54,21 @@ public Texture GetPlatformIconTexture()
             return PlatformManager.GetPlatformIcon(config.Platform);
         }
 
+        public void SetDeployment(Deployment deployment)
+        {
+            config.deployment = deployment;
+        }
+
+        public void SetClientCredentials(EOSClientCredentials credentials)
+        {
+            config.clientCredentials = credentials;
+        }
+
+        public PlatformManager.Platform GetPlatform()
+        {
+            return config.Platform;
+        }
+
         public override sealed void RenderContents()
         {
             GUIEditorUtility.RenderInputs(ref config);

Assets/Plugins/Source/Editor/ConfigEditors/PlatformConfigEditor.cs

@@ -122,7 +122,7 @@ protected EOSEditorWindow(string windowTitle, float minimumHeight = 50f, float m
         /// </summary>
         public string WindowTitle { get; }
 
-        private void OnEnable()
+        protected virtual void OnEnable()
         {
             _initializeTask = Initialize();
             EditorApplication.update += CheckForInitialized;
@@ -288,7 +288,7 @@ public void OnGUI()
             }
         }
 
-        public void OnDestroy()
+        protected virtual void OnDestroy()
         {
             Teardown();
         }

Assets/Plugins/Source/Editor/EditorWindows/EOSEditorWindow.cs

@@ -155,7 +155,7 @@ private void Save()
         {
             foreach (var configurationSectionEditor in configEditors)
             {
-                configurationSectionEditor.Save();
+                configurationSectionEditor.SaveAsync();
             }
 
             AssetDatabase.SaveAssets();