ARCore Extensions for AR Foundation v1.18.0

google-ar · Jun 23, 2020 · 35dbedc · 35dbedc
1 parent 3be2b4e
commit 35dbedc
Show file tree

Hide file tree

Showing 30 changed files with 150 additions and 2,268 deletions.
diff --git a/Editor/BuildResources/ARCoreiOSDependencies.template b/Editor/BuildResources/ARCoreiOSDependencies.template
@@ -1,6 +1,6 @@
 <dependencies>
     <iosPods>
-        <iosPod minTargetSdk="11.0" name="ARCore/CloudAnchors" version="~&gt; 1.17.0">
-            </iosPod>
+        <iosPod name="ARCore/CloudAnchors" version="~> 1.18.0" minTargetSdk="11.0">
+        </iosPod>
     </iosPods>
-</dependencies>
+</dependencies>
diff --git a/Editor/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.122.0.dll.mdb.meta b/Editor/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.122.0.dll.mdb.meta
diff --git a/Editor/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.122.0.dll.meta b/Editor/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.122.0.dll.meta
@@ -1,22 +1,16 @@
-fileFormatVersion: 2
-guid: 41e7ef5f1bd445eb8e550e9756442e51
-labels:
-- gvh_version-1.2.122.0
-- gvh
-- gvh_targets-editor
 PluginImporter:
+  assetBundleName:
+  assetBundleVariant:
+  defineConstraints: []
+  executionOrder: {}
   externalObjects: {}
-  serializedVersion: 2
   iconMap: {}
-  executionOrder: {}
-  defineConstraints: []
-  isPreloaded: 0
-  isOverridable: 0
   isExplicitlyReferenced: 0
-  validateReferences: 1
+  isOverridable: 0
+  isPreloaded: 0
   platformData:
   - first:
-      Any: 
+      Any:
     second:
       enabled: 0
       settings: {}
@@ -32,6 +26,12 @@ PluginImporter:
       enabled: 0
       settings:
         CPU: AnyCPU
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  serializedVersion: 2
+  userData:
+  validateReferences: 1
+fileFormatVersion: 2
+guid: 41e7ef5f1bd445eb8e550e9756442e51
+labels:
+- gvh
+- gvh_targets-editor
+- gvh_version-1.2.122.0
diff --git a/Editor/PlayServicesResolver/Editor/Google.JarResolver_v1.2.122.0.dll.mdb.meta b/Editor/PlayServicesResolver/Editor/Google.JarResolver_v1.2.122.0.dll.mdb.meta
diff --git a/Editor/PlayServicesResolver/Editor/Google.JarResolver_v1.2.122.0.dll.meta b/Editor/PlayServicesResolver/Editor/Google.JarResolver_v1.2.122.0.dll.meta
@@ -1,22 +1,16 @@
-fileFormatVersion: 2
-guid: 964a7a11a1a840c988da14d6f40cd95a
-labels:
-- gvh_version-1.2.122.0
-- gvh
-- gvh_targets-editor
 PluginImporter:
+  assetBundleName:
+  assetBundleVariant:
+  defineConstraints: []
+  executionOrder: {}
   externalObjects: {}
-  serializedVersion: 2
   iconMap: {}
-  executionOrder: {}
-  defineConstraints: []
-  isPreloaded: 0
-  isOverridable: 0
   isExplicitlyReferenced: 0
-  validateReferences: 1
+  isOverridable: 0
+  isPreloaded: 0
   platformData:
   - first:
-      Any: 
+      Any:
     second:
       enabled: 0
       settings: {}
@@ -32,6 +26,12 @@ PluginImporter:
       enabled: 0
       settings:
         CPU: AnyCPU
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  serializedVersion: 2
+  userData:
+  validateReferences: 1
+fileFormatVersion: 2
+guid: 964a7a11a1a840c988da14d6f40cd95a
+labels:
+- gvh
+- gvh_targets-editor
+- gvh_version-1.2.122.0
diff --git a/Editor/PlayServicesResolver/Editor/Google.VersionHandler.dll.mdb.meta b/Editor/PlayServicesResolver/Editor/Google.VersionHandler.dll.mdb.meta
diff --git a/Editor/PlayServicesResolver/Editor/Google.VersionHandler.dll.meta b/Editor/PlayServicesResolver/Editor/Google.VersionHandler.dll.meta
diff --git a/Editor/PlayServicesResolver/Editor/Google.VersionHandlerImpl_v1.2.122.0.dll.mdb.meta b/Editor/PlayServicesResolver/Editor/Google.VersionHandlerImpl_v1.2.122.0.dll.mdb.meta
diff --git a/Editor/PlayServicesResolver/Editor/Google.VersionHandlerImpl_v1.2.122.0.dll.meta b/Editor/PlayServicesResolver/Editor/Google.VersionHandlerImpl_v1.2.122.0.dll.meta
@@ -1,22 +1,16 @@
-fileFormatVersion: 2
-guid: a1eeacea5fce49a6be1d1e602635d1e7
-labels:
-- gvh_version-1.2.122.0
-- gvh
-- gvh_targets-editor
 PluginImporter:
+  assetBundleName:
+  assetBundleVariant:
+  defineConstraints: []
+  executionOrder: {}
   externalObjects: {}
-  serializedVersion: 2
   iconMap: {}
-  executionOrder: {}
-  defineConstraints: []
-  isPreloaded: 0
-  isOverridable: 0
   isExplicitlyReferenced: 0
-  validateReferences: 1
+  isOverridable: 0
+  isPreloaded: 0
   platformData:
   - first:
-      Any: 
+      Any:
     second:
       enabled: 0
       settings: {}
@@ -32,6 +26,12 @@ PluginImporter:
       enabled: 0
       settings:
         CPU: AnyCPU
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  serializedVersion: 2
+  userData:
+  validateReferences: 1
+fileFormatVersion: 2
+guid: a1eeacea5fce49a6be1d1e602635d1e7
+labels:
+- gvh
+- gvh_targets-editor
+- gvh_version-1.2.122.0
diff --git a/Editor/PlayServicesResolver/Editor/play-services-resolver_v1.2.122.0.txt.meta b/Editor/PlayServicesResolver/Editor/play-services-resolver_v1.2.122.0.txt.meta
diff --git a/Editor/Scripts/Internal/ARCoreExtensionsProjectSettings.cs b/Editor/Scripts/Internal/ARCoreExtensionsProjectSettings.cs
@@ -21,6 +21,7 @@
 namespace Google.XR.ARCoreExtensions.Editor.Internal
 {
     using System;
+    using System.Diagnostics.CodeAnalysis;
     using System.IO;
     using Google.XR.ARCoreExtensions;
     using UnityEngine;

diff --git a/Editor/Scripts/Internal/ARCoreExtensionsProjectSettingsGUI.cs b/Editor/Scripts/Internal/ARCoreExtensionsProjectSettingsGUI.cs
@@ -39,7 +39,6 @@ internal class ARCoreExtensionsProjectSettingsGUI
         private static float s_GroupLabelIndent = 15;
         private static float s_GroupFieldIndent =
             EditorGUIUtility.labelWidth - s_GroupLabelIndent;
-
         private static bool s_FoldoutCloudAnchorAPIKeys = true;
 
         internal static void OnGUI(bool renderForStandaloneWindow)