Update Commons dependency for 0.2.56 version

techno-dwarf-works · Apr 12, 2024 · aef6961 · aef6961
1 parent 24e0d05
commit aef6961
Show file tree

Hide file tree

Showing 20 changed files with 48 additions and 70 deletions.
diff --git a/Assets/BetterSceneManagement/Editor/BetterSceneManagement.Editor.asmdef b/Assets/BetterSceneManagement/Editor/BetterSceneManagement.Editor.asmdef
@@ -7,10 +7,8 @@
         "GUID:55aff1b29c7ad5b46800023cf2103429",
         "GUID:ecdd0819e3429eb44b13a432679a1135",
         "GUID:1862b35041b066d42ab4d3caf773657b",
-        "GUID:28da8d3b12e3efa47928e0c9070f853d",
-        "GUID:19891d5296046644cbc12fcf3702cca3",
-        "GUID:a59e3daedde9ca94bba45364d4ead25f",
-        "GUID:af7fffdf1d83bc842b0f6e3a01efda16"
+        "GUID:af7fffdf1d83bc842b0f6e3a01efda16",
+        "GUID:8bd4b41f8da90144d9006c4d926c9679"
     ],
     "includePlatforms": [
         "Editor"

diff --git a/Assets/BetterSceneManagement/Editor/EditorAddons/Extensions/SceneAssetExtensions.cs b/Assets/BetterSceneManagement/Editor/EditorAddons/Extensions/SceneAssetExtensions.cs
@@ -1,5 +1,5 @@
 using System;
-using Better.Extensions.Runtime;
+using Better.Commons.Runtime.Utility;
 using Better.SceneManagement.Runtime;
 using UnityEditor;
 

diff --git a/Assets/BetterSceneManagement/Editor/EditorAddons/Utility/BuildSettingsUtility.cs b/Assets/BetterSceneManagement/Editor/EditorAddons/Utility/BuildSettingsUtility.cs
@@ -1,5 +1,5 @@
 using System.Linq;
-using Better.Extensions.Runtime;
+using Better.Commons.Runtime.Extensions;
 using Better.SceneManagement.Runtime;
 using UnityEditor;
 using UnityEngine;

diff --git a/Assets/BetterSceneManagement/Runtime/BetterSceneManagement.Runtime.asmdef b/Assets/BetterSceneManagement/Runtime/BetterSceneManagement.Runtime.asmdef
@@ -5,12 +5,10 @@
         "GUID:01df13aca8d01e24a911bcc3e8277031",
         "GUID:1862b35041b066d42ab4d3caf773657b",
         "GUID:af7fffdf1d83bc842b0f6e3a01efda16",
-        "GUID:28da8d3b12e3efa47928e0c9070f853d",
-        "GUID:a59e3daedde9ca94bba45364d4ead25f",
         "GUID:35101f455c979e94c9a0a4793484b7fd",
-        "GUID:443314a5a4e67c14a88ae223776b6554",
         "GUID:1c5574afb40e5fe4ca9e9c156009297b",
-        "GUID:d103b3c6d6cb0564d8d6543e9d797878"
+        "GUID:d103b3c6d6cb0564d8d6543e9d797878",
+        "GUID:8bd4b41f8da90144d9006c4d926c9679"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],
@@ -31,9 +29,9 @@
             "define": "BETTER_SERVICES"
         },
         {
-            "name": "com.tdw.better.locator",
+            "name": "com.tdw.better.locators",
             "expression": "0.0.7",
-            "define": "BETTER_LOCATOR"
+            "define": "BETTER_LOCATORS"
         }
     ],
     "noEngineReferences": false

