From a07eb526833224e478bae174f2edbdb4b1734395 Mon Sep 17 00:00:00 2001 From: SimonDarksideJ Date: Wed, 8 May 2024 19:40:39 +0100 Subject: [PATCH 1/3] Migrate namespaces to the new utilities / SF structure --- .../workflows/development-buildandtestupmrelease.yml | 9 ++++++++- Editor/AssemblyInfo.cs | 9 +++++++++ Editor/AssemblyInfo.cs.meta | 2 ++ ...SpatialPersistence_ARFoundationPackageInstaller.cs | 7 +++---- ...Persistence_ARFoundationPackageModulesInstaller.cs | 2 +- Editor/SpatialPersistence_ARFoundationPathFinder.cs | 2 +- Runtime/AssemblyInfo.cs | 9 +++++++++ Runtime/AssemblyInfo.cs.meta | 2 ++ Runtime/Modules/ARFoundationDynamicLibraryManager.cs | 4 ++-- ...ionSpatialPersistenceServiceImageTrackingModule.cs | 11 +++++++++-- Runtime/Modules/ARFoundationTrackableImagesLibrary.cs | 2 +- Tests/Editor/AssemblyInfo.cs | 9 +++++++++ Tests/Editor/AssemblyInfo.cs.meta | 2 ++ Tests/Runtime/AssemblyInfo.cs | 9 +++++++++ Tests/Runtime/AssemblyInfo.cs.meta | 2 ++ package.json | 2 +- 16 files changed, 70 insertions(+), 13 deletions(-) create mode 100644 Editor/AssemblyInfo.cs create mode 100644 Editor/AssemblyInfo.cs.meta create mode 100644 Runtime/AssemblyInfo.cs create mode 100644 Runtime/AssemblyInfo.cs.meta create mode 100644 Tests/Editor/AssemblyInfo.cs create mode 100644 Tests/Editor/AssemblyInfo.cs.meta create mode 100644 Tests/Runtime/AssemblyInfo.cs create mode 100644 Tests/Runtime/AssemblyInfo.cs.meta diff --git a/.github/workflows/development-buildandtestupmrelease.yml b/.github/workflows/development-buildandtestupmrelease.yml index e82c24c..6a11930 100644 --- a/.github/workflows/development-buildandtestupmrelease.yml +++ b/.github/workflows/development-buildandtestupmrelease.yml @@ -38,4 +38,11 @@ jobs: with: unityversion: ${{ needs.Validate-Unity.outputs.unityeditorversion }} dependencies: '[{"development": "github.com/realitycollective/com.realitycollective.buildtools.git"},{"development": "github.com/realitycollective/com.realitytoolkit.spatial-persistence.git"},{"development": "github.com/realitycollective/com.realitytoolkit.core.git"},{"development": "github.com/realitycollective/com.realitycollective.utilities.git"},{"development": "github.com/realitycollective/com.realitytoolkit.service-framework.git"}]' - secrets: inherit \ No newline at end of file + secrets: inherit + + Build-Complete: + runs-on: ubuntu-latest + name: Build completion task + needs: Run-Unit-Tests + steps: + - run: echo "Build Complete" \ No newline at end of file diff --git a/Editor/AssemblyInfo.cs b/Editor/AssemblyInfo.cs new file mode 100644 index 0000000..d089c45 --- /dev/null +++ b/Editor/AssemblyInfo.cs @@ -0,0 +1,9 @@ +// Copyright (c) Reality Collective. All rights reserved. +// Licensed under the MIT License. See LICENSE in the project root for license information. + +using System.Reflection; + +[assembly: AssemblyVersion("1.0.0")] +[assembly: AssemblyTitle("com.realitytoolkit.spatialpersistence.arfoundation.editor")] +[assembly: AssemblyCompany("Reality Collective")] +[assembly: AssemblyCopyright("Copyright (c) Reality Collective. All rights reserved.")] diff --git a/Editor/AssemblyInfo.cs.meta b/Editor/AssemblyInfo.cs.meta new file mode 100644 index 0000000..22b3eb9 --- /dev/null +++ b/Editor/AssemblyInfo.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 7940e30e14a2b954388973a8687b895d \ No newline at end of file diff --git a/Editor/SpatialPersistence_ARFoundationPackageInstaller.cs b/Editor/SpatialPersistence_ARFoundationPackageInstaller.cs index 38fd00d..4c0794b 100644 --- a/Editor/SpatialPersistence_ARFoundationPackageInstaller.cs +++ b/Editor/SpatialPersistence_ARFoundationPackageInstaller.cs @@ -1,11 +1,10 @@ // Copyright (c) Reality Collective. All rights reserved. // Licensed under the MIT License. See LICENSE in the project root for license information. -using RealityCollective.Editor.Utilities; -using RealityCollective.Extensions; -using RealityCollective.ServiceFramework; using RealityCollective.ServiceFramework.Editor; using RealityCollective.ServiceFramework.Editor.Packages; +using RealityCollective.Utilities.Editor; +using RealityCollective.Utilities.Extensions; using System.IO; using UnityEditor; using UnityEngine; @@ -44,4 +43,4 @@ private static void CheckPackage() } } } -} +} \ No newline at end of file diff --git a/Editor/SpatialPersistence_ARFoundationPackageModulesInstaller.cs b/Editor/SpatialPersistence_ARFoundationPackageModulesInstaller.cs index 83c6080..fd78be5 100644 --- a/Editor/SpatialPersistence_ARFoundationPackageModulesInstaller.cs +++ b/Editor/SpatialPersistence_ARFoundationPackageModulesInstaller.cs @@ -80,4 +80,4 @@ public bool Install(ServiceConfiguration serviceConfiguration) return true; } } -} +} \ No newline at end of file diff --git a/Editor/SpatialPersistence_ARFoundationPathFinder.cs b/Editor/SpatialPersistence_ARFoundationPathFinder.cs index 23a2a8f..1003db7 100644 --- a/Editor/SpatialPersistence_ARFoundationPathFinder.cs +++ b/Editor/SpatialPersistence_ARFoundationPathFinder.cs @@ -15,4 +15,4 @@ public class SpatialPersistence_ARFoundationPackagePathFinder : ScriptableObject /// public string Location => $"/Editor/{nameof(SpatialPersistence_ARFoundationPackagePathFinder)}.cs"; } -} +} \ No newline at end of file diff --git a/Runtime/AssemblyInfo.cs b/Runtime/AssemblyInfo.cs new file mode 100644 index 0000000..19e76f4 --- /dev/null +++ b/Runtime/AssemblyInfo.cs @@ -0,0 +1,9 @@ +// Copyright (c) Reality Collective. All rights reserved. +// Licensed under the MIT License. See LICENSE in the project root for license information. + +using System.Reflection; + +[assembly: AssemblyVersion("1.0.0")] +[assembly: AssemblyTitle("com.realitytoolkit.spatialpersistence.arfoundation")] +[assembly: AssemblyCompany("Reality Collective")] +[assembly: AssemblyCopyright("Copyright (c) Reality Collective. All rights reserved.")] diff --git a/Runtime/AssemblyInfo.cs.meta b/Runtime/AssemblyInfo.cs.meta new file mode 100644 index 0000000..9bf097b --- /dev/null +++ b/Runtime/AssemblyInfo.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: be10d9467c19c004680e41165d4e8169 \ No newline at end of file diff --git a/Runtime/Modules/ARFoundationDynamicLibraryManager.cs b/Runtime/Modules/ARFoundationDynamicLibraryManager.cs index ab8e6cb..dd58099 100644 --- a/Runtime/Modules/ARFoundationDynamicLibraryManager.cs +++ b/Runtime/Modules/ARFoundationDynamicLibraryManager.cs @@ -1,8 +1,8 @@ // Copyright (c) Reality Collective. All rights reserved. // Licensed under the MIT License. See LICENSE in the project root for license information. -using RealityCollective.Extensions; -using RealityCollective.Utilities; +using RealityCollective.Utilities.Extensions; +using RealityCollective.Utilities.Logging; using RealityToolkit.SpatialPersistence.Definitions; using System; using System.Collections; diff --git a/Runtime/Modules/ARFoundationSpatialPersistenceServiceImageTrackingModule.cs b/Runtime/Modules/ARFoundationSpatialPersistenceServiceImageTrackingModule.cs index 679bd73..eacb94d 100644 --- a/Runtime/Modules/ARFoundationSpatialPersistenceServiceImageTrackingModule.cs +++ b/Runtime/Modules/ARFoundationSpatialPersistenceServiceImageTrackingModule.cs @@ -1,10 +1,9 @@ // Copyright (c) Reality Collective. All rights reserved. // Licensed under the MIT License. See LICENSE in the project root for license information. -using RealityCollective.Extensions; +using RealityCollective.Utilities.Extensions; using RealityCollective.Utilities.Async; using RealityToolkit.SpatialPersistence.ARFoundation.Definitions; -using RealityToolkit.SpatialPersistence.ARFoundation.Extensions; using RealityToolkit.SpatialPersistence.Definitions; using RealityToolkit.SpatialPersistence.Interfaces; using System; @@ -37,7 +36,11 @@ private ARTrackedImageManager TrackedImageManager if (trackedImageManager == null) { // Get a reference to the SpatialAnchorManager component (must be on the same gameobject) +#if UNITY_2023_1_OR_NEWER + trackedImageManager = GameObject.FindFirstObjectByType(); +#else trackedImageManager = GameObject.FindObjectOfType(); +#endif if (trackedImageManager.IsNull()) { var message = $"Unable to locate the {typeof(ARTrackedImageManager)} in the scene, service cannot initialize"; @@ -55,7 +58,11 @@ private ARFoundationDynamicLibraryManager DynamicLibraryManager if (dynamicLibraryManager == null) { // Get a reference to the SpatialAnchorManager component (must be on the same gameobject) +#if UNITY_2023_1_OR_NEWER + dynamicLibraryManager = GameObject.FindFirstObjectByType(); +#else dynamicLibraryManager = GameObject.FindObjectOfType(); +#endif if (dynamicLibraryManager.IsNull()) { if (TrackedImageManager.IsNull()) diff --git a/Runtime/Modules/ARFoundationTrackableImagesLibrary.cs b/Runtime/Modules/ARFoundationTrackableImagesLibrary.cs index 1fafea3..6b84a78 100644 --- a/Runtime/Modules/ARFoundationTrackableImagesLibrary.cs +++ b/Runtime/Modules/ARFoundationTrackableImagesLibrary.cs @@ -1,7 +1,7 @@ // Copyright (c) Reality Collective. All rights reserved. // Licensed under the MIT License. See LICENSE in the project root for license information. -using RealityCollective.Extensions; +using RealityCollective.Utilities.Extensions; using RealityToolkit.SpatialPersistence.Definitions; using System; using System.Linq; diff --git a/Tests/Editor/AssemblyInfo.cs b/Tests/Editor/AssemblyInfo.cs new file mode 100644 index 0000000..f7fab4f --- /dev/null +++ b/Tests/Editor/AssemblyInfo.cs @@ -0,0 +1,9 @@ +// Copyright (c) Reality Collective. All rights reserved. +// Licensed under the MIT License. See LICENSE in the project root for license information. + +using System.Reflection; + +[assembly: AssemblyVersion("1.0.0")] +[assembly: AssemblyTitle("com.realitytoolkit.spatialpersistence_arfoundation.editor.tests")] +[assembly: AssemblyCompany("Reality Collective")] +[assembly: AssemblyCopyright("Copyright (c) Reality Collective. All rights reserved.")] diff --git a/Tests/Editor/AssemblyInfo.cs.meta b/Tests/Editor/AssemblyInfo.cs.meta new file mode 100644 index 0000000..46d82dc --- /dev/null +++ b/Tests/Editor/AssemblyInfo.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 573f843bb5d192c4f9f94398652aac57 \ No newline at end of file diff --git a/Tests/Runtime/AssemblyInfo.cs b/Tests/Runtime/AssemblyInfo.cs new file mode 100644 index 0000000..0e113ce --- /dev/null +++ b/Tests/Runtime/AssemblyInfo.cs @@ -0,0 +1,9 @@ +// Copyright (c) Reality Collective. All rights reserved. +// Licensed under the MIT License. See LICENSE in the project root for license information. + +using System.Reflection; + +[assembly: AssemblyVersion("1.0.0")] +[assembly: AssemblyTitle("com.realitytoolkit.spatialpersistence_arfoundation.tests")] +[assembly: AssemblyCompany("Reality Collective")] +[assembly: AssemblyCopyright("Copyright (c) Reality Collective. All rights reserved.")] diff --git a/Tests/Runtime/AssemblyInfo.cs.meta b/Tests/Runtime/AssemblyInfo.cs.meta new file mode 100644 index 0000000..bd002bf --- /dev/null +++ b/Tests/Runtime/AssemblyInfo.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 162f97cc20e5bbe41aeb07c7643e88ec \ No newline at end of file diff --git a/package.json b/package.json index c906b7e..647a57d 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ }, "dependencies": { "com.unity.xr.arfoundation": "5.1.0", - "com.realitytoolkit.spatial-persistence": "1.0.0-pre.5" + "com.realitytoolkit.spatial-persistence": "1.0.1" }, "assets": [ { From d67cc29b302c9f27c381f9290963bd680adbf07b Mon Sep 17 00:00:00 2001 From: "Simon (Darkside) Jackson" Date: Thu, 9 May 2024 13:35:37 +0100 Subject: [PATCH 2/3] Pushing release back to 2020, to skip VisionOS --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 647a57d..910b8f0 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "Mixed Reality" ], "version": "1.0.0-pre.4", - "unity": "2021.3", + "unity": "2020.3", "homepage": "https://github.com/realitycollective", "bugs": { "url": "https://github.com/realitycollective/realitytoolkit.dev/issues" From bc228faf1d44fce444f1ea2fdddf5da21dab938b Mon Sep 17 00:00:00 2001 From: "Simon (Darkside) Jackson" Date: Thu, 9 May 2024 14:50:09 +0100 Subject: [PATCH 3/3] Update to 2022 for testing as 2021 is not supported :S --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 910b8f0..abbb2dc 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "Mixed Reality" ], "version": "1.0.0-pre.4", - "unity": "2020.3", + "unity": "2022.3", "homepage": "https://github.com/realitycollective", "bugs": { "url": "https://github.com/realitycollective/realitytoolkit.dev/issues"