Merge pull request #4 from realitycollective/feature/core-compat

Update to latest core
realitycollective · May 7, 2024 · bdd89e8 · bdd89e8
2 parents 174a12b + b990c38
commit bdd89e8
Show file tree

Hide file tree

Showing 11 changed files with 63 additions and 15 deletions.
diff --git a/Editor/AssemblyInfo.cs 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.boundary.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
diff --git a/Editor/BoundaryPackageInstaller.cs b/Editor/BoundaryPackageInstaller.cs
@@ -1,11 +1,12 @@
-// Copyright (c) Reality Collective. All rights reserved.
+// 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.Editor;
 using RealityCollective.ServiceFramework.Editor.Packages;
+using RealityCollective.Utilities.Editor;
+using RealityCollective.Utilities.Extensions;
 using RealityToolkit.Editor;
+using RealityToolkit.Editor.Settings;
 using System.IO;
 using UnityEditor;
 
@@ -14,7 +15,7 @@ namespace RealityToolkit.Boundary.Editor
     [InitializeOnLoad]
     internal static class BoundaryPackageInstaller
     {
-        private static readonly string destinationPath = $"{RealityToolkitPreferences.ProfileGenerationPath}Boundary";
+        private static readonly string destinationPath = Path.Combine(RealityToolkitEditorSettings.Instance.AssetImportPath, "Boundary");
         private static readonly string sourcePath = Path.GetFullPath($"{PathFinderUtility.ResolvePath<IPathFinder>(typeof(BoundaryPackagePathFinder)).ForwardSlashes()}{Path.DirectorySeparatorChar}{RealityToolkitPreferences.HIDDEN_PACKAGE_ASSETS_PATH}");
 
         static BoundaryPackageInstaller()

diff --git a/Editor/RealityToolkit.Boundary.Editor.asmdef b/Editor/RealityToolkit.Boundary.Editor.asmdef
@@ -8,7 +8,8 @@
         "GUID:9753fcbb5b1feaf459f435ac95e51baa",
         "GUID:b2d046948d6452a4b8485efc9ce0f88c",
         "GUID:2a3f0ca4e21332c44bfdce311ea8943e",
-        "GUID:bdb4a7e54aeda2e47aac136b6f424728"
+        "GUID:bdb4a7e54aeda2e47aac136b6f424728",
+        "GUID:4ddd23ea56a3a40f0aa0036d1624a53e"
     ],
     "includePlatforms": [
         "Editor"

diff --git a/Runtime/AssemblyInfo.cs 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.boundary")]
+[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
diff --git a/Runtime/BoundaryService.cs b/Runtime/BoundaryService.cs
@@ -1,10 +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.Extensions;
 using RealityCollective.ServiceFramework.Attributes;
 using RealityCollective.ServiceFramework.Definitions.Platforms;
 using RealityCollective.ServiceFramework.Services;
+using RealityCollective.Utilities.Extensions;
 using RealityToolkit.Boundary.Definitions;
 using RealityToolkit.Boundary.Utilities;
 using RealityToolkit.Utilities;

diff --git a/Runtime/Definitions/BoundaryServiceProfile.cs b/Runtime/Definitions/BoundaryServiceProfile.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.Attributes;
 using RealityCollective.ServiceFramework.Definitions;
+using RealityCollective.Utilities.Attributes;
 using UnityEngine;
 
 namespace RealityToolkit.Boundary.Definitions

diff --git a/Runtime/Definitions/BoundaryVisibility.cs b/Runtime/Definitions/BoundaryVisibility.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Reality Collective. All rights reserved.
+// Copyright (c) Reality Collective. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
 namespace RealityToolkit.Boundary.Definitions
@@ -11,7 +11,7 @@ public enum BoundaryVisibility
     {
         /// <summary>
         /// The boundaries visibility status is unknown. Platform boundaries visibility
-        /// may be unknown e.g. when the platform does not provide an API for XRTK to query
+        /// may be unknown e.g. when the platform does not provide an API for Reality Toolkit to query
         /// boundary visibility state.
         /// </summary>
         Unknown = 0,

diff --git a/Runtime/Definitions/InscribedRectangle.cs b/Runtime/Definitions/InscribedRectangle.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.Boundary.Utilities;
 using RealityToolkit.Utilities;
 using System;

diff --git a/package.json b/package.json
@@ -2,18 +2,21 @@
   "name": "com.realitytoolkit.boundary",
   "displayName": "RealityToolkit.Boundary",
   "description": "A boundary system for use with the Reality Toolkit.",
+  "version": "1.0.0-pre.2",
+  "documentationUrl": "https://realitytoolkit.io",
+  "changelogUrl": "https://github.com/realitycollective/com.realitytoolkit.boundary/releases",
+  "licensesUrl": "https://github.com/realitycollective/com.realitytoolkit.boundary/blob/main/LICENSE.md",
   "keywords": [
     "VR",
     "AR",
     "XR",
     "Mixed Reality",
     "Boundary"
   ],
-  "version": "1.0.0-pre.2",
-  "unity": "2021.3",
+  "unity": "2022.3",
   "homepage": "https://github.com/realitycollective",
   "bugs": {
-    "url": "https://github.com/realitycollective/realitytoolkit.dev/issues"
+    "url": "https://github.com/realitycollective/com.realitytoolkit.boundary/issues"
   },
   "license": "MIT",
   "repository": {
@@ -25,13 +28,16 @@
     "email": "[email protected]",
     "url": "https://github.com/realitycollective"
   },
+  "publishConfig": {
+    "registry": "https://package.openupm.com"
+  },
   "dependencies": {
-    "com.realitytoolkit.core": "1.0.0-pre.37"
+    "com.realitytoolkit.core": "1.0.0-pre.48"
   },
   "assets": [
     {
       "displayName": "Default Assets",
       "path": "Assets~/"
     }
   ]
-}
+}