diff --git a/...t/Runtime/Implementations/SavesService.cs → ...t/Runtime/Implementations/SceneService.cs b/...t/Runtime/Implementations/SavesService.cs → ...t/Runtime/Implementations/SceneService.cs
@@ -7,7 +7,7 @@
 
 namespace Better.SceneManagement.Runtime
 {
-    public class SavesService : PocoService, ISceneSystem
+    public class SceneService : PocoService, ISceneSystem
     {
         private ISceneSystem _internalSystem;
 

diff --git a/...time/Implementations/SavesService.cs.meta → ...time/Implementations/SceneService.cs.meta b/...time/Implementations/SavesService.cs.meta → ...time/Implementations/SceneService.cs.meta
diff --git a/Assets/BetterSceneManagement/Runtime/SceneReference/SceneReference.cs b/Assets/BetterSceneManagement/Runtime/SceneReference/SceneReference.cs
@@ -1,7 +1,7 @@
 using System;
 using System.IO;
-using Better.Extensions.Runtime;
 using UnityEngine;
+using Better.Commons.Runtime.Extensions;
 using UnityEngine.SceneManagement;
 
 namespace Better.SceneManagement.Runtime

diff --git a/Assets/BetterSceneManagement/Runtime/SceneReference/SceneReferencePartial.cs b/Assets/BetterSceneManagement/Runtime/SceneReference/SceneReferencePartial.cs
@@ -1,5 +1,5 @@
 #if UNITY_EDITOR
-using Better.Extensions.Runtime;
+using Better.Commons.Runtime.Extensions;
 using UnityEditor;
 using UnityEngine;
 

diff --git a/Assets/BetterSceneManagement/Runtime/Sequences/GraduallySequence.cs b/Assets/BetterSceneManagement/Runtime/Sequences/GraduallySequence.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Threading.Tasks;
-using Better.Extensions.Runtime;
+using Better.Commons.Runtime.Extensions;
 using UnityEngine.SceneManagement;
 
 namespace Better.SceneManagement.Runtime.Sequences

diff --git a/Assets/BetterSceneManagement/Runtime/Sequences/IntermediateSequence.cs b/Assets/BetterSceneManagement/Runtime/Sequences/IntermediateSequence.cs
@@ -1,7 +1,8 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
-using Better.Extensions.Runtime;
+using Better.Commons.Runtime.Extensions;
+using Better.Commons.Runtime.Utility;
 using UnityEngine;
 using UnityEngine.SceneManagement;
 

diff --git a/Assets/BetterSceneManagement/Runtime/Sequences/InverseGraduallySequence.cs b/Assets/BetterSceneManagement/Runtime/Sequences/InverseGraduallySequence.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Threading.Tasks;
-using Better.Extensions.Runtime;
+using Better.Commons.Runtime.Extensions;
 using UnityEngine.SceneManagement;
 
 namespace Better.SceneManagement.Runtime.Sequences

diff --git a/Assets/BetterSceneManagement/Runtime/Sequences/ParallelSequence.cs b/Assets/BetterSceneManagement/Runtime/Sequences/ParallelSequence.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Better.Extensions.Runtime;
+using Better.Commons.Runtime.Extensions;
 using UnityEngine.SceneManagement;
 
 namespace Better.SceneManagement.Runtime.Sequences

diff --git a/Assets/BetterSceneManagement/Runtime/Sequences/Sequence.cs b/Assets/BetterSceneManagement/Runtime/Sequences/Sequence.cs
@@ -1,7 +1,8 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
-using Better.Extensions.Runtime;
+using Better.Commons.Runtime.Extensions;
+using Better.Commons.Runtime.Utility;
 using UnityEngine.SceneManagement;
 using UnitySceneManager = UnityEngine.SceneManagement.SceneManager;
 

diff --git a/Assets/BetterSceneManagement/Runtime/Transitions/AdditiveTransitionInfo.cs b/Assets/BetterSceneManagement/Runtime/Transitions/AdditiveTransitionInfo.cs
@@ -2,7 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Better.Extensions.Runtime;
+using Better.Commons.Runtime.Extensions;
+using Better.Commons.Runtime.Utility;
 using Better.SceneManagement.Runtime.Interfaces;
 using Better.SceneManagement.Runtime.Sequences;
 using UnitySceneManager = UnityEngine.SceneManagement.SceneManager;

diff --git a/Assets/BetterSceneManagement/Runtime/Transitions/SingleTransitionInfo.cs b/Assets/BetterSceneManagement/Runtime/Transitions/SingleTransitionInfo.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Threading.Tasks;
-using Better.Extensions.Runtime;
+using Better.Commons.Runtime.Extensions;
+using Better.Commons.Runtime.Utility;
 using Better.SceneManagement.Runtime.Interfaces;
 using Better.SceneManagement.Runtime.Sequences;
 

diff --git a/Assets/BetterSceneManagement/Runtime/Transitions/TransitionInfo.cs b/Assets/BetterSceneManagement/Runtime/Transitions/TransitionInfo.cs
@@ -1,5 +1,5 @@
 using System;
-using Better.Extensions.Runtime;
+using Better.Commons.Runtime.Utility;
 using Better.SceneManagement.Runtime.Sequences;
 
 namespace Better.SceneManagement.Runtime.Transitions

diff --git a/Assets/BetterSceneManagement/Runtime/Utility/SceneUtility.cs b/Assets/BetterSceneManagement/Runtime/Utility/SceneUtility.cs
@@ -1,20 +1,20 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Better.Extensions.Runtime;
+using Better.Commons.Runtime.Extensions;
 using Better.SceneManagement.Runtime.Interfaces;
 
 namespace Better.SceneManagement.Runtime.Utility
 {
     public static class SceneUtility
     {
-#if BETTER_SERVICES && BETTER_LOCATOR
-        private static readonly Locators.Runtime.ServiceProperty<SavesService> _serviceProperty = new();
+#if BETTER_SERVICES && BETTER_LOCATORS
+        private static readonly Locators.Runtime.ServiceProperty<SceneService> _serviceProperty = new();
 #endif
 
         public static ISceneSystem GetSystem()
         {
-#if BETTER_SERVICES && BETTER_LOCATOR
+#if BETTER_SERVICES && BETTER_LOCATORS
             if (_serviceProperty.IsRegistered)
             {
                 return _serviceProperty.CachedService;

diff --git a/Assets/BetterSceneManagement/package.json b/Assets/BetterSceneManagement/package.json
@@ -1,13 +1,13 @@
 {
   "name": "com.uurha.betterscenemanagement",
   "displayName": "Better Scene Management",
-  "version": "0.2.55",
+  "version": "0.2.56",
   "unity": "2020.3",
   "description": "Scene loader with ability to load and serialize SceneAssets",
   "dependencies": {
     "com.tdw.better.internal.core": "0.0.2",
     "com.tdw.better.projectsettings": "0.0.2",
-    "com.uurha.bettereditortools": "1.5.25",
+    "com.tdw.better.commons": "0.0.2",
     "com.uurha.betterattributes": "3.0.13"
   },
   "author": {

diff --git a/Packages/manifest.json b/Packages/manifest.json
@@ -1,7 +1,7 @@
 {
   "dependencies": {
     "com.tdw.better.internal.core": "0.0.2",
-    "com.tdw.better.projectsettings": "0.0.1",
+    "com.tdw.better.projectsettings": "0.1.1",
     "com.unity.collab-proxy": "2.0.1",
     "com.unity.ide.rider": "3.0.18",
     "com.unity.ide.visualstudio": "2.0.17",
@@ -10,9 +10,7 @@
     "com.unity.textmeshpro": "3.0.6",
     "com.unity.timeline": "1.6.4",
     "com.unity.ugui": "1.0.0",
-    "com.uurha.betterattributes": "3.0.11",
-    "com.uurha.bettereditortools": "1.5.21",
-    "com.uurha.betterextensions": "1.1.5",
+    "com.uurha.betterattributes": "3.1.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/packages-lock.json b/Packages/packages-lock.json
@@ -1,5 +1,14 @@
 {
   "dependencies": {
+    "com.tdw.better.commons": {
+      "version": "0.0.2",
+      "depth": 1,
+      "source": "registry",
+      "dependencies": {
+        "com.tdw.better.internal.core": "0.0.2"
+      },
+      "url": "https://package.openupm.com"
+    },
     "com.tdw.better.internal.core": {
       "version": "0.0.2",
       "depth": 0,
@@ -8,22 +17,22 @@
       "url": "https://package.openupm.com"
     },
     "com.tdw.better.projectsettings": {
-      "version": "0.0.1",
+      "version": "0.1.1",
       "depth": 0,
       "source": "registry",
       "dependencies": {
-        "com.tdw.better.singletons": "0.0.7",
-        "com.uurha.betterextensions": "1.5.3",
-        "com.tdw.better.internal.core": "0.0.2"
+        "com.tdw.better.singletons": "0.1.0",
+        "com.tdw.better.internal.core": "0.0.2",
+        "com.tdw.better.commons": "0.0.2"
       },
       "url": "https://package.openupm.com"
     },
     "com.tdw.better.singletons": {
-      "version": "0.0.7",
+      "version": "0.1.0",
       "depth": 1,
       "source": "registry",
       "dependencies": {
-        "com.uurha.betterextensions": "1.5.2",
+        "com.tdw.better.commons": "0.0.2",
         "com.tdw.better.internal.core": "0.0.2"
       },
       "url": "https://package.openupm.com"
@@ -109,40 +118,11 @@
       }
     },
     "com.uurha.betterattributes": {
-      "version": "3.0.11",
+      "version": "3.1.0",
       "depth": 0,
       "source": "registry",
       "dependencies": {
-        "com.uurha.bettereditortools": "1.5.23",
-        "com.tdw.better.internal.core": "0.0.2"
-      },
-      "url": "https://package.openupm.com"
-    },
-    "com.uurha.betterdatastructures": {
-      "version": "0.1.7",
-      "depth": 1,
-      "source": "registry",
-      "dependencies": {
-        "com.tdw.better.internal.core": "0.0.2"
-      },
-      "url": "https://package.openupm.com"
-    },
-    "com.uurha.bettereditortools": {
-      "version": "1.5.23",
-      "depth": 1,
-      "source": "registry",
-      "dependencies": {
-        "com.uurha.betterdatastructures": "0.1.7",
-        "com.uurha.betterextensions": "1.5.94",
-        "com.tdw.better.internal.core": "0.0.2"
-      },
-      "url": "https://package.openupm.com"
-    },
-    "com.uurha.betterextensions": {
-      "version": "1.5.94",
-      "depth": 2,
-      "source": "registry",
-      "dependencies": {
+        "com.tdw.better.commons": "0.0.2",
         "com.tdw.better.internal.core": "0.0.2"
       },
       "url": "https://package.openupm.com"