From 3aac8868f770696bcbb86595da77718afc147c9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Borks?= Date: Fri, 1 Dec 2023 22:58:46 -0300 Subject: [PATCH] fix: upgrade to unity 2023.2 (#22) --- .github/workflows/release.yml | 2 +- .github/workflows/test.yml | 6 +- Packages/manifest.json | 12 ++-- .../Runtime/Interfaces/ILoadSceneInfo.cs | 6 -- .../Runtime/Interfaces/ISceneLoader.cs | 6 -- .../Runtime/Interfaces/ISceneLoaderAsync.cs | 6 -- .../Runtime/Interfaces/ISceneManager.cs | 6 -- .../Runtime/Loading/LoadingBehavior.cs | 6 -- .../Runtime/Loading/LoadingFader.cs | 6 -- .../Runtime/Loading/LoadingFeedbackSlider.cs | 6 -- .../Runtime/Loading/LoadingFeedbackText.cs | 6 -- .../Loading/LoadingFeedbackTextMeshPro.cs | 6 -- .../Runtime/Loading/LoadingProgress.cs | 6 -- .../Runtime/Loading/LoadingState.cs | 6 -- .../Runtime/Managers/SceneManager.cs | 6 -- .../Managers/SceneManagerAddressable.cs | 6 -- .../Runtime/SceneLoaders/SceneLoaderAsync.cs | 10 ++-- .../SceneLoaders/SceneLoaderCoroutine.cs | 10 ++-- .../SceneLoaders/SceneLoaderUniTask.cs | 14 +++-- .../Structs/LoadSceneInfoAssetReference.cs | 6 -- .../Runtime/Structs/LoadSceneInfoIndex.cs | 6 -- .../Runtime/Structs/LoadSceneInfoName.cs | 6 -- .../Runtime/Structs/LoadSceneInfoScene.cs | 6 -- .../Runtime/Utilities/RoutineBehaviour.cs | 6 -- .../Runtime/Utilities/WaitTask.cs | 6 -- .../Tests/Runtime/LoadingBehaviorTests.cs | 10 ++-- .../Tests/Runtime/LoadingFaderTests.cs | 11 ++-- .../Tests/Runtime/LoadingFeedbackTests.cs | 6 -- .../Tests/Runtime/LoadingProgressTests.cs | 6 -- .../Tests/Runtime/SceneLoaderTests.cs | 6 -- .../Tests/Runtime/SceneManagerTests.cs | 6 -- .../Tests/Runtime/Setup/SceneBuilder.cs | 6 -- .../Runtime/Setup/SceneTestEnvironment.cs | 6 -- .../Utilities/SceneLoaderTestUtilities.cs | 6 -- .../Runtime/Utilities/SceneReferenceData.cs | 6 -- Packages/packages-lock.json | 60 +++++++++---------- ProjectSettings/EditorBuildSettings.asset | 1 + ProjectSettings/MultiplayerManager.asset | 7 +++ ProjectSettings/ProjectVersion.txt | 4 +- codecov.yml | 9 +++ 40 files changed, 81 insertions(+), 237 deletions(-) create mode 100644 ProjectSettings/MultiplayerManager.asset create mode 100644 codecov.yml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6d5f05f..f5549fd 100644 --- 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 index 9147e55..e85d888 100644 --- 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 index 268962d..a91eda9 100644 --- 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 index 18bfd69..bb69288 100644 --- 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 index 007f882..18150e7 100644 --- 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 index c5ae2f5..ab1c0e9 100644 --- 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 index 2f10e61..8926573 100644 --- 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 index 1b3132e..9ccc1dd 100644 --- 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 index 84e5648..76c6877 100644 --- 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 index c3cc25b..adda267 100644 --- 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 index d132529..935e352 100644 --- 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 index bc51110..e5bcc6f 100644 --- 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 index 6e1bb9d..2d463db 100644 --- 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 index f8a5e28..785d4d8 100644 --- 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 { /// diff --git a/Packages/mygamedevtools-scene-loader/Runtime/Managers/SceneManager.cs b/Packages/mygamedevtools-scene-loader/Runtime/Managers/SceneManager.cs index a167b47..12484e2 100644 --- 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 index b9f97c7..322504a 100644 --- 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 index 06bf4e9..10764ba 100644 --- 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 TransitionWithIntermediateAsync(ILoadSceneInfo[] target var currentScene = externalOrigin ? externalOriginScene : _manager.GetActiveScene(); +#if UNITY_2023_2_OR_NEWER + var loadingBehavior = Object.FindObjectsByType(UnityEngine.FindObjectsSortMode.None).FirstOrDefault(l => l.gameObject.scene == loadingScene); +#else var loadingBehavior = Object.FindObjectsOfType().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 index c08d8bc..81a3a49 100644 --- 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(UnityEngine.FindObjectsSortMode.None).FirstOrDefault(l => l.gameObject.scene == loadingScene); +#else var loadingBehavior = Object.FindObjectsOfType().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 index 26904be..6395fb4 100644 --- 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 TransitionWithIntermediateAsync(ILoadSceneInfo[] targetSc var currentScene = externalOrigin ? externalOriginScene : _manager.GetActiveScene(); +#if UNITY_2023_2_OR_NEWER + var loadingBehavior = Object.FindObjectsByType(UnityEngine.FindObjectsSortMode.None).FirstOrDefault(l => l.gameObject.scene == loadingScene); +#else var loadingBehavior = Object.FindObjectsOfType().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 index 58f69db..d98c590 100644 --- 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 index e900fe1..c411990 100644 --- 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 index 087fef7..3999ea6 100644 --- 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 index 44da0ff..921e3de 100644 --- 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 index 0561285..30959b6 100644 --- 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 index 2fa2de6..12ec7b7 100644 --- 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 index 36f25d5..ca67cab 100644 --- 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(FindObjectsSortMode.None); +#else var behaviors = Object.FindObjectsOfType(); +#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 index 12e3d38..d678a9f 100644 --- 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().gameObject); + Object.DestroyImmediate(Object.FindAnyObjectByType().gameObject); +#else Object.DestroyImmediate(Object.FindObjectOfType().gameObject); Object.DestroyImmediate(Object.FindObjectOfType().gameObject); +#endif } [UnityTest] diff --git a/Packages/mygamedevtools-scene-loader/Tests/Runtime/LoadingFeedbackTests.cs b/Packages/mygamedevtools-scene-loader/Tests/Runtime/LoadingFeedbackTests.cs index 76bfdde..71f2285 100644 --- 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 index c2a76f6..38c4991 100644 --- 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 diff --git a/Packages/mygamedevtools-scene-loader/Tests/Runtime/SceneLoaderTests.cs b/Packages/mygamedevtools-scene-loader/Tests/Runtime/SceneLoaderTests.cs index 51df6c9..be12442 100644 --- a/Packages/mygamedevtools-scene-loader/Tests/Runtime/SceneLoaderTests.cs +++ b/Packages/mygamedevtools-scene-loader/Tests/Runtime/SceneLoaderTests.cs @@ -1,9 +1,3 @@ -/** - * SceneLoaderTests.cs - * Created by: João Borks [joao.borks@gmail.com] - * Created on: 2022-12-07 - */ - #if ENABLE_UNITASK using Cysharp.Threading.Tasks; using MyGameDevTools.SceneLoading.UniTaskSupport; diff --git a/Packages/mygamedevtools-scene-loader/Tests/Runtime/SceneManagerTests.cs b/Packages/mygamedevtools-scene-loader/Tests/Runtime/SceneManagerTests.cs index 7b9ed83..5b581e9 100644 --- a/Packages/mygamedevtools-scene-loader/Tests/Runtime/SceneManagerTests.cs +++ b/Packages/mygamedevtools-scene-loader/Tests/Runtime/SceneManagerTests.cs @@ -1,9 +1,3 @@ -/** - * SceneManagerTests.cs - * Created by: João Borks [joao.borks@gmail.com] - * Created on: 2022-12-21 - */ - using NUnit.Framework; using System; using System.Collections; diff --git a/Packages/mygamedevtools-scene-loader/Tests/Runtime/Setup/SceneBuilder.cs b/Packages/mygamedevtools-scene-loader/Tests/Runtime/Setup/SceneBuilder.cs index f1fa977..caa3715 100644 --- a/Packages/mygamedevtools-scene-loader/Tests/Runtime/Setup/SceneBuilder.cs +++ b/Packages/mygamedevtools-scene-loader/Tests/Runtime/Setup/SceneBuilder.cs @@ -1,9 +1,3 @@ -/** - * SceneBuilder.cs - * Created by: João Borks [joao.borks@gmail.com] - * Created on: 2022-12-12 - */ - #if UNITY_EDITOR using UnityEngine; using UnityEditor.SceneManagement; diff --git a/Packages/mygamedevtools-scene-loader/Tests/Runtime/Setup/SceneTestEnvironment.cs b/Packages/mygamedevtools-scene-loader/Tests/Runtime/Setup/SceneTestEnvironment.cs index 651f1b9..6850e94 100644 --- a/Packages/mygamedevtools-scene-loader/Tests/Runtime/Setup/SceneTestEnvironment.cs +++ b/Packages/mygamedevtools-scene-loader/Tests/Runtime/Setup/SceneTestEnvironment.cs @@ -1,9 +1,3 @@ -/** - * SceneTestEnvironment.cs - * Created by: João Borks [joao.borks@gmail.com] - * Created on: 2022-12-12 - */ - #if UNITY_EDITOR using System.Linq; using System.Collections.Generic; diff --git a/Packages/mygamedevtools-scene-loader/Tests/Runtime/Utilities/SceneLoaderTestUtilities.cs b/Packages/mygamedevtools-scene-loader/Tests/Runtime/Utilities/SceneLoaderTestUtilities.cs index 62f7e2e..786d325 100644 --- a/Packages/mygamedevtools-scene-loader/Tests/Runtime/Utilities/SceneLoaderTestUtilities.cs +++ b/Packages/mygamedevtools-scene-loader/Tests/Runtime/Utilities/SceneLoaderTestUtilities.cs @@ -1,9 +1,3 @@ -/** - * SceneLoaderTestUtilities.cs - * Created by: João Borks [joao.borks@gmail.com] - * Created on: 2022-12-12 - */ - using UnityEngine; using System.Collections; using NUnit.Framework; diff --git a/Packages/mygamedevtools-scene-loader/Tests/Runtime/Utilities/SceneReferenceData.cs b/Packages/mygamedevtools-scene-loader/Tests/Runtime/Utilities/SceneReferenceData.cs index 31f7258..4b441e2 100644 --- a/Packages/mygamedevtools-scene-loader/Tests/Runtime/Utilities/SceneReferenceData.cs +++ b/Packages/mygamedevtools-scene-loader/Tests/Runtime/Utilities/SceneReferenceData.cs @@ -1,10 +1,4 @@ #if ENABLE_ADDRESSABLES -/** - * SceneReferenceData.cs - * Created by: João Borks [joao.borks@gmail.com] - * Created on: 2023-02-03 - */ - using System.Collections.Generic; using UnityEngine; using UnityEngine.AddressableAssets; diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 2dd947e..dd8b2af 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -1,7 +1,7 @@ { "dependencies": { "com.cysharp.unitask": { - "version": "2.3.3", + "version": "2.5.0", "depth": 0, "source": "registry", "dependencies": {}, @@ -21,11 +21,11 @@ "url": "https://package.openupm.com" }, "com.unity.addressables": { - "version": "1.21.15", + "version": "1.21.19", "depth": 0, "source": "registry", "dependencies": { - "com.unity.scriptablebuildpipeline": "1.21.8", + "com.unity.scriptablebuildpipeline": "1.21.21", "com.unity.modules.assetbundle": "1.0.0", "com.unity.modules.imageconversion": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0", @@ -42,28 +42,27 @@ "url": "https://packages.unity.com" }, "com.unity.ext.nunit": { - "version": "1.0.6", + "version": "2.0.5", "depth": 2, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.feature.development": { - "version": "1.0.1", + "version": "1.0.2", "depth": 0, "source": "builtin", "dependencies": { - "com.unity.ide.visualstudio": "2.0.18", - "com.unity.ide.rider": "3.0.24", - "com.unity.ide.vscode": "1.2.5", + "com.unity.ide.visualstudio": "2.0.22", + "com.unity.ide.rider": "3.0.26", "com.unity.editorcoroutines": "1.0.0", "com.unity.performance.profile-analyzer": "1.2.2", - "com.unity.test-framework": "1.1.33", + "com.unity.test-framework": "1.3.9", "com.unity.testtools.codecoverage": "1.2.4" } }, "com.unity.ide.rider": { - "version": "3.0.24", + "version": "3.0.26", "depth": 1, "source": "registry", "dependencies": { @@ -80,13 +79,6 @@ }, "url": "https://packages.unity.com" }, - "com.unity.ide.vscode": { - "version": "1.2.5", - "depth": 1, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" - }, "com.unity.performance.profile-analyzer": { "version": "1.2.2", "depth": 1, @@ -95,7 +87,7 @@ "url": "https://packages.unity.com" }, "com.unity.scriptablebuildpipeline": { - "version": "1.21.8", + "version": "1.21.21", "depth": 1, "source": "registry", "dependencies": {}, @@ -109,11 +101,11 @@ "url": "https://packages.unity.com" }, "com.unity.test-framework": { - "version": "1.1.33", + "version": "1.3.9", "depth": 1, "source": "registry", "dependencies": { - "com.unity.ext.nunit": "1.0.6", + "com.unity.ext.nunit": "2.0.3", "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" }, @@ -129,17 +121,8 @@ }, "url": "https://packages.unity.com" }, - "com.unity.textmeshpro": { - "version": "3.0.6", - "depth": 0, - "source": "registry", - "dependencies": { - "com.unity.ugui": "1.0.0" - }, - "url": "https://packages.unity.com" - }, "com.unity.timeline": { - "version": "1.7.5", + "version": "1.8.6", "depth": 0, "source": "registry", "dependencies": { @@ -151,7 +134,7 @@ "url": "https://packages.unity.com" }, "com.unity.ugui": { - "version": "1.0.0", + "version": "2.0.0", "depth": 0, "source": "builtin", "dependencies": { @@ -159,6 +142,12 @@ "com.unity.modules.imgui": "1.0.0" } }, + "com.unity.modules.accessibility": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, "com.unity.modules.ai": { "version": "1.0.0", "depth": 0, @@ -206,6 +195,12 @@ "com.unity.modules.animation": "1.0.0" } }, + "com.unity.modules.hierarchycore": { + "version": "1.0.0", + "depth": 1, + "source": "builtin", + "dependencies": {} + }, "com.unity.modules.imageconversion": { "version": "1.0.0", "depth": 0, @@ -294,7 +289,8 @@ "dependencies": { "com.unity.modules.ui": "1.0.0", "com.unity.modules.imgui": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0" + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.hierarchycore": "1.0.0" } }, "com.unity.modules.umbra": { diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 10798be..01784b6 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -7,3 +7,4 @@ EditorBuildSettings: m_Scenes: [] m_configObjects: com.unity.addressableassets: {fileID: 11400000, guid: 2404e579f27677c41bbbbaeba6c32ba5, type: 2} + m_UseUCBPForAssetBundles: 0 diff --git a/ProjectSettings/MultiplayerManager.asset b/ProjectSettings/MultiplayerManager.asset new file mode 100644 index 0000000..8073753 --- /dev/null +++ b/ProjectSettings/MultiplayerManager.asset @@ -0,0 +1,7 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!655991488 &1 +MultiplayerManager: + m_ObjectHideFlags: 0 + m_EnableMultiplayerRoles: 0 + m_ActiveMultiplayerRole: 0 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 9785246..5773716 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2022.3.8f1 -m_EditorVersionWithRevision: 2022.3.8f1 (b5eafc012955) +m_EditorVersion: 2023.2.1f1 +m_EditorVersionWithRevision: 2023.2.1f1 (a6dd9a634651) diff --git a/codecov.yml b/codecov.yml new file mode 100644 index 0000000..2582e87 --- /dev/null +++ b/codecov.yml @@ -0,0 +1,9 @@ +coverage: + status: + project: + default: + informational: true + patch: + default: + informational: true + only_pulls: true \ No newline at end of file