From e9e0a1253bb794a922476a0dd1528e715046a715 Mon Sep 17 00:00:00 2001 From: uurha Date: Mon, 7 Oct 2024 03:56:20 +0200 Subject: [PATCH 1/3] Update dependencies --- .gitmodules | 20 ++++++++++++++ Assets/BetterAttributes | 1 + Assets/BetterAttributes.meta | 8 ++++++ Assets/BetterCommons | 1 + Assets/BetterCommons.meta | 8 ++++++ Assets/BetterConditions | 1 + Assets/BetterConditions.meta | 8 ++++++ Assets/BetterInternalCore | 1 + Assets/BetterInternalCore.meta | 8 ++++++ Assets/BetterLocators | 1 + Assets/BetterLocators.meta | 8 ++++++ Packages/manifest.json | 3 --- Packages/packages-lock.json | 49 +--------------------------------- 13 files changed, 66 insertions(+), 51 deletions(-) create mode 100644 .gitmodules create mode 160000 Assets/BetterAttributes create mode 100644 Assets/BetterAttributes.meta create mode 160000 Assets/BetterCommons create mode 100644 Assets/BetterCommons.meta create mode 160000 Assets/BetterConditions create mode 100644 Assets/BetterConditions.meta create mode 160000 Assets/BetterInternalCore create mode 100644 Assets/BetterInternalCore.meta create mode 160000 Assets/BetterLocators create mode 100644 Assets/BetterLocators.meta diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..1b3e65a --- /dev/null +++ b/.gitmodules @@ -0,0 +1,20 @@ +[submodule "BetterCommons"] + path = Assets/BetterCommons + url = git@github.com:techno-dwarf-works/better-commons.git + branch = upm +[submodule "BetterInternalCore"] + path = Assets/BetterInternalCore + url = git@github.com:techno-dwarf-works/better-internal-core.git + branch = upm +[submodule "BetterAttributes"] + path = Assets/BetterAttributes + url = git@github.com:techno-dwarf-works/better-attributes.git + branch = upm +[submodule "BetterConditions"] + path = Assets/BetterConditions + url = git@github.com:techno-dwarf-works/better-conditions.git + branch = upm +[submodule "BetterLocators"] + path = Assets/BetterLocators + url = git@github.com:techno-dwarf-works/better-locators.git + branch = upm diff --git a/Assets/BetterAttributes b/Assets/BetterAttributes new file mode 160000 index 0000000..6bd91bc --- /dev/null +++ b/Assets/BetterAttributes @@ -0,0 +1 @@ +Subproject commit 6bd91bcb5f364d168b6fe41372a8b560c10a4fb9 diff --git a/Assets/BetterAttributes.meta b/Assets/BetterAttributes.meta new file mode 100644 index 0000000..a195784 --- /dev/null +++ b/Assets/BetterAttributes.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 04305e52bfee90b41bc227dc5dc9fbbd +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BetterCommons b/Assets/BetterCommons new file mode 160000 index 0000000..2a0f166 --- /dev/null +++ b/Assets/BetterCommons @@ -0,0 +1 @@ +Subproject commit 2a0f166d3b259f098e5bc658800190b8258603bc diff --git a/Assets/BetterCommons.meta b/Assets/BetterCommons.meta new file mode 100644 index 0000000..c130e7a --- /dev/null +++ b/Assets/BetterCommons.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8fc8d4762a89a544aa47f26e322b5ca4 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BetterConditions b/Assets/BetterConditions new file mode 160000 index 0000000..a05d14f --- /dev/null +++ b/Assets/BetterConditions @@ -0,0 +1 @@ +Subproject commit a05d14f3d6757319aed0696030149cb32b8483de diff --git a/Assets/BetterConditions.meta b/Assets/BetterConditions.meta new file mode 100644 index 0000000..8fc25f4 --- /dev/null +++ b/Assets/BetterConditions.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 58ddbea82a551c94c9c9dac44625757e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BetterInternalCore b/Assets/BetterInternalCore new file mode 160000 index 0000000..dd654e2 --- /dev/null +++ b/Assets/BetterInternalCore @@ -0,0 +1 @@ +Subproject commit dd654e230a625f65aa84468bfcc24b6d326521c8 diff --git a/Assets/BetterInternalCore.meta b/Assets/BetterInternalCore.meta new file mode 100644 index 0000000..56b6b94 --- /dev/null +++ b/Assets/BetterInternalCore.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: aa25e82a629c09e45a10347e8fbe0ef4 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BetterLocators b/Assets/BetterLocators new file mode 160000 index 0000000..cc2d248 --- /dev/null +++ b/Assets/BetterLocators @@ -0,0 +1 @@ +Subproject commit cc2d24877f83c425bdf67af98944f763916ecbcf diff --git a/Assets/BetterLocators.meta b/Assets/BetterLocators.meta new file mode 100644 index 0000000..c81109f --- /dev/null +++ b/Assets/BetterLocators.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a44288d5d8bdf03458b4f50968e75146 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/manifest.json b/Packages/manifest.json index d7e3a06..a64183a 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,8 +1,5 @@ { "dependencies": { - "com.tdw.better.commons": "0.0.22", - "com.tdw.better.conditions": "0.0.4", - "com.tdw.better.locators": "0.1.12", "com.unity.collab-proxy": "2.0.1", "com.unity.feature.development": "1.0.1", "com.unity.ide.rider": "3.0.18", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 27bb357..fcc243e 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -1,52 +1,5 @@ { "dependencies": { - "com.tdw.better.attributes": { - "version": "0.0.1", - "depth": 1, - "source": "registry", - "dependencies": { - "com.tdw.better.commons": "0.0.41", - "com.tdw.better.internal.core": "0.0.2" - }, - "url": "https://package.openupm.com" - }, - "com.tdw.better.commons": { - "version": "0.0.44", - "depth": 1, - "source": "registry", - "dependencies": { - "com.tdw.better.internal.core": "0.0.2" - }, - "url": "https://package.openupm.com" - }, - "com.tdw.better.conditions": { - "version": "0.0.4", - "depth": 0, - "source": "registry", - "dependencies": { - "com.tdw.better.internal.core": "0.0.2", - "com.tdw.better.commons": "0.0.44", - "com.tdw.better.attributes": "0.0.1" - }, - "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.12", - "depth": 0, - "source": "registry", - "dependencies": { - "com.tdw.better.internal.core": "0.0.2", - "com.tdw.better.commons": "0.0.7" - }, - "url": "https://package.openupm.com" - }, "com.unity.collab-proxy": { "version": "2.0.1", "depth": 0, @@ -156,9 +109,9 @@ "depth": 0, "source": "registry", "dependencies": { + "com.unity.modules.audio": "1.0.0", "com.unity.modules.director": "1.0.0", "com.unity.modules.animation": "1.0.0", - "com.unity.modules.audio": "1.0.0", "com.unity.modules.particlesystem": "1.0.0" }, "url": "https://packages.unity.com" From 2e91ead1dc5ec0057ab2d2f74481c8253b30f070 Mon Sep 17 00:00:00 2001 From: uurha Date: Mon, 7 Oct 2024 03:56:42 +0200 Subject: [PATCH 2/3] Update scopes --- Packages/manifest.json | 3 +-- ProjectSettings/PackageManagerSettings.asset | 11 +++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Packages/manifest.json b/Packages/manifest.json index a64183a..fdfc287 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -47,8 +47,7 @@ "name": "Better Plugins", "url": "https://package.openupm.com", "scopes": [ - "com.tdw", - "com.uurha" + "com.tdw" ] } ] diff --git a/ProjectSettings/PackageManagerSettings.asset b/ProjectSettings/PackageManagerSettings.asset index 2b960c9..97e9c58 100644 --- a/ProjectSettings/PackageManagerSettings.asset +++ b/ProjectSettings/PackageManagerSettings.asset @@ -12,12 +12,12 @@ MonoBehaviour: m_Script: {fileID: 13964, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: - m_EnablePreReleasePackages: 0 - m_EnablePackageDependencies: 0 + m_EnablePreReleasePackages: 1 + m_EnablePackageDependencies: 1 m_AdvancedSettingsExpanded: 1 m_ScopedRegistriesSettingsExpanded: 1 m_SeeAllPackageVersions: 0 - oneTimeWarningShown: 0 + oneTimeWarningShown: 1 m_Registries: - m_Id: main m_Name: @@ -31,7 +31,6 @@ MonoBehaviour: m_Url: https://package.openupm.com m_Scopes: - com.tdw - - com.uurha m_IsDefault: 0 m_Capabilities: 0 m_ConfigSource: 4 @@ -40,6 +39,6 @@ MonoBehaviour: m_RegistryInfoDraft: m_Modified: 0 m_ErrorMessage: - m_UserModificationsInstanceId: -850 - m_OriginalInstanceId: -852 + m_UserModificationsInstanceId: -830 + m_OriginalInstanceId: -834 m_LoadAssets: 0 From 8ff528254df3745f521b9dff1c953feabca6f660 Mon Sep 17 00:00:00 2001 From: uurha Date: Mon, 7 Oct 2024 03:57:33 +0200 Subject: [PATCH 3/3] Update package.json --- Assets/BetterStateMachine/package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Assets/BetterStateMachine/package.json b/Assets/BetterStateMachine/package.json index 91acfc1..930f0f8 100644 --- a/Assets/BetterStateMachine/package.json +++ b/Assets/BetterStateMachine/package.json @@ -1,14 +1,14 @@ { "name": "com.tdw.better.statemachine", "displayName": "Better State Machine", - "version": "0.1.17", + "version": "0.1.18", "unity": "2021.3", "description": " ", "dependencies": { "com.tdw.better.internal.core": "0.0.2", - "com.tdw.better.commons": "0.0.44", - "com.tdw.better.locators": "0.1.12", - "com.tdw.better.conditions": "0.0.4" + "com.tdw.better.commons": "0.0.57", + "com.tdw.better.locators": "0.1.13", + "com.tdw.better.conditions": "0.0.5" }, "author": { "name": "Better Plugins",