ARCore Extensions for AR Foundation v1.24.0

google-ar · May 18, 2021 · 739f4fe · 739f4fe
1 parent 2a60c57
commit 739f4fe
Show file tree

Hide file tree

Showing 74 changed files with 1,916 additions and 896 deletions.
diff --git a/Editor/BuildResources/ARCoreAndroidKeylessDependencies.template b/Editor/BuildResources/ARCoreAndroidKeylessDependencies.template
diff --git a/Editor/BuildResources/ARCoreiOSDependencies.template b/Editor/BuildResources/ARCoreiOSDependencies.template
@@ -1,6 +1,6 @@
 <dependencies>
     <iosPods>
-        <iosPod name="ARCore/CloudAnchors" version="~> 1.23.0" minTargetSdk="11.0">
+        <iosPod name="ARCore/CloudAnchors" version="~> 1.24.0" minTargetSdk="11.0">
         </iosPod>
     </iosPods>
 </dependencies>
diff --git a/Editor/BuildResources/cloud_anchor_manifest.aartemplate b/Editor/BuildResources/cloud_anchor_manifest.aartemplate
diff --git a/Editor/Scripts/Internal/ARCoreExtensionsProjectSettingsProvider.cs b/Editor/Scripts/Internal/ARCoreExtensionsProjectSettingsProvider.cs
@@ -20,6 +20,7 @@
 
 namespace Google.XR.ARCoreExtensions.Editor.Internal
 {
+    using Google.XR.ARCoreExtensions.Internal;
     using UnityEditor;
     using UnityEngine;
 

diff --git a/Editor/Scripts/Internal/AndroidDependenciesHelper.cs b/Editor/Scripts/Internal/AndroidDependenciesHelper.cs
@@ -39,8 +39,6 @@ public static class AndroidDependenciesHelper
         //     Editor/Google.JarResolver_{version}.dll.meta
         private const string _jarResolverGuid = "a8f371f579f2426d93a8c958438275b7";
 
-        private static readonly string _templateFileExtension = ".template";
-        private static readonly string _playServiceDependencyFileExtension = ".xml";
 
         /// <summary>
         /// Gets all session configs from active scenes.
@@ -113,50 +111,6 @@ public static void SetAndroidPluginEnabled(bool enabledDependencies,
             pluginImporter.SetCompatibleWithPlatform(BuildTarget.Android, enabledDependencies);
         }
 
-        /// <summary>
-        /// Handle the addition or removal Android dependencies using the ExternalDependencyManager.
-        /// Adding the dependencies is done by renaming the dependencies .template file to a .xml
-        /// file so that it will be picked up by the ExternalDependencyManager plugin.
-        /// </summary>
-        /// <param name="enabledDependencies">If set to <c>true</c> enabled dependencies.</param>
-        /// <param name="dependenciesTemplateGuid">Dependencies template GUID.</param>
-        public static void UpdateAndroidDependencies(bool enabledDependencies,
-            string dependenciesTemplateGuid)
-        {
-            string dependenciesTemplatePath =
-                AssetDatabase.GUIDToAssetPath(dependenciesTemplateGuid);
-            if (dependenciesTemplatePath == null)
-            {
-                Debug.LogError(
-                    "ARCoreExtensions: Failed to enable Android dependencies xml. " +
-                    "Template file is missing.");
-                return;
-            }
-
-            string dependenciesXMLPath = dependenciesTemplatePath.Replace(
-                _templateFileExtension, _playServiceDependencyFileExtension);
-
-            if (enabledDependencies && !File.Exists(dependenciesXMLPath))
-            {
-                Debug.LogFormat(
-                    "Adding {0}.",
-                    System.IO.Path.GetFileNameWithoutExtension(dependenciesTemplatePath));
-
-                File.Copy(dependenciesTemplatePath, dependenciesXMLPath);
-                AssetDatabase.Refresh();
-            }
-            else if (!enabledDependencies && File.Exists(dependenciesXMLPath))
-            {
-                Debug.LogFormat(
-                    "Removing {0}.",
-                    System.IO.Path.GetFileNameWithoutExtension(dependenciesTemplatePath));
-
-                File.Delete(dependenciesXMLPath);
-                File.Delete(dependenciesXMLPath + ".meta");
-                AssetDatabase.Refresh();
-            }
-        }
-
         /// <summary>
         /// Uses reflection to find the GooglePlayServices.PlayServicesResolver class and invoke
         /// the public static method, MenuResolve() in order to resolve dependencies change.

diff --git a/Editor/Scripts/Internal/AndroidKeylessPreprocessBuild.cs b/Editor/Scripts/Internal/AndroidKeylessPreprocessBuild.cs
diff --git a/Editor/Scripts/Internal/AndroidSupportPreprocessBuild.cs b/Editor/Scripts/Internal/AndroidSupportPreprocessBuild.cs
@@ -89,7 +89,7 @@ private bool CheckARCoreLoader()
                 return false;
             }
 
-            foreach (var loader in generalSettings.Manager.loaders)
+            foreach (var loader in generalSettings.Manager.activeLoaders)
             {
                 if (loader is ARCoreLoader)
                 {