Release 1.0.3 (#20)

* Update to latest core (#19) * Update manifest * Add TextMeshPro as a dependency for the package * Remove Enable() / Disable() overrides Co-authored-by: realitycollectivebuildbot <[email protected]> Co-authored-by: Dino Fejzagić <[email protected]>
realitycollective · Sep 11, 2024 · be2cb8d · be2cb8d
1 parent 369ddbd
commit be2cb8d
Show file tree

Hide file tree

Showing 14 changed files with 79 additions and 57 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.3")]
+[assembly: AssemblyTitle("com.realitytoolkit.devtools.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/DevToolsPackageInstaller.cs b/Editor/DevToolsPackageInstaller.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.DevTools.Editor
     [InitializeOnLoad]
     internal static class DevToolsPackageInstaller
     {
-        private static readonly string destinationPath = $"{RealityToolkitPreferences.ProfileGenerationPath}DeveloperTools";
+        private static readonly string destinationPath = Path.Combine(RealityToolkitEditorSettings.Instance.AssetImportPath, "DeveloperTools");
         private static readonly string sourcePath = Path.GetFullPath($"{PathFinderUtility.ResolvePath<IPathFinder>(typeof(DevToolsPackagePathFinder)).ForwardSlashes()}{Path.DirectorySeparatorChar}{RealityToolkitPreferences.HIDDEN_PACKAGE_ASSETS_PATH}");
 
         static DevToolsPackageInstaller()

diff --git a/Editor/RealityToolkit.DevTools.Editor.asmdef b/Editor/RealityToolkit.DevTools.Editor.asmdef
@@ -8,7 +8,8 @@
         "GUID:2a3f0ca4e21332c44bfdce311ea8943e",
         "GUID:810ca3bc28e810c44ac144b708fca7f4",
         "GUID:13703f41b24bb904cb2305abe6317e3d",
-        "GUID:9753fcbb5b1feaf459f435ac95e51baa"
+        "GUID:9753fcbb5b1feaf459f435ac95e51baa",
+        "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.3")]
+[assembly: AssemblyTitle("com.realitytoolkit.devtools")]
+[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/BaseDiagnosticsEventData.cs b/Runtime/BaseDiagnosticsEventData.cs
@@ -1,9 +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.Utilities.Extensions;
 using System;
 using UnityEngine.EventSystems;
-using RealityCollective.Extensions;
 
 namespace RealityToolkit.DevTools
 {

diff --git a/Runtime/ConsoleDiagnostics/ConsoleDiagnosticsHandler.cs b/Runtime/ConsoleDiagnostics/ConsoleDiagnosticsHandler.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.Attributes;
+using RealityCollective.Utilities.Attributes;
 using System;
 using TMPro;
 using UnityEngine;

diff --git a/Runtime/ConsoleDiagnostics/ConsoleDiagnosticsServiceModule.cs b/Runtime/ConsoleDiagnostics/ConsoleDiagnosticsServiceModule.cs
@@ -23,21 +23,17 @@ public ConsoleDiagnosticsServiceModule(string name, uint priority, BaseProfile p
         }
 
         /// <inheritdoc />
-        public override void Enable()
+        public override void Start()
         {
-            base.Enable();
-
             if (DiagnosticsService != null)
             {
                 Application.logMessageReceived += DiagnosticsService.RaiseLogReceived;
             }
         }
 
         /// <inheritdoc />
-        public override void Disable()
+        public override void Destroy()
         {
-            base.Disable();
-
             if (DiagnosticsService != null)
             {
                 Application.logMessageReceived -= DiagnosticsService.RaiseLogReceived;

diff --git a/Runtime/DiagnosticsService.cs b/Runtime/DiagnosticsService.cs
@@ -1,15 +1,15 @@
 // Copyright (c) Reality Collective. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
-using RealityCollective.Definitions.Utilities;
-using RealityCollective.Extensions;
 using RealityCollective.ServiceFramework.Attributes;
 using RealityCollective.ServiceFramework.Definitions.Platforms;
+using RealityCollective.ServiceFramework.Definitions.Utilities;
 using RealityCollective.ServiceFramework.Services;
+using RealityCollective.Utilities.Extensions;
 using RealityToolkit.DevTools.ConsoleDiagnostics;
 using RealityToolkit.DevTools.FrameDiagnostics;
 using RealityToolkit.DevTools.MemoryDiagnostics;
-using RealityToolkit.Player.Interfaces;
+using RealityToolkit.Player;
 using UnityEngine;
 using UnityEngine.EventSystems;
 using Object = UnityEngine.Object;
@@ -71,17 +71,6 @@ public override void Initialize()
             frameEventData = new FrameEventData(currentEventSystem);
             consoleEventData = new ConsoleEventData(currentEventSystem);
             memoryEventData = new MemoryEventData(currentEventSystem);
-        }
-
-        /// <inheritdoc />
-        public override void Enable()
-        {
-            base.Enable();
-
-            if (!Application.isPlaying)
-            {
-                return;
-            }
 
             if (profile.ShowDiagnosticsWindowOnStart == AutoStartBehavior.AutoStart)
             {
@@ -90,24 +79,13 @@ public override void Enable()
         }
 
         /// <inheritdoc />
-        public override void Disable()
+        public override void Destroy()
         {
-            base.Disable();
-
-            if (!Application.isPlaying) { return; }
-
-            if (diagnosticsWindow != null)
+            if (diagnosticsWindow.IsNotNull())
             {
                 Unregister(diagnosticsWindow);
             }
 
-        }
-
-        /// <inheritdoc />
-        public override void Destroy()
-        {
-            base.Destroy();
-
             diagnosticsWindow.Destroy();
 
             if (!diagnosticsRoot.IsNull() &&
@@ -166,7 +144,10 @@ public bool IsWindowEnabled
             get => DiagnosticsWindow.activeInHierarchy && isWindowEnabled;
             set
             {
-                if (isWindowEnabled == value) { return; }
+                if (isWindowEnabled == value)
+                {
+                    return;
+                }
 
                 isWindowEnabled = value;
                 DiagnosticsWindow.SetActive(isWindowEnabled);

diff --git a/Runtime/DiagnosticsServiceProfile.cs b/Runtime/DiagnosticsServiceProfile.cs
@@ -1,9 +1,9 @@
-// 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.Attributes;
-using RealityCollective.Definitions.Utilities;
 using RealityCollective.ServiceFramework.Definitions;
+using RealityCollective.ServiceFramework.Definitions.Utilities;
+using RealityCollective.Utilities.Attributes;
 using UnityEngine;
 
 namespace RealityToolkit.DevTools

diff --git a/Runtime/FrameDiagnostics/FrameDiagnosticsHandler.cs b/Runtime/FrameDiagnostics/FrameDiagnosticsHandler.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.Attributes;
+using RealityCollective.Utilities.Attributes;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Text;

diff --git a/Runtime/FrameDiagnostics/FrameDiagnosticsServiceModule.cs b/Runtime/FrameDiagnostics/FrameDiagnosticsServiceModule.cs
@@ -74,12 +74,8 @@ private int DeviceTargetRefreshRate
         #region IService Implementation
 
         /// <inheritdoc />
-        public override void Enable()
+        public override void Start()
         {
-            base.Enable();
-
-            if (!Application.isPlaying) { return; }
-
             stopwatch.Restart();
         }
 

diff --git a/package.json b/package.json
@@ -2,17 +2,20 @@
   "name": "com.realitytoolkit.devtools",
   "displayName": "RealityToolkit.DevTools",
   "description": "A collection of services, utilities and tools useful for developing immersive experiences using the Reality Toolkit.",
+  "version": "1.0.3-pre.3",
+  "documentationUrl": "https://realitytoolkit.realitycollective.net/",
+  "changelogUrl": "https://github.com/realitycollective/com.realitytoolkit.devtools/releases",
+  "licensesUrl": "https://github.com/realitycollective/com.realitytoolkit.devtools/blob/main/LICENSE.md",
   "keywords": [
     "VR",
     "AR",
     "XR",
     "Mixed Reality"
   ],
-  "version": "1.0.2-pre.1",
-  "unity": "2021.3",
-  "homepage": "https://github.com/realitycollective",
+  "unity": "2022.3",
+  "homepage": "https://realitytoolkit.realitycollective.net/",
   "bugs": {
-    "url": "https://github.com/realitycollective/realitytoolkit.dev/issues"
+    "url": "https://github.com/realitycollective/com.realitytoolkit.devtools/issues"
   },
   "license": "MIT",
   "repository": {
@@ -24,10 +27,14 @@
     "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.player": "1.0.3-pre.1",
-    "com.unity.ugui": "1.0.0"
+    "com.realitytoolkit.core": "1.0.0-pre.48",
+    "com.realitytoolkit.player": "1.0.4",
+    "com.unity.ugui": "1.0.0",
+    "com.unity.textmeshpro": "3.0.8"
   },
   "assets": [
     {