mygamedevtools · joaoborks · Dec 2, 2023 · Dec 2, 2023 · Dec 2, 2023 · Dec 2, 2023
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 [[email protected]]
- * 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 [[email protected]]
- * 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 [[email protected]]
- * 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 [[email protected]]
- * 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 [[email protected]]
- * 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 [[email protected]]
- * 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 [[email protected]]
- * 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 [[email protected]]
- * 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 [[email protected]]
- * 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 [[email protected]]
- * 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 [[email protected]]
- * 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 [[email protected]]
- * Created on: 2022-12-21
- */
-
 #if USE_UNITASK
 using Cysharp.Threading.Tasks;
 #endif
@@ -78,9 +72,9 @@
        public async ValueTask<Scene[]> LoadScenesAsync(ILoadSceneInfo[] sceneInfos, int setIndexActive = -1, IProgress<float> progress = null)
        {
            if (sceneInfos == null || sceneInfos.Length == 0)
                throw new ArgumentException(nameof(sceneInfos), $"[{GetType().Name}] Provided scene group is null or empty.");
            if (setIndexActive >= sceneInfos.Length)
                throw new ArgumentException(nameof(setIndexActive), $"[{GetType().Name}] Provided index to set active is bigger than the provided scene group size.");

            var operationGroup = GetLoadSceneOperations(sceneInfos, ref setIndexActive);
            if (operationGroup.Operations.Count == 0)
@@ -120,7 +114,7 @@
        public async ValueTask<Scene[]> UnloadScenesAsync(ILoadSceneInfo[] sceneInfos)
        {
            if (sceneInfos == null || sceneInfos.Length == 0)
                throw new ArgumentException($"[{GetType().Name}] Provided scene group is null or empty.", nameof(sceneInfos));

            var loadedScenes = GetLastLoadedScenesByInfos(sceneInfos, out var unloadingIndexes);
            if (loadedScenes.Count == 0)
@@ -130,10 +124,10 @@
            var unloadingScenes = new Scene[unloadingLength];
            int i;
            for (i = 0; i < unloadingLength; i++)
                unloadingScenes[i] = loadedScenes[unloadingIndexes[i]];

            for (i = 0; i < unloadingLength; i++)
                loadedScenes.Remove(unloadingScenes[i]);

            var operationGroup = new AsyncOperationGroup(loadedScenes.Count);
            foreach (var scene in loadedScenes)
@@ -160,12 +154,12 @@

            var tasks = new Task[unloadingLength];
            for (i = 0; i < unloadingLength; i++)
                tasks[i] = WaitForSceneUnload(unloadingScenes[i]).AsTask();

            await Task.WhenAll(tasks);

            foreach (var scene in unloadingScenes)
                loadedScenes.Add(scene);
            return loadedScenes.ToArray();
        }

@@ -198,7 +192,7 @@
                if (TryGetLoadSceneOperation(sceneInfos[i], out var operation))
                    operationGroup.Operations.Add(operation);
                else if (i == setIndexActive)
                    setIndexActive = -1;
            }
            return operationGroup;
        }
@@ -217,7 +211,7 @@
            sceneCount = _unloadingScenes.Count;
            for (i = 0; i < sceneCount; i++)
                if (tryValidateSceneReference(_unloadingScenes[i], out int index))
                    unloadingIndexesList.Add(index);

            if (sceneInfosList.Count > 0)
            {
@@ -262,16 +256,16 @@
            }

            if (sceneInfosList.Count > 0)
            {
                var builder = new StringBuilder($"[{GetType().Name}] Some of the scenes could not be found loaded in the Unity Scene Manager:\n");
                for (int i = 0; i < sceneInfosList.Count; i++)
                    builder.AppendLine($" ({i}): {sceneInfosList[i]}");

                Debug.LogWarning(builder.ToString());

                if (setIndexActive >= 0 && sceneInfosList.Contains(sceneInfos[setIndexActive]))
                    setIndexActive = -1;
            }

            return scenes.ToArray();

@@ -298,10 +292,10 @@
                operation = UnitySceneManager.LoadSceneAsync(index, LoadSceneMode.Additive);
            else if (sceneInfo.Reference is string name)
                operation = UnitySceneManager.LoadSceneAsync(name, LoadSceneMode.Additive);
            else if (sceneInfo.Reference is Scene scene)
                operation = UnitySceneManager.LoadSceneAsync(scene.buildIndex, LoadSceneMode.Additive);
            else
                Debug.LogWarning($"[{GetType().Name}] Unexpected {nameof(ILoadSceneInfo.Reference)} type.");

            return operation != null;
        }

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 [[email protected]]
- * Created on: 2023-01-21
- */
-
 #if USE_UNITASK
 using Cysharp.Threading.Tasks;
 #endif
