fix: upgrade to unity 2023.2 (#22)

mygamedevtools · Dec 2, 2023 · 3aac886 · 3aac886
1 parent a22109b
commit 3aac886
Show file tree

Hide file tree

Showing 40 changed files with 81 additions and 237 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -21,7 +21,7 @@ jobs:
           @semantic-release/git
         branch: main
       env:
-        GH_TOKEN: ${{ secrets.GH_TOKEN }}       
+        GH_TOKEN: ${{ secrets.GH_TOKEN }}
     - name: Post Release Checkout
       id: post_release
       uses: actions/checkout@v3

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -18,9 +18,7 @@ jobs:
         project-path:
           - ./
         testMode:
-          # TODO: Restore playmode tests once Unity fixes the linux editor tests issue: https://github.com/mygamedevtools/scene-loader/issues/18
-          # - playmode
-          - standalone
+          - playmode
     steps:
       - uses: actions/checkout@v3
         with:
@@ -31,7 +29,7 @@ jobs:
           key: Library-${{ matrix.project-path }}
           restore-keys: |
             Library-
-      - uses: game-ci/unity-test-runner@v3
+      - uses: game-ci/unity-test-runner@v4
         id: tests
         env:
           UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}

diff --git a/Packages/manifest.json b/Packages/manifest.json
@@ -1,13 +1,13 @@
 {
   "dependencies": {
-    "com.cysharp.unitask": "2.3.3",
+    "com.cysharp.unitask": "2.5.0",
     "com.mygamedevtools.script-template": "3.4.0",
-    "com.unity.addressables": "1.21.15",
-    "com.unity.feature.development": "1.0.1",
+    "com.unity.addressables": "1.21.19",
+    "com.unity.feature.development": "1.0.2",
     "com.unity.ide.visualstudio": "2.0.22",
-    "com.unity.textmeshpro": "3.0.6",
-    "com.unity.timeline": "1.7.5",
-    "com.unity.ugui": "1.0.0",
+    "com.unity.timeline": "1.8.6",
+    "com.unity.ugui": "2.0.0",
+    "com.unity.modules.accessibility": "1.0.0",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",
     "com.unity.modules.animation": "1.0.0",

diff --git a/Packages/mygamedevtools-scene-loader/Runtime/Interfaces/ILoadSceneInfo.cs b/Packages/mygamedevtools-scene-loader/Runtime/Interfaces/ILoadSceneInfo.cs
@@ -1,9 +1,3 @@
-/**
- * ILoadSceneInfo.cs
- * Created by: João Borks [joao.borks@gmail.com]
- * Created on: 8/24/2022 (en-US)
- */
-
 using UnityEngine.SceneManagement;
 
 namespace MyGameDevTools.SceneLoading

diff --git a/Packages/mygamedevtools-scene-loader/Runtime/Interfaces/ISceneLoader.cs b/Packages/mygamedevtools-scene-loader/Runtime/Interfaces/ISceneLoader.cs
@@ -1,9 +1,3 @@
-/**
- * ISceneLoader.cs
- * Created by: João Borks [joao.borks@gmail.com]
- * Created on: 7/16/2022 (en-US)
- */
-
 using UnityEngine.SceneManagement;
 
 namespace MyGameDevTools.SceneLoading

diff --git a/Packages/mygamedevtools-scene-loader/Runtime/Interfaces/ISceneLoaderAsync.cs b/Packages/mygamedevtools-scene-loader/Runtime/Interfaces/ISceneLoaderAsync.cs
@@ -1,9 +1,3 @@
-/**
- * ISceneLoaderAsync.cs
- * Created by: João Borks [joao.borks@gmail.com]
- * Created on: 8/15/2022 (en-US)
- */
-
 #if ENABLE_UNITASK
 using Cysharp.Threading.Tasks;
 #endif

diff --git a/Packages/mygamedevtools-scene-loader/Runtime/Interfaces/ISceneManager.cs b/Packages/mygamedevtools-scene-loader/Runtime/Interfaces/ISceneManager.cs
@@ -1,9 +1,3 @@
-/**
- * ISceneManager.cs
- * Created by: João Borks [joao.borks@gmail.com]
- * Created on: 2022-12-21
- */
-
 using System;
 using System.Threading.Tasks;
 using UnityEngine.SceneManagement;

diff --git a/Packages/mygamedevtools-scene-loader/Runtime/Loading/LoadingBehavior.cs b/Packages/mygamedevtools-scene-loader/Runtime/Loading/LoadingBehavior.cs
@@ -1,9 +1,3 @@
-/**
- * LoadingBehavior.cs
- * Created by: João Borks [joao.borks@gmail.com]
- * Created on: 7/23/2022 (en-US)
- */
-
 using UnityEngine;
 
 namespace MyGameDevTools.SceneLoading

diff --git a/Packages/mygamedevtools-scene-loader/Runtime/Loading/LoadingFader.cs b/Packages/mygamedevtools-scene-loader/Runtime/Loading/LoadingFader.cs
@@ -1,9 +1,3 @@
-/**
- * LoadingFader.cs
- * Created by: João Borks [joao.borks@gmail.com]
- * Created on: 7/23/2022 (en-US)
- */
-
 using System.Collections;
 using UnityEngine;
 

diff --git a/Packages/mygamedevtools-scene-loader/Runtime/Loading/LoadingFeedbackSlider.cs b/Packages/mygamedevtools-scene-loader/Runtime/Loading/LoadingFeedbackSlider.cs
@@ -1,9 +1,3 @@
-/**
- * LoadingFeedbackSlider.cs
- * Created by: João Borks [joao.borks@gmail.com]
- * Created on: 7/23/2022 (en-US)
- */
-
 using UnityEngine;
 using UnityEngine.UI;
 

diff --git a/Packages/mygamedevtools-scene-loader/Runtime/Loading/LoadingFeedbackText.cs b/Packages/mygamedevtools-scene-loader/Runtime/Loading/LoadingFeedbackText.cs
@@ -1,9 +1,3 @@
-/**
- * LoadingFeedbackText.cs
- * Created by: João Borks [joao.borks@gmail.com]
- * Created on: 7/23/2022 (en-US)
- */
-
 using UnityEngine;
 using UnityEngine.UI;
 

diff --git a/Packages/mygamedevtools-scene-loader/Runtime/Loading/LoadingFeedbackTextMeshPro.cs b/Packages/mygamedevtools-scene-loader/Runtime/Loading/LoadingFeedbackTextMeshPro.cs
@@ -1,10 +1,4 @@
 #if ENABLE_TMP
-/**
- * LoadingFeedbackTextMeshPro.cs
- * Created by: João Borks [joao.borks@gmail.com]
- * Created on: 7/25/2022 (en-US)
- */
-
 using TMPro;
 using UnityEngine;
 

diff --git a/Packages/mygamedevtools-scene-loader/Runtime/Loading/LoadingProgress.cs b/Packages/mygamedevtools-scene-loader/Runtime/Loading/LoadingProgress.cs
@@ -1,9 +1,3 @@
-/**
- * LoadingProgress.cs
- * Created by: João Borks [joao.borks@gmail.com]
- * Created on: 2023-01-31
- */
-
 using System;
 
 namespace MyGameDevTools.SceneLoading

diff --git a/Packages/mygamedevtools-scene-loader/Runtime/Loading/LoadingState.cs b/Packages/mygamedevtools-scene-loader/Runtime/Loading/LoadingState.cs
@@ -1,9 +1,3 @@
-/**
- * LoadingState.cs
- * Created by: João Borks [joao.borks@gmail.com]
- * Created on: 2023-01-31
- */
-
 namespace MyGameDevTools.SceneLoading
 {
     /// <summary>

diff --git a/Packages/mygamedevtools-scene-loader/Runtime/Managers/SceneManager.cs b/Packages/mygamedevtools-scene-loader/Runtime/Managers/SceneManager.cs
@@ -1,12 +1,6 @@
 #if ENABLE_UNITASK && !OVERRIDE_DISABLE_UNITASK
 #define USE_UNITASK
 #endif
-/**
- * SceneManager.cs
- * Created by: João Borks [joao.borks@gmail.com]
- * Created on: 2022-12-21
- */
-
 #if USE_UNITASK
 using Cysharp.Threading.Tasks;
 #endif

diff --git a/Packages/mygamedevtools-scene-loader/Runtime/Managers/SceneManagerAddressable.cs b/Packages/mygamedevtools-scene-loader/Runtime/Managers/SceneManagerAddressable.cs
@@ -2,12 +2,6 @@
 #if ENABLE_UNITASK && !OVERRIDE_DISABLE_UNITASK
 #define USE_UNITASK
 #endif
-/**
- * {nameof(SceneManagerAddressable)}.cs
- * Created by: João Borks [joao.borks@gmail.com]
- * Created on: 2023-01-21
- */
-
 #if USE_UNITASK
 using Cysharp.Threading.Tasks;
 #endif

diff --git a/Packages/mygamedevtools-scene-loader/Runtime/SceneLoaders/SceneLoaderAsync.cs b/Packages/mygamedevtools-scene-loader/Runtime/SceneLoaders/SceneLoaderAsync.cs
@@ -1,9 +1,3 @@
-/**
- * SceneLoaderAsync.cs
- * Created by: João Borks [joao.borks@gmail.com]
- * Created on: 7/16/2022 (en-US)
- */
-
 using System;
 using System.Linq;
 using System.Threading.Tasks;
@@ -68,7 +62,11 @@ async ValueTask<Scene[]> TransitionWithIntermediateAsync(ILoadSceneInfo[] target
 
             var currentScene = externalOrigin ? externalOriginScene : _manager.GetActiveScene();
 
+#if UNITY_2023_2_OR_NEWER
+            var loadingBehavior = Object.FindObjectsByType<LoadingBehavior>(UnityEngine.FindObjectsSortMode.None).FirstOrDefault(l => l.gameObject.scene == loadingScene);
+#else
             var loadingBehavior = Object.FindObjectsOfType<LoadingBehavior>().FirstOrDefault(l => l.gameObject.scene == loadingScene);
+#endif
             return loadingBehavior
                 ? await TransitionWithIntermediateLoadingAsync(targetScenes, setIndexActive, intermediateSceneInfo, loadingBehavior, currentScene, externalOrigin)
                 : await TransitionWithIntermediateNoLoadingAsync(targetScenes, setIndexActive, intermediateSceneInfo, currentScene, externalOrigin);

diff --git a/Packages/mygamedevtools-scene-loader/Runtime/SceneLoaders/SceneLoaderCoroutine.cs b/Packages/mygamedevtools-scene-loader/Runtime/SceneLoaders/SceneLoaderCoroutine.cs
@@ -1,9 +1,3 @@
-/**
- * SceneLoaderCoroutine.cs
- * Created by: João Borks [joao.borks@gmail.com]
- * Created on: 9/4/2022 (en-US)
- */
-
 using System;
 using System.Collections;
 using System.Linq;
@@ -77,7 +71,11 @@ IEnumerator TransitionWithIntermediateRoutine(ILoadSceneInfo[] targetScenes, int
 
             var currentScene = externalOrigin ? externalOriginScene : _manager.GetActiveScene();
 
+#if UNITY_2023_2_OR_NEWER
+            var loadingBehavior = Object.FindObjectsByType<LoadingBehavior>(UnityEngine.FindObjectsSortMode.None).FirstOrDefault(l => l.gameObject.scene == loadingScene);
+#else
             var loadingBehavior = Object.FindObjectsOfType<LoadingBehavior>().FirstOrDefault(l => l.gameObject.scene == loadingScene);
+#endif
             yield return loadingBehavior
                 ? TransitionWithIntermediateLoadingAsync(targetScenes, setIndexActive, intermediateSceneInfo, loadingBehavior, currentScene, externalOrigin)
                 : TransitionWithIntermediateNoLoadingAsync(targetScenes, setIndexActive, intermediateSceneInfo, currentScene, externalOrigin);

diff --git a/Packages/mygamedevtools-scene-loader/Runtime/SceneLoaders/SceneLoaderUniTask.cs b/Packages/mygamedevtools-scene-loader/Runtime/SceneLoaders/SceneLoaderUniTask.cs
@@ -1,10 +1,4 @@
 #if ENABLE_UNITASK
-/**
- * SceneLoaderUniTask.cs
- * Created by: João Borks [joao.borks@gmail.com]
- * Created on: 8/1/2022 (en-US)
- */
-
 using Cysharp.Threading.Tasks;
 using System;
 using System.Linq;
@@ -69,7 +63,11 @@ async UniTask<Scene[]> TransitionWithIntermediateAsync(ILoadSceneInfo[] targetSc
 
             var currentScene = externalOrigin ? externalOriginScene : _manager.GetActiveScene();
 
+#if UNITY_2023_2_OR_NEWER
+            var loadingBehavior = Object.FindObjectsByType<LoadingBehavior>(UnityEngine.FindObjectsSortMode.None).FirstOrDefault(l => l.gameObject.scene == loadingScene);
+#else
             var loadingBehavior = Object.FindObjectsOfType<LoadingBehavior>().FirstOrDefault(l => l.gameObject.scene == loadingScene);
+#endif
             return loadingBehavior
                 ? await TransitionWithIntermediateLoadingAsync(targetScenes, setIndexActive, intermediateSceneInfo, loadingBehavior, currentScene, externalOrigin)
                 : await TransitionWithIntermediateNoLoadingAsync(targetScenes, setIndexActive, intermediateSceneInfo, currentScene, externalOrigin);
@@ -108,7 +106,11 @@ async UniTask UnloadCurrentScene(Scene currentScene, bool externalOrigin)
                 return;
 
             if (externalOrigin)
+#if UNITY_2023_2_OR_NEWER
+                await UnityEngine.SceneManagement.SceneManager.UnloadSceneAsync(currentScene).ToUniTask();
+#else
                 await UnityEngine.SceneManagement.SceneManager.UnloadSceneAsync(currentScene);
+#endif
             else
                 await _manager.UnloadSceneAsync(new LoadSceneInfoScene(currentScene));
         }

diff --git a/Packages/mygamedevtools-scene-loader/Runtime/Structs/LoadSceneInfoAssetReference.cs b/Packages/mygamedevtools-scene-loader/Runtime/Structs/LoadSceneInfoAssetReference.cs
@@ -1,10 +1,4 @@
 #if ENABLE_ADDRESSABLES
-/**
- * LoadSceneInfoAssetReference.cs
- * Created by: João Borks [joao.borks@gmail.com]
- * Created on: 2023-02-01
- */
-
 using System;
 using UnityEngine.AddressableAssets;
 using UnityEngine.ResourceManagement.ResourceProviders;

diff --git a/Packages/mygamedevtools-scene-loader/Runtime/Structs/LoadSceneInfoIndex.cs b/Packages/mygamedevtools-scene-loader/Runtime/Structs/LoadSceneInfoIndex.cs
@@ -1,9 +1,3 @@
-/**
- * LoadSceneInfoIndex.cs
- * Created by: João Borks [joao.borks@gmail.com]
- * Created on: 8/24/2022 (en-US)
- */
-
 using System;
 using UnityEngine.SceneManagement;
 

diff --git a/Packages/mygamedevtools-scene-loader/Runtime/Structs/LoadSceneInfoName.cs b/Packages/mygamedevtools-scene-loader/Runtime/Structs/LoadSceneInfoName.cs
@@ -1,9 +1,3 @@
-/**
- * LoadSceneInfoName.cs
- * Created by: João Borks [joao.borks@gmail.com]
- * Created on: 8/24/2022 (en-US)
- */
-
 using System;
 using UnityEngine.SceneManagement;
 

diff --git a/Packages/mygamedevtools-scene-loader/Runtime/Structs/LoadSceneInfoScene.cs b/Packages/mygamedevtools-scene-loader/Runtime/Structs/LoadSceneInfoScene.cs
@@ -1,9 +1,3 @@
-/**
- * LoadSceneInfoScene.cs
- * Created by: João Borks [joao.borks@gmail.com]
- * Created on: 2022-12-21
- */
-
 using System;
 using UnityEngine.SceneManagement;
 

diff --git a/Packages/mygamedevtools-scene-loader/Runtime/Utilities/RoutineBehaviour.cs b/Packages/mygamedevtools-scene-loader/Runtime/Utilities/RoutineBehaviour.cs
@@ -1,9 +1,3 @@
-/**
- * RoutineBehaviour.cs
- * Created by: João Borks [joao.borks@gmail.com]
- * Created on: 9/4/2022 (en-US)
- */
-
 using UnityEngine;
 
 public class RoutineBehaviour : MonoBehaviour 

diff --git a/Packages/mygamedevtools-scene-loader/Runtime/Utilities/WaitTask.cs b/Packages/mygamedevtools-scene-loader/Runtime/Utilities/WaitTask.cs
@@ -1,9 +1,3 @@
-/**
- * WaitTask.cs
- * Created by: João Borks [joao.borks@gmail.com]
- * Created on: 2022-12-21
- */
-
 using System.Collections;
 using System.Threading.Tasks;
 

diff --git a/Packages/mygamedevtools-scene-loader/Tests/Runtime/LoadingBehaviorTests.cs b/Packages/mygamedevtools-scene-loader/Tests/Runtime/LoadingBehaviorTests.cs
@@ -1,9 +1,3 @@
-/**
- * LoadingBehaviorTests.cs
- * Created by: João Borks [joao.borks@gmail.com]
- * Created on: 2023-01-31
- */
-
 using NUnit.Framework;
 using System.Collections;
 using UnityEngine;
@@ -16,7 +10,11 @@ public class LoadingBehaviorTests
         [OneTimeTearDown]
         public void Teardown()
         {
+#if UNITY_2023_2_OR_NEWER
+            var behaviors = Object.FindObjectsByType<LoadingBehavior>(FindObjectsSortMode.None);
+#else
             var behaviors = Object.FindObjectsOfType<LoadingBehavior>();
+#endif
             foreach (var b in behaviors)
                 Object.DestroyImmediate(b.gameObject);
         }

diff --git a/Packages/mygamedevtools-scene-loader/Tests/Runtime/LoadingFaderTests.cs b/Packages/mygamedevtools-scene-loader/Tests/Runtime/LoadingFaderTests.cs
@@ -1,9 +1,3 @@
-/**
- * LoadingFaderTests.cs
- * Created by: João Borks [joao.borks@gmail.com]
- * Created on: 2023-02-01
- */
-
 using NUnit.Framework;
 using System.Collections;
 using UnityEngine;
@@ -16,8 +10,13 @@ public class LoadingFaderTests
         [OneTimeTearDown]
         public void Teardown()
         {
+#if UNITY_2023_2_OR_NEWER
+            Object.DestroyImmediate(Object.FindAnyObjectByType<LoadingBehavior>().gameObject);
+            Object.DestroyImmediate(Object.FindAnyObjectByType<LoadingFader>().gameObject);
+#else
             Object.DestroyImmediate(Object.FindObjectOfType<LoadingBehavior>().gameObject);
             Object.DestroyImmediate(Object.FindObjectOfType<LoadingFader>().gameObject);
+#endif
         }
 
         [UnityTest]

diff --git a/Packages/mygamedevtools-scene-loader/Tests/Runtime/LoadingFeedbackTests.cs b/Packages/mygamedevtools-scene-loader/Tests/Runtime/LoadingFeedbackTests.cs
@@ -1,9 +1,3 @@
-/**
- * LoadingFeedbackTests.cs
- * Created by: João Borks [joao.borks@gmail.com]
- * Created on: 2023-01-31
- */
-
 using NUnit.Framework;
 using System.Collections;
 using UnityEngine;

diff --git a/Packages/mygamedevtools-scene-loader/Tests/Runtime/LoadingProgressTests.cs b/Packages/mygamedevtools-scene-loader/Tests/Runtime/LoadingProgressTests.cs
@@ -1,9 +1,3 @@
-/**
- * LoadingProgressTests.cs
- * Created by: João Borks [joao.borks@gmail.com]
- * Created on: 2023-01-31
- */
-
 using NUnit.Framework;
 
 namespace MyGameDevTools.SceneLoading.Tests