[email protected]

## [6.0.1] - 2024-04-01 ### Changed
needle-mirror · Apr 1, 2024 · 65882b5 · 65882b5
1 parent b86e43f
commit 65882b5
Show file tree

Hide file tree

Showing 7 changed files with 67 additions and 32 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,17 @@ All notable changes to this package will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [6.0.1] - 2024-04-01
+
+### Changed
+
+- Changed AR Foundation dependency version from 6.0.0-pre.8 to 6.0.1.
+- Changed the minimum Unity version from 2023.3 to 6000.0, reflecting the new version number of Unity 6. Refer to the official [Unity 6 New Naming Convention](https://forum.unity.com/threads/unity-6-new-naming-convention.1558592/) announcement for more information.
+
+### Fixed
+
+- Fixed an issue where the tvOS build target would have compile errors in `ARKit.InputLayoutLoader`.
+
 ## [6.0.0-pre.8] - 2024-03-19
 
 ### Changed

diff --git a/Documentation~/index.md b/Documentation~/index.md
@@ -68,7 +68,10 @@ Apple ARKit XR Plug-in package supports project validation. Project validation i
 
 This version of Apple ARKit XR Plug-in is compatible with the following versions of the Unity Editor:
 
-* 2023.3
+* Unity 6 (6000.0).
+
+> [!NOTE]
+> You can visit the Unity Forum for more information on the [Unity 6 New Naming Convention](https://forum.unity.com/threads/unity-6-new-naming-convention.1558592/).
 
 You must use Xcode 14 or later when compiling an iOS Player that includes this package.
 

diff --git a/Documentation~/project-configuration-arkit.md b/Documentation~/project-configuration-arkit.md
@@ -14,26 +14,26 @@ You can review the [Project validation](#project-validation) section of the **XR
 
 Some ARKit features require specific Unity Project settings to function properly. The settings include:
 
-* **[Apple ARKit plug-in enabled](#enable-arkit)**: must be enabled to use ARKit features.
-* **[Target minimum iOS Version](#minimum-ios-version)**: must be set to 11 or higher.
-* **[Camera Usage Description](#camera-usage)**: must be filled in to use AR.
-* **[Face tracking subsystem enabled](#enable-face-tracking)**: must be enabled to use Face tracking features.
-* **[ARKit support Requirement](#arkit-required)**: can be set to **optional** or **required** depending on whether your app can be used without ARKit support.
+* **[Apple ARKit plug-in enabled](#enable-arkit)**: enable to use ARKit features.
+* **[Target minimum iOS Version](#minimum-ios-version)**: set to 11 or higher.
+* **[Camera Usage Description](#camera-usage)**: fill in to use AR.
+* **[Face tracking subsystem enabled](#enable-face-tracking)**: enable to use Face tracking features.
+* **[ARKit support Requirement](#arkit-required)**: set to **optional** or **required** depending on whether your app can be used without ARKit support.
 
 
 <a name="enable-arkit"></a>
 ### Enable the Apple ARKit plug-in
 
-To use ARKit, you must enable the plug-in in your **XR Plug-in Management** settings. (Installing the package from the Package Manager does not automatically enable the plug-in.)
+To use ARKit, you must enable the plug-in in your **XR Plug-in Management** settings. (Installing the package from the Package Manager doesn't automatically enable the plug-in.)
 
 > [!NOTE]
-> Enabling ARKit also installs the package, if necessary. However, disabling ARkit does not uninstall the package.
+> Enabling ARKit also installs the package, if necessary. However, disabling ARkit doesn't uninstall the package.
 
-You must install the **iOS Module** using the Unity Hub before you can enable the ARKit plug-in. See the [Add modules](https://docs.unity3d.com/hub/manual/AddModules.html) section of the Unity Hub documentation for instructions.
+You must install the **iOS Module** using the Unity Hub before you can enable the ARKit plug-in. Refer to the [Add modules](https://docs.unity3d.com/hub/manual/AddModules.html) section of the Unity Hub documentation for instructions.
 
 To enable ARKit:
 
-1. Open the **Player Settings** window (menu: **Edit &gt; Player Settings**).
+1. Open the **Project Settings** window (menu: **Edit &gt; Project Settings**).
 2. Select **XR Plug-in Management** to view the plug-in management settings.
 3. Select the **iOS** tab to view the iOS settings. (This tab is only shown when you have installed the Editor iOS Module.)
 4. Enable the **ARKit** option in the **Plug-in Providers** list.
@@ -48,14 +48,14 @@ The minimum version of iOS that supports ARKit is iOS 11.
 
 To change this setting:
 
-1. Open the **Player Settings** window (menu: **Edit &gt; Player Settings**).
+1. Open the **Project Settings** window (menu: **Edit &gt; Project Settings**).
 2. Select **Player** on the left to view the **Player Settings** page.
 3. Select the **iOS** tab to view the iOS settings.
 4. Open the **Other Settings** group (if necessary).
 5. Scroll down to the **Configuration** section.
 6. Set the **Target minimum iOS Version** field to 11.0 or higher.
 
-See Apple's [Verifying Device Support and User Permission](https://developer.apple.com/documentation/arkit/verifying_device_support_and_user_permission) for additional information.
+Refer to Apple's [Verifying Device Support and User Permission](https://developer.apple.com/documentation/arkit/verifying_device_support_and_user_permission) for additional information.
 
 <a name="camera-usage"></a>
 ### Set the Camera Usage Description
@@ -66,42 +66,42 @@ the `NSCameraUsageDescription` key.
 
 To set or change this setting:
 
-1. Open the **Player Settings** window (menu: **Edit &gt; Player Settings**).
+1. Open the **Project Settings** window (menu: **Edit &gt; Project Settings**).
 2. Select **Player** on the left to view the **Player Settings** page.
 3. Select the **iOS** tab to view the iOS settings.
 4. Open the **Other Settings** group (if necessary).
 5. Scroll down to the **Configuration** section.
 6. Enter the desired string in the **Camera Usage Description** field.
 
-See Apple's [Handle User Consent and Privacy](https://developer.apple.com/documentation/arkit/verifying_device_support_and_user_permission) for additional information.
+Refer to Apple's [Handle User Consent and Privacy](https://developer.apple.com/documentation/arkit/verifying_device_support_and_user_permission) for additional information.
 
 
 <a name="enable-face-tracking"></a>
 ### Enable the Face tracking subsystem
 
 To use ARKit's face tracking features, you must enable the ARKit face tracking subsystem in your **XR Plug-in Management** settings.
 
-You must install the ARKit package before enabling ARKit face tracking. See [Apple ARKit plug-in enabled](#enable-arkit) for instructions.
+You must install the ARKit package before enabling ARKit face tracking. Refer to [Apple ARKit plug-in enabled](#enable-arkit) for instructions.
 
 To enable ARKit face tracking:
 
-1. Open the **Player Settings** window (menu: **Edit &gt; Player Settings**).
+1. Open the **Project Settings** window (menu: **Edit &gt; Project Settings**).
 2. Click **XR Plug-in Management** on the left to open the plug-in provider list.
 3. Select **ARKit** in the list to view the ARKit plug-in settings page.
 4. Check the box next to **Face Tracking** to enable the feature.
 
 <a name="arkit-required"></a>
-### Set the ARKit support Requirement
+### Set the ARKit support requirement
 
-If your app cannot function without ARKit support, you can prevent prevent it from being installed on devices without ARKit support by setting the ARKit plug-in **Requirement** setting to **Required**. Alternately, if your app works with or without ARKit, you can set the **Requirement** setting to **Optional**.
+If your app can't function without ARKit support, you can prevent it from being installed on devices without ARKit support by setting the ARKit plug-in **Requirement** setting to **Required**. Alternately, if your app works with or without ARKit, you can set the **Requirement** setting to **Optional**.
 
-When you require ARKit, the `arkit` key is added to the `UIRequiredDeviceCapabilities` section of your app's `Info.plist` file. See Apple's [Verifying Device Support and User Permission](https://developer.apple.com/documentation/arkit/verifying_device_support_and_user_permission) for additional information.
+When you require ARKit, the `arkit` key is added to the `UIRequiredDeviceCapabilities` section of your app's `Info.plist` file. Refer to Apple's [Verifying Device Support and User Permission](https://developer.apple.com/documentation/arkit/verifying_device_support_and_user_permission) for additional information.
 
-You must install the ARKit package before you can change the ARKit requirement setting. See [Enable the Apple ARKit plug-in](#enable-arkit) for instructions.
+You must install the ARKit package before you can change the ARKit requirement setting. Refer to [Enable the Apple ARKit plug-in](#enable-arkit) for instructions.
 
 To change this setting:
 
-1. Open the **Player Settings** window (menu: **Edit &gt; Player Settings**).
+1. Open the **Project Settings** window (menu: **Edit &gt; Project Settings**).
 2. Click **XR Plug-in Management** on the left to open the plug-in provider list.
 3. Select **ARKit** in the list to view the ARKit plug-in settings page.
 
@@ -118,16 +118,16 @@ To change this setting:
 
 The Apple ARKit package defines a set of rules for the Project Validation system. These rules check for possible mistakes in the project configuration.
 
-Some of the rules serve as warnings for possible configuration problems; you are not required to fix these. Other rules flag configuration errors that would result in your app failing to build or not working once built. You must fix these errors.
+Some rules serve as warnings for possible configuration problems; you aren't required to fix these. Other rules flag configuration errors that might result in your app failing to build or not working once built. You must fix these errors.
 
 To review the ARKit project validation rules:
 
-1. Open the **Player Settings** window (menu: **Edit &gt; Player Settings**).
+1. Open the **Project Settings** window (menu: **Edit &gt; Project Settings**).
 2. Click **XR Plug-in Management** on the left to open the plug-in provider list.
 3. Select **Project Validation** in the list to view the validation page.
 4. Select the **iOS** tab to view the status of the validation checks for iOS XR plug-ins, including ARKit.
 
-Rules that pass validation are not shown unless you enable **Show all**. 
+Rules that pass validation aren't shown unless you enable **Show all**. 
 
 Some rules provide a **Fix** button that updates the configuration so that the rule passes validation. Other rules provide an **Edit** button that takes you to the relevant setting so that you can make the necessary adjustments yourself.
 

diff --git a/Runtime/Input/InputLayoutLoader.cs b/Runtime/Input/InputLayoutLoader.cs
@@ -21,24 +21,28 @@ public class InputLayoutLoader
 #if UNITY_EDITOR
         static InputLayoutLoader()
         {
+#if ENABLE_INPUT_SYSTEM && (ENABLE_VR || UNITY_GAMECORE) && !UNITY_FORCE_INPUTSYSTEM_XR_OFF || PACKAGE_DOCS_GENERATION
             RegisterLayouts();
+#endif // ENABLE_INPUT_SYSTEM && (ENABLE_VR || UNITY_GAMECORE) && !UNITY_FORCE_INPUTSYSTEM_XR_OFF || PACKAGE_DOCS_GENERATION
         }
-#endif
+#endif // UNITY_EDITOR
 
+#if ENABLE_INPUT_SYSTEM && (ENABLE_VR || UNITY_GAMECORE) && !UNITY_FORCE_INPUTSYSTEM_XR_OFF || PACKAGE_DOCS_GENERATION
         [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)]
         static void RegisterLayouts()
         {
 #if !UNITY_EDITOR
             if (!Api.AtLeast11_0())
                 return;
-#endif
+#endif // !UNITY_EDITOR
 
             Inputs.RegisterLayout<HandheldARInputDevice>(
                 matches: new InputDeviceMatcher()
                     .WithInterface(XRUtilities.InterfaceMatchAnyVersion)
                     .WithProduct("(ARKit)")
                 );
         }
+#endif // ENABLE_INPUT_SYSTEM && (ENABLE_VR || UNITY_GAMECORE) && !UNITY_FORCE_INPUTSYSTEM_XR_OFF || PACKAGE_DOCS_GENERATION
     }
 }
 #endif
diff --git a/ValidationExceptions.json b/ValidationExceptions.json
@@ -0,0 +1,10 @@
+{
+    "ErrorExceptions": [
+        {
+            "ValidationTest": "Package Unity Version Validation",
+            "ExceptionMessage": "The Unity version requirement is more strict than in the previous version of the package. Increment the minor version of the package to leave patch versions available for previous version. Read more about this error and potential solutions at https://docs.unity3d.com/Packages/com.unity.package-validation-suite@latest/index.html?preview=1&subfolder=/manual/package_unity_version_validation_error.html#the-unity-version-requirement-is-more-strict-than-in-the-previous-version-of-the-package",
+            "PackageVersion": "6.0.1"
+        }
+    ],
+    "WarningExceptions": []
+}
diff --git a/ValidationExceptions.json.meta b/ValidationExceptions.json.meta
diff --git a/package.json b/package.json
@@ -1,8 +1,8 @@
 {
   "name": "com.unity.xr.arkit",
   "displayName": "Apple ARKit XR Plugin",
-  "version": "6.0.0-pre.8",
-  "unity": "2023.3",
+  "version": "6.0.1",
+  "unity": "6000.0",
   "description": "Provides native Apple ARKit integration for use with Unity's multi-platform XR API.\nSupports the following features:\n-Efficient Background Rendering\n-Horizontal Planes\n-Depth Data\n-Anchors\n-Hit Testing\n-Face Tracking\n-Environment Probes\n-Meshing\n-Occlusion\n\n* Apple and ARKit are trademarks of Apple Inc., registered in the U.S. and other countries and regions.",
   "keywords": [
     "arkit",
@@ -13,20 +13,20 @@
   ],
   "dependencies": {
     "com.unity.editorcoroutines": "1.0.0",
-    "com.unity.xr.arfoundation": "6.0.0-pre.8",
+    "com.unity.xr.arfoundation": "6.0.1",
     "com.unity.xr.core-utils": "2.2.2",
     "com.unity.xr.management": "4.4.0"
   },
   "_upm": {
-    "changelog": "### Changed\n\n- Changed AR Foundation dependency version from 6.0.0-pre.7 to 6.0.0-pre.8."
+    "changelog": "### Changed\n\n- Changed AR Foundation dependency version from 6.0.0-pre.8 to 6.0.1.\n- Changed the minimum Unity version from 2023.3 to 6000.0, reflecting the new version number of Unity 6. Refer to the official [Unity 6 New Naming Convention](https://forum.unity.com/threads/unity-6-new-naming-convention.1558592/) announcement for more information.\n\n### Fixed\n\n- Fixed an issue where the tvOS build target would have compile errors in `ARKit.InputLayoutLoader`."
   },
   "upmCi": {
-    "footprint": "20089698e4f1c24807c35e6b53d1007d3a3097b3"
+    "footprint": "af4737e4c7e8cc7ab170a0be4a8288053c08d8d7"
   },
   "documentationUrl": "https://docs.unity3d.com/Packages/[email protected]/manual/index.html",
   "repository": {
     "url": "https://github.cds.internal.unity3d.com/unity/arfoundation.git",
     "type": "git",
-    "revision": "5114dc3da5fd97fe3fc289900d3d7333d8f21762"
+    "revision": "ab1d4a9449006f78f8ac4b3cd32ab363fbd763c3"
   }
 }