Merge pull request #929 from PlayEveryWare/release-3.3.3

Release `v3.3.3`

Author: paulhazen

LICENSE.md .github/LICENSE.mdLICENSE.md renamed to .github/LICENSE.md

@@ -1,4 +1,4 @@
-<a href="/readme.md"><img src="/com.playeveryware.eos/Documentation~/images/PlayEveryWareLogo.gif" alt="Lobby Screenshot" width="5%"/></a>
+<a href="/README.md"><img src="/com.playeveryware.eos/Documentation~/images/PlayEveryWareLogo.gif" alt="Lobby Screenshot" width="5%"/></a>
 
 <div align="center"> <img src="/com.playeveryware.eos/Documentation~/images/EOSPluginLogo.png" alt="PlayEveryWare EOS Plugin for Unity" /> </div>
 
@@ -8,6 +8,7 @@
 
 <a href="">[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)</a>
 <a href="">![Unity](https://img.shields.io/badge/Unity-2021.3.16f1-blue)</a>
+<img src="tools/coverage/results/Report/badge_linecoverage.svg" />
 
 </div>
 

README.md .github/README.mdREADME.md renamed to .github/README.md

@@ -59,7 +59,7 @@ jobs:
             const response = await github.rest.repos.getContent({
              owner: context.repo.owner,
              repo: context.repo.repo,
-             path: 'etc/PackageTemplate/package.json',
+             path: 'com.playeveryware.eos/package.json',
              ref: '${{ env.OLD_BRANCH_NAME }}'
             });
 

.github/workflows/check-for-package-difference.yml

@@ -23,35 +23,53 @@
 namespace PlayEveryWare.EpicOnlineServices
 {
     using System;
+    using System.Threading.Tasks;
     using UnityEngine;
+    using UnityEngine.Networking;
 
-    public class AndroidFileIOHelper : MonoBehaviour
+    public class AndroidFileIOHelper
     {
-        public static string ReadAllText(string filePath)
+        public static async Task<string> ReadAllText(string filePath)
         {
-            using (var request = UnityEngine.Networking.UnityWebRequest.Get(filePath))
+            using UnityWebRequest request = UnityWebRequest.Get(filePath);
+            request.timeout = 2; //seconds till timeout
+            UnityWebRequestAsyncOperation operation = request.SendWebRequest();
+
+            while (!operation.isDone)
             {
-                request.timeout = 2; //seconds till timeout
-                request.SendWebRequest();
+                await Task.Yield();
+            }
 
-                //Wait till webRequest completed
-                while (!request.isDone) { }
+            string text = null;
 
-#if UNITY_2020_1_OR_NEWER
-                if (request.result != UnityEngine.Networking.UnityWebRequest.Result.Success)
-                {
-                    Debug.Log("Requesting " + filePath + ", please make sure it exists and is a valid config");
-                    throw new Exception("UnityWebRequest didn't succeed, Result : " + request.result);
-                }
-#else
-            if (request.isNetworkError || request.isHttpError)
+            switch (request.result)
             {
-                Debug.Log("Requesting " + filePath + ", please make sure it exists and is a valid config");
-                throw new Exception("UnityWebRequest didn't succeed : Network or HTTP Error");
-            }
-#endif
-                return request.downloadHandler.text;
+                case UnityWebRequest.Result.InProgress:
+                    // This should not happen, because of the Task.Yield() call
+                    // above.
+                    Debug.LogWarning("AndroidFileIOHelper: For some reason " +
+                                     "the request is still in progress.");
+                    break;
+                case UnityWebRequest.Result.ConnectionError:
+                case UnityWebRequest.Result.ProtocolError:
+                case UnityWebRequest.Result.DataProcessingError:
+                    Debug.LogError($"AndroidFileIOHelper: " +
+                                   $"UnityWebRequest for path " +
+                                   $"\"{filePath},\" failed with error code " +
+                                   $"'{request.result},' and error, " +
+                                   $"\"{request.error}.\"");
+                    break;
+                case UnityWebRequest.Result.Success:
+                    text = request.downloadHandler.text;
+                    break;
+                default:
+                    ArgumentException unknownResultException =
+                        new($"Unrecognized result returned from {nameof(UnityWebRequest)}: {request.result}.");
+                    Debug.LogException(unknownResultException);
+                    throw unknownResultException;
             }
+
+            return text;
         }
     }
 }

Assets/EOS/EOSManager.prefab

@@ -20,9 +20,10 @@
  * SOFTWARE.
  */
 
-namespace PlayEveryWare.EpicOnlineServices.Build
+namespace PlayEveryWare.EpicOnlineServices.Editor.Build
 {
-    using Editor.Utility;
+    using Config;
+    using Utility;
     using UnityEditor.Build;
     using UnityEditor.Build.Reporting;
 

Assets/Plugins/Android/Core/AndroidFileIOHelper.cs

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-namespace PlayEveryWare.EpicOnlineServices.Build
+namespace PlayEveryWare.EpicOnlineServices.Editor.Build
 {
     using UnityEditor.Build.Reporting;
 

Assets/Plugins/EOSManager.prefab

@@ -20,9 +20,9 @@
  * SOFTWARE.
  */
 
-namespace PlayEveryWare.EpicOnlineServices.Build
+namespace PlayEveryWare.EpicOnlineServices.Editor.Build
 {
-    using Editor.Config;
+    using Config;
     using System.Collections.Generic;
     using System.IO;
     using System.Linq;
@@ -31,10 +31,8 @@ namespace PlayEveryWare.EpicOnlineServices.Build
     using UnityEditor.Build.Reporting;
     using Debug = UnityEngine.Debug;
     using UnityEditor;
-    using PlayEveryWare.EpicOnlineServices.Editor;
     using System;
-    using System.Threading.Tasks;
-    using Utility;
+    using Config = EpicOnlineServices.Config;
 
     public abstract class PlatformSpecificBuilder : IPlatformSpecificBuilder,
         IPreprocessBuildWithReport