Merge pull request #1 from techno-dwarf-works/feature/refactoring

Refactoring
techno-dwarf-works · Apr 10, 2024 · a90ef9d · a90ef9d
2 parents fe7a2ec + b6ee42b
commit a90ef9d
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 20 deletions.
diff --git a/Assets/BetterProjectSettings/Editor/BetterProjectSettings.Editor.asmdef b/Assets/BetterProjectSettings/Editor/BetterProjectSettings.Editor.asmdef
@@ -4,8 +4,8 @@
     "references": [
         "GUID:1862b35041b066d42ab4d3caf773657b",
         "GUID:01df13aca8d01e24a911bcc3e8277031",
-        "GUID:28da8d3b12e3efa47928e0c9070f853d",
-        "GUID:af7fffdf1d83bc842b0f6e3a01efda16"
+        "GUID:af7fffdf1d83bc842b0f6e3a01efda16",
+        "GUID:8bd4b41f8da90144d9006c4d926c9679"
     ],
     "includePlatforms": [
         "Editor"

diff --git a/Assets/BetterProjectSettings/Editor/SettingTools/ProjectSettingsRegisterer.cs b/Assets/BetterProjectSettings/Editor/SettingTools/ProjectSettingsRegisterer.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Linq;
 using System.Reflection;
-using Better.Extensions.Runtime;
+using Better.Commons.Runtime.Extensions;
 using UnityEditor;
 
 namespace Better.ProjectSettings.EditorAddons

diff --git a/Assets/BetterProjectSettings/Runtime/BetterProjectSettings.Runtime.asmdef b/Assets/BetterProjectSettings/Runtime/BetterProjectSettings.Runtime.asmdef
@@ -2,7 +2,9 @@
     "name": "BetterProjectSettings.Runtime",
     "rootNamespace": "Better.ProjectSettings.Runtime",
     "references": [
-        "GUID:af7fffdf1d83bc842b0f6e3a01efda16"
+        "GUID:af7fffdf1d83bc842b0f6e3a01efda16",
+        "GUID:8bd4b41f8da90144d9006c4d926c9679",
+        "GUID:01df13aca8d01e24a911bcc3e8277031"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

diff --git a/Assets/BetterProjectSettings/Samples~/TestSamples/Editor/TestSO.cs b/Assets/BetterProjectSettings/Samples~/TestSamples/Editor/TestSO.cs
@@ -1,11 +1,13 @@
 using Better.ProjectSettings.Runtime;
 using Better.Singletons.Runtime.Attributes;
 using UnityEditor;
+using UnityEngine;
 
 namespace Test
 {
     [ScriptableCreate(nameof(Better) + "/" + nameof(Editor) + "/" + nameof(Test), "Test1")]
     public class TestSO : ScriptableSettings<TestSO>
     {
+        [Header("Test")] [SerializeField] private bool _testBool;
     }
 }
diff --git a/Assets/BetterProjectSettings/package.json b/Assets/BetterProjectSettings/package.json
@@ -1,12 +1,11 @@
 {
   "name": "com.tdw.better.projectsettings",
   "displayName": "Better Project Settings",
-  "version": "0.0.2",
+  "version": "0.1.0",
   "unity": "2021.3",
   "description": "Easy way to manage persistent settings for both Editor and Runtime",
   "dependencies": {
-    "com.tdw.better.singletons": "0.0.8",
-    "com.uurha.betterextensions": "1.5.98",
+    "com.tdw.better.singletons": "0.1.0",
     "com.tdw.better.internal.core": "0.0.2"
   },
   "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.singletons": "0.0.7",
+    "com.tdw.better.singletons": "0.1.0",
     "com.unity.collab-proxy": "2.0.1",
     "com.unity.feature.development": "1.0.1",
     "com.unity.ide.rider": "3.0.18",
@@ -12,7 +12,6 @@
     "com.unity.timeline": "1.6.4",
     "com.unity.ugui": "1.0.0",
     "com.unity.visualscripting": "1.8.0",
-    "com.uurha.betterextensions": "1.5.3",
     "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,11 +17,11 @@
       "url": "https://package.openupm.com"
     },
     "com.tdw.better.singletons": {
-      "version": "0.0.7",
+      "version": "0.1.0",
       "depth": 0,
       "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"
@@ -152,15 +161,6 @@
       },
       "url": "https://packages.unity.com"
     },
-    "com.uurha.betterextensions": {
-      "version": "1.5.3",
-      "depth": 0,
-      "source": "registry",
-      "dependencies": {
-        "com.tdw.better.internal.core": "0.0.2"
-      },
-      "url": "https://package.openupm.com"
-    },
     "com.unity.modules.ai": {
       "version": "1.0.0",
       "depth": 0,