Migrate namespaces to the new utilities / SF structure

.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
+    secrets: inherit
+
+  Build-Complete:
+    runs-on: ubuntu-latest
+    name: Build completion task
+    needs: Run-Unit-Tests
+    steps: 
+      - run: echo "Build Complete"

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.")]

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()
             }
         }
     }
-}
+}

Editor/SpatialPersistence_ARFoundationPackageModulesInstaller.cs

@@ -80,4 +80,4 @@ public bool Install(ServiceConfiguration serviceConfiguration)
             return true;
         }
     }
-}
+}

Editor/SpatialPersistence_ARFoundationPathFinder.cs

@@ -15,4 +15,4 @@ public class SpatialPersistence_ARFoundationPackagePathFinder : ScriptableObject
         /// <inheritdoc />
         public string Location => $"/Editor/{nameof(SpatialPersistence_ARFoundationPackagePathFinder)}.cs";
     }
-}
+}

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.")]

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;

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<ARTrackedImageManager>();
+#else                    
                     trackedImageManager = GameObject.FindObjectOfType<ARTrackedImageManager>();
+#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<ARFoundationDynamicLibraryManager>();
+#else                    
                     dynamicLibraryManager = GameObject.FindObjectOfType<ARFoundationDynamicLibraryManager>();
+#endif
                     if (dynamicLibraryManager.IsNull())
                     {
                         if (TrackedImageManager.IsNull())

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;

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.")]

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.")]

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": [
     {