Fixes for API deprecation warnings when using plugin in Unity 6.4

Packages/Tracking Preview/AggregationProviders/Runtime/Scripts/JointOcclusion.cs

@@ -28,7 +28,11 @@ public class JointOcclusion : MonoBehaviour
     /// </summary>
     public void Setup()
     {
+#if UNITY_6000_4_OR_NEWER
+        List<JointOcclusion> allJointOcclusions = FindObjectsByType<JointOcclusion>().ToList();
+#else
         List<JointOcclusion> allJointOcclusions = FindObjectsByType<JointOcclusion>(FindObjectsSortMode.None).ToList();
+#endif
         layerName = "JointOcclusion" + allJointOcclusions.IndexOf(this).ToString();
 
         cam = GetComponent<Camera>();

Packages/Tracking Preview/HandRays/Runtime/Scripts/FarFieldLayerManager.cs

@@ -65,7 +65,12 @@ protected void GenerateLayers()
 
         protected void AssignLayers()
         {
+#if UNITY_6000_4_OR_NEWER
+            FarFieldObject[] farFieldObjects = FindObjectsByType<FarFieldObject>(FindObjectsInactive.Include);
+#else
             FarFieldObject[] farFieldObjects = FindObjectsByType<FarFieldObject>(FindObjectsInactive.Include, FindObjectsSortMode.None);
+#endif
+
             foreach (FarFieldObject ffo in farFieldObjects)
             {
                 ffo.gameObject.layer = FarFieldObjectLayer;

Packages/Tracking Preview/Locomotion/Runtime/Scripts/Teleportation/Teleport Action/Jump Gem Teleport/JumpGemTeleport.cs

@@ -48,7 +48,11 @@ public class JumpGemTeleport : TeleportActionBase
 
         private void Awake()
         {
+#if UNITY_6000_4_OR_NEWER
+            _jumpGems = FindObjectsByType<JumpGem>(FindObjectsInactive.Include).ToList();
+#else
             _jumpGems = FindObjectsByType<JumpGem>(FindObjectsInactive.Include, FindObjectsSortMode.None).ToList();
+#endif
             for (int i = 0; i < _jumpGems.Count; i++)
             {
                 int j = i;

Packages/Tracking Preview/Locomotion/Runtime/Scripts/Teleportation/Teleport Action/TeleportActionBase.cs

@@ -111,7 +111,11 @@ public virtual void Start()
 
             if (findTeleportAnchorsOnStart)
             {
+#if UNITY_6000_4_OR_NEWER
+                _teleportAnchors = new List<TeleportAnchor>(FindObjectsByType<TeleportAnchor>(FindObjectsInactive.Include));
+#else
                 _teleportAnchors = new List<TeleportAnchor>(FindObjectsByType<TeleportAnchor>(FindObjectsInactive.Include, FindObjectsSortMode.None));
+#endif
             }
 
             if (freeTeleportAnchor.TryGetComponent(out MeshCollider anchorCollider))

Packages/Tracking/Core/Editor/Scripts/EditorUtils.cs

@@ -30,9 +30,12 @@ public static class EditorUtils
         /// </summary>
         public static void ReplaceSceneReferences<T>(T a, T b) where T : UnityObject
         {
+#if UNITY_6000_4_OR_NEWER
+            var aId = a.GetEntityId();
+#else
             var aId = a.GetInstanceID();
+#endif 
             var refType = typeof(T);
-
             var curScene = SceneManager.GetActiveScene();
             var rootObjs = curScene.GetRootGameObjects();
             foreach (var rootObj in rootObjs)
@@ -53,7 +56,12 @@ public static void ReplaceSceneReferences<T>(T a, T b) where T : UnityObject
                             Where(fi => fi.FieldType.IsAssignableFrom(refType)))
                         {
                             var refValue = fieldInfo.GetValue(component) as T;
+
+#if UNITY_6000_4_OR_NEWER
+                            if (refValue.GetEntityId() == aId)
+#else
                             if (refValue.GetInstanceID() == aId)
+#endif
                             {
                                 objectChanges.Add(() =>
                                 {

Packages/Tracking/Core/Runtime/Scripts/Fiducial Markers/TrackingMarkerObject.cs

@@ -36,7 +36,9 @@ private void Start()
             // Ensure the LeapServiceProvider exists for us to position the device in world space
             if (leapServiceProvider == null)
             {
-#if UNITY_6000_0_OR_NEWER
+#if UNITY_6000_4_OR_NEWER
+                leapServiceProvider = FindAnyObjectByType<LeapServiceProvider>();
+#elif UNITY_6000_0_OR_NEWER
                 leapServiceProvider = FindFirstObjectByType<LeapServiceProvider>();
 #else
                 leapServiceProvider = FindObjectOfType<LeapServiceProvider>();

Packages/Tracking/Core/Runtime/Scripts/Utils/HandTrackingHintManager.cs

@@ -147,7 +147,10 @@ static Controller LeapController
             {
                 if (_leapController == null) // Find any existing controller
                 {
-#if UNITY_6000_0_OR_NEWER
+#if UNITY_6000_4_OR_NEWER
+                    LeapServiceProvider provider =
+                        UnityEngine.Object.FindAnyObjectByType<LeapServiceProvider>(FindObjectsInactive.Include);
+#elif UNITY_6000_0_OR_NEWER
                     LeapServiceProvider provider =
                         UnityEngine.Object.FindFirstObjectByType<LeapServiceProvider>(FindObjectsInactive.Include);
 #else

Packages/Tracking/Core/Runtime/Scripts/Utils/HandUtils.cs

@@ -46,7 +46,11 @@ private static void AssignBestLeapProvider(bool preferLiveLeapProviderOverStatic
                     s_provider = UnityEngine.Object.FindAnyObjectByType<XRLeapProviderManager>();
                     if (s_provider == null)
                     {
+#if UNITY_6000_4_OR_NEWER
+                        var candidates = UnityEngine.Object.FindObjectsByType<LeapProvider>();
+#else
                         var candidates = UnityEngine.Object.FindObjectsByType<LeapProvider>(FindObjectsSortMode.None);
+#endif
                         if (candidates.Length > 0)
                         {
                             if (preferLiveLeapProviderOverStaticHandPoseProviders)

Packages/Tracking/Examples~/XR Examples/Example Assets/Misc and Shared/Scripts/MovePoseExample.cs

@@ -23,7 +23,9 @@ private void OnEnable()
 
         private void Start()
         {
+#pragma warning disable CS0618 
             if (Physics.autoSyncTransforms)
+#pragma warning restore CS0618 
             {
                 Debug.LogWarning(
                     "Physics.autoSyncTransforms is enabled. This will cause Interaction "