@@ -80,9 +74,9 @@
        public async ValueTask<Scene[]> LoadScenesAsync(ILoadSceneInfo[] sceneInfos, int setIndexActive = -1, IProgress<float> progress = null)
        {
            if (sceneInfos == null || sceneInfos.Length == 0)
                throw new ArgumentException(nameof(sceneInfos), $"[{GetType().Name}] Provided scene group is null or empty.");
            if (setIndexActive >= sceneInfos.Length)
                throw new ArgumentException(nameof(setIndexActive), $"[{GetType().Name}] Provided index to set active is bigger than the provided scene group size.");

            var operationGroup = GetLoadSceneOperations(sceneInfos, ref setIndexActive);
            if (operationGroup.Operations.Count == 0)
@@ -122,7 +116,7 @@
        public async ValueTask<Scene[]> UnloadScenesAsync(ILoadSceneInfo[] sceneInfos)
        {
            if (sceneInfos == null || sceneInfos.Length == 0)
                throw new ArgumentException($"[{GetType().Name}] Provided scene group is null or empty.", nameof(sceneInfos));

            var loadedScenes = GetLastLoadedScenesByInfos(sceneInfos, out var unloadingIndexes);
            if (loadedScenes.Count == 0)
@@ -132,10 +126,10 @@
            var unloadingScenes = new SceneInstance[unloadingLength];
            int i;
            for (i = 0; i < unloadingLength; i++)
                unloadingScenes[i] = loadedScenes[unloadingIndexes[i]];

            for (i = 0; i < unloadingLength; i++)
                loadedScenes.Remove(unloadingScenes[i]);

            var operationGroup = new AsyncOperationHandleGroup(loadedScenes.Count);
            foreach (var sceneInstance in loadedScenes)
@@ -162,12 +156,12 @@

            var tasks = new Task[unloadingLength];
            for (i = 0; i < unloadingLength; i++)
                tasks[i] = WaitForSceneUnload(unloadingScenes[i]).AsTask();

            await Task.WhenAll(tasks);

            foreach (var scene in unloadingScenes)
                loadedScenes.Add(scene);

            return ToSceneArray(loadedScenes);
        }
@@ -202,7 +196,7 @@
                if (TryGetLoadSceneOperation(sceneInfos[i], out var operation))
                    operationGroup.Operations.Add(operation);
                else if (i == setIndexActive)
                    setIndexActive = -1;
            }
            return operationGroup;
        }
@@ -220,8 +214,8 @@

            sceneCount = _unloadingScenes.Count;
            for (i = 0; i < sceneCount; i++)
                if (tryValidateSceneReference(_unloadingScenes[i], out int index))
                    unloadingIndexesList.Add(index);

            if (sceneInfosList.Count > 0)
            {
@@ -280,7 +274,7 @@

            bool isValid = operationHandle.IsValid();
            if (!isValid)
                Debug.LogWarning($"[{GetType().Name}] Unexpected {nameof(ILoadSceneInfo.Reference)} type: {sceneInfo.Reference}");
            return isValid;
        }


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 [[email protected]]
- * Created on: 7/16/2022 (en-US)
- */
-
 using System;
 using System.Linq;
 using System.Threading.Tasks;
@@ -68,7 +62,11 @@
 
             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);
@@ -119,7 +117,7 @@
        }

        public override string ToString()
        {
            return $"Scene Loader [Async] with {_manager.GetType().Name}";
        }
    }

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 [[email protected]]
- * Created on: 9/4/2022 (en-US)
- */
-
 using System;
 using System.Collections;
 using System.Linq;
@@ -77,7 +71,11 @@
 
             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);
@@ -120,7 +118,7 @@
        }

        public override string ToString()
        {
            return $"Scene Loader [Coroutine] with {_manager.GetType().Name}";
        }
    }

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 [[email protected]]
- * Created on: 8/1/2022 (en-US)
- */
-
 using Cysharp.Threading.Tasks;
 using System;
 using System.Linq;
@@ -69,7 +63,11 @@
 
             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,14 +106,18 @@
                 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));
         }

        public override string ToString()
        {
            return $"Scene Loader [UniTask] with {_manager.GetType().Name}";
        }
    }
 }

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 [[email protected]]
- * Created on: 2023-02-01
- */
-
 using System;
 using UnityEngine.AddressableAssets;
 using UnityEngine.ResourceManagement.ResourceProviders;
@@ -35,8 +29,8 @@
        }

        public override string ToString()
        {
            return $"Scene with asset reference {_assetReference}";
        }
    }
 }

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 [[email protected]]
- * Created on: 8/24/2022 (en-US)
- */
-
 using System;
 using UnityEngine.SceneManagement;
 
@@ -33,7 +27,7 @@
        public bool IsReferenceToScene(Scene scene) => scene.buildIndex == _buildIndex;

        public override string ToString()
        {
            return $"Scene with index [{_buildIndex}]";
        }
    }

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 [[email protected]]
- * 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 [[email protected]]
- * Created on: 2022-12-21
- */
-
 using System;
 using UnityEngine.SceneManagement;
 
@@ -25,7 +19,7 @@
        public bool IsReferenceToScene(Scene scene) => scene == _scene;

        public override string ToString()
        {
            return $"Scene \"{_scene.name}\" [{_scene.handle}]";
        }
    }

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 [[email protected]]
- * 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 [[email protected]]
- * 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 [[email protected]]
- * 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 [[email protected]]
- * 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 [[email protected]]
- * 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 [[email protected]]
- * Created on: 2023-01-31
- */
-
 using NUnit.Framework;
 
 namespace MyGameDevTools.SceneLoading.Tests