Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactoring #6

Merged
merged 10 commits into from
Apr 11, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update dependencies
  • Loading branch information
uurha committed Apr 11, 2024
commit 877cbb654a9add0a929bd975e1f80b45307304f2
2 changes: 2 additions & 0 deletions Assembly-CSharp.csproj.DotSettings
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=assets_005Cbettersaves/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
2 changes: 1 addition & 1 deletion Assets/Better/Saves/Resources/SavesSettings.asset

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 10 additions & 9 deletions Assets/BetterSaves/Runtime/BetterSaves.Runtime.asmdef
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@
"name": "BetterSaves.Runtime",
"rootNamespace": "Better.Saves.Runtime",
"references": [
"GUID:443314a5a4e67c14a88ae223776b6554",
"GUID:1c5574afb40e5fe4ca9e9c156009297b",
"GUID:d103b3c6d6cb0564d8d6543e9d797878",
"GUID:af7fffdf1d83bc842b0f6e3a01efda16",
"GUID:01df13aca8d01e24a911bcc3e8277031",
"GUID:1862b35041b066d42ab4d3caf773657b"
"GUID:1862b35041b066d42ab4d3caf773657b",
"GUID:8bd4b41f8da90144d9006c4d926c9679",
"GUID:1c5574afb40e5fe4ca9e9c156009297b",
"GUID:d103b3c6d6cb0564d8d6543e9d797878",
"GUID:35101f455c979e94c9a0a4793484b7fd"
],
"includePlatforms": [],
"excludePlatforms": [],
Expand All @@ -19,17 +20,17 @@
"versionDefines": [
{
"name": "com.tdw.better.services",
"expression": "0.0.4",
"expression": "0.1.0",
"define": "BETTER_SERVICES"
},
{
"name": "com.tdw.better.locator",
"expression": "0.0.4",
"define": "BETTER_LOCATOR"
"name": "com.tdw.better.locators",
"expression": "0.1.0",
"define": "BETTER_LOCATORS"
},
{
"name": "com.tdw.better.singletons",
"expression": "0.0.2",
"expression": "0.1.0",
"define": "BETTER_SINGLETONS"
}
],
Expand Down
2 changes: 1 addition & 1 deletion Assets/BetterSaves/Runtime/Data/SavesProperty.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using System;
using Better.DataStructures.Runtime.Properties;
using Better.Commons.Runtime.DataStructures.Properties;
using Better.Saves.Runtime.Interfaces;
using Better.Saves.Runtime.Utility;
using UnityEngine;
Expand Down
4 changes: 2 additions & 2 deletions Assets/BetterSaves/Runtime/Utility/SavesUtility.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ public static class SavesUtility
{
public static ISaveSystem GetSystem()
{
#if BETTER_SERVICES && BETTER_LOCATOR
return Locators.Runtime.ServiceLocator.GetService<SavesService>();
#if BETTER_SERVICES && BETTER_LOCATORS
return Locators.Runtime.ServiceLocator.Get<SavesService>();
#elif BETTER_SINGLETONS
return SavesManager.Instance;
#endif
Expand Down
4 changes: 4 additions & 0 deletions BetterSaves.Editor.csproj.DotSettings
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=assets_005Cbettersaves/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=assets_005Cbettersaves_005Ceditor/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=assets_005Cbettersaves_005Ceditor_005Ceditoraddons/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
4 changes: 4 additions & 0 deletions BetterSaves.Runtime.csproj.DotSettings
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=assets_005Cbettersaves/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=assets_005Cbettersaves_005Cruntime/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=assets_005Cbettersaves_005Cruntime_005Cimplementations/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
5 changes: 3 additions & 2 deletions Packages/manifest.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{
"dependencies": {
"com.tdw.better.projectsettings": "0.0.2",
"com.tdw.better.locators": "0.1.0",
"com.tdw.better.projectsettings": "0.1.1",
"com.tdw.better.services": "0.1.0",
"com.unity.collab-proxy": "2.0.1",
"com.unity.feature.development": "1.0.1",
"com.unity.ide.rider": "3.0.18",
Expand All @@ -11,7 +13,6 @@
"com.unity.timeline": "1.6.4",
"com.unity.ugui": "1.0.0",
"com.unity.visualscripting": "1.8.0",
"com.uurha.betterdatastructures": "0.1.7",
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.androidjni": "1.0.0",
"com.unity.modules.animation": "1.0.0",
Expand Down
53 changes: 37 additions & 16 deletions Packages/packages-lock.json
Original file line number Diff line number Diff line change
@@ -1,29 +1,58 @@
{
"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": 1,
"source": "registry",
"dependencies": {},
"url": "https://package.openupm.com"
},
"com.tdw.better.locators": {
"version": "0.1.0",
"depth": 0,
"source": "registry",
"dependencies": {
"com.tdw.better.internal.core": "0.0.2",
"com.tdw.better.commons": "0.0.2",
"com.uurha.betterattributes": "3.1.0"
},
"url": "https://package.openupm.com"
},
"com.tdw.better.projectsettings": {
"version": "0.0.2",
"version": "0.1.1",
"depth": 0,
"source": "registry",
"dependencies": {
"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.services": {
"version": "0.1.0",
"depth": 0,
"source": "registry",
"dependencies": {
"com.tdw.better.singletons": "0.0.8",
"com.uurha.betterextensions": "1.5.98",
"com.tdw.better.internal.core": "0.0.2"
},
"url": "https://package.openupm.com"
},
"com.tdw.better.singletons": {
"version": "0.0.8",
"version": "0.1.0",
"depth": 1,
"source": "registry",
"dependencies": {
"com.uurha.betterextensions": "1.5.98",
"com.tdw.better.commons": "0.0.2",
"com.tdw.better.internal.core": "0.0.2"
},
"url": "https://package.openupm.com"
Expand Down Expand Up @@ -163,20 +192,12 @@
},
"url": "https://packages.unity.com"
},
"com.uurha.betterdatastructures": {
"version": "0.1.7",
"depth": 0,
"source": "registry",
"dependencies": {
"com.tdw.better.internal.core": "0.0.2"
},
"url": "https://package.openupm.com"
},
"com.uurha.betterextensions": {
"version": "1.5.98",
"com.uurha.betterattributes": {
"version": "3.1.0",
"depth": 1,
"source": "registry",
"dependencies": {
"com.tdw.better.commons": "0.0.2",
"com.tdw.better.internal.core": "0.0.2"
},
"url": "https://package.openupm.com"
Expand Down
10 changes: 5 additions & 5 deletions ProjectSettings/PackageManagerSettings.asset

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.