Update CI, bump Unity version, fix deprecations

Author: Edvinas01

.github/README.md

@@ -1,6 +1,6 @@
 # Scriptable Scenes
 
-[![Unity 2022.3+](https://img.shields.io/badge/unity-2022.3%2B-blue.svg)](https://unity3d.com/get-unity/download)
+[![Unity 6000.0+](https://img.shields.io/badge/unity-6000.0%2B-blue.svg)](https://unity3d.com/get-unity/download)
 [![openupm](https://img.shields.io/npm/v/com.chark.scriptable-scenes?label=openupm&registry_uri=https://package.openupm.com)](https://openupm.com/packages/com.chark.scriptable-scenes/)
 [![Actions Status](https://github.com/chark/scriptable-scenes/workflows/CI/badge.svg)](https://github.com/chark/scriptable-scenes/actions)
 

.github/workflows/activation.yml

@@ -16,7 +16,7 @@ jobs:
 
       # Upload artifact (Unity_v20XX.X.XXXX.alf)
       - name: Expose as artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ steps.getManualLicenseFile.outputs.filePath }}
           path: ${{ steps.getManualLicenseFile.outputs.filePath }}

.github/workflows/ci.yml

@@ -21,20 +21,20 @@ jobs:
     strategy:
       matrix:
         unityVersion:
-          - 2022.3.10f1
+          - 6000.0.47f1
 
     steps:
 
       # Checkout (without LFS)
       - name: Checkout Repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       # Git LFS
       - name: Create LFS file list
         run: git lfs ls-files -l | cut -d' ' -f1 | sort > .lfs-assets-id
 
       - name: Restore LFS cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         id: lfs-cache
         with:
           path: .git/lfs
@@ -47,7 +47,7 @@ jobs:
           git reset --hard
 
       # Cache
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
         with:
           path: Library
           key: Library-${{ hashFiles('Assets/**', 'Packages/**', 'ProjectSettings/**') }}
@@ -56,10 +56,12 @@ jobs:
 
       # Test
       - name: Run Tests
-        uses: game-ci/unity-test-runner@v3.0.0
+        uses: game-ci/unity-test-runner@v4
         id: tests
         env:
           UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
+          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
+          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
         with:
           githubToken: ${{ secrets.GITHUB_TOKEN }}
 

.github/workflows/upm.yml

@@ -18,7 +18,7 @@ jobs:
       SAMPLE_DST_DIR: Samples~
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 

Packages/com.chark.scriptable-scenes/Editor/Utilities/ScriptableSceneEditorUtilities.cs

@@ -99,7 +99,7 @@ internal static void Load(this ScriptableSceneCollection collection)
                 return;
             }
 
-            var sceneController = Object.FindObjectOfType<ScriptableSceneController>();
+            var sceneController = Object.FindFirstObjectByType<ScriptableSceneController>();
             if (sceneController)
             {
                 sceneController.LoadSceneCollection(collection);

Packages/com.chark.scriptable-scenes/Runtime/ScriptableSceneController.cs

@@ -101,7 +101,7 @@ private enum CollectionLoadMode
 
         private void Awake()
         {
-            var otherController = FindObjectOfType<ScriptableSceneController>();
+            var otherController = FindFirstObjectByType<ScriptableSceneController>();
             if (otherController && otherController != this)
             {
                 var controllerGameObject = otherController.gameObject;

Packages/com.chark.scriptable-scenes/Samples/MultipleScenes/Scripts/GameEvents.cs

@@ -28,7 +28,7 @@ internal static void RaiseLoadScene(ScriptableSceneCollection collection)
 
         private static void SetupSceneController()
         {
-            sceneController = Object.FindObjectOfType<ScriptableSceneController>();
+            sceneController = Object.FindFirstObjectByType<ScriptableSceneController>();
         }
     }
 }

Packages/manifest.json

@@ -1,8 +1,8 @@
 {
   "dependencies": {
-    "com.unity.ai.navigation": "1.1.4",
-    "com.unity.ide.rider": "3.0.25",
-    "com.unity.test-framework": "1.1.33",
-    "com.unity.textmeshpro": "3.0.6"
+    "com.unity.ide.rider": "3.0.37",
+    "com.unity.test-framework": "1.5.1",
+    "com.unity.ugui": "2.0.0",
+    "com.unity.modules.accessibility": "1.0.0"
   }
 }

Packages/packages-lock.json

@@ -6,24 +6,14 @@
       "source": "embedded",
       "dependencies": {}
     },
-    "com.unity.ai.navigation": {
-      "version": "1.1.4",
-      "depth": 0,
-      "source": "registry",
-      "dependencies": {
-        "com.unity.modules.ai": "1.0.0"
-      },
-      "url": "https://packages.unity.com"
-    },
     "com.unity.ext.nunit": {
-      "version": "1.0.6",
+      "version": "2.0.5",
       "depth": 1,
-      "source": "registry",
-      "dependencies": {},
-      "url": "https://packages.unity.com"
+      "source": "builtin",
+      "dependencies": {}
     },
     "com.unity.ide.rider": {
-      "version": "3.0.25",
+      "version": "3.0.37",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -32,37 +22,27 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.test-framework": {
-      "version": "1.1.33",
+      "version": "1.5.1",
       "depth": 0,
-      "source": "registry",
+      "source": "builtin",
       "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"
-      },
-      "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.ugui": {
-      "version": "1.0.0",
-      "depth": 1,
+      "version": "2.0.0",
+      "depth": 0,
       "source": "builtin",
       "dependencies": {
         "com.unity.modules.ui": "1.0.0",
         "com.unity.modules.imgui": "1.0.0"
       }
     },
-    "com.unity.modules.ai": {
+    "com.unity.modules.accessibility": {
       "version": "1.0.0",
-      "depth": 1,
+      "depth": 0,
       "source": "builtin",
       "dependencies": {}
     },
@@ -80,7 +60,7 @@
     },
     "com.unity.modules.ui": {
       "version": "1.0.0",
-      "depth": 2,
+      "depth": 1,
       "source": "builtin",
       "dependencies": {}
     }

ProjectSettings/ProjectVersion.txt

@@ -1,2 +1,2 @@
-m_EditorVersion: 2022.3.10f1
-m_EditorVersionWithRevision: 2022.3.10f1 (ff3792e53c62)
+m_EditorVersion: 6000.0.47f1
+m_EditorVersionWithRevision: 6000.0.47f1 (2ad1ed33fd3b)