Merge pull request #5 from jared-marsau/reviews/reduceaxosrequirement

Lower Xcode SDK requirement for accessibility native code

plug-ins/Apple.Accessibility/Apple.Accessibility_Unity/Assets/Apple.Accessibility/Runtime/AccessibilityNode.cs → plug-ins/Apple.Accessibility/Apple.Accessibility_Unity/Assets/Apple.Accessibility/AccessibilityNode.cs

@@ -542,7 +542,7 @@ internal AccessibilityNode _accessibilityParent()
         [SerializeField] private bool m_userIsAccessibilityElement = true;
         internal bool _isAccessibilityElement()
         {
-            static bool defaultProvider(Component c)
+            bool defaultProvider(Component c)
             {
                 return false;
             }
@@ -554,7 +554,7 @@ static bool defaultProvider(Component c)
         [SerializeField] private AccessibilityTrait m_userAccessibilityTraits = AccessibilityTrait.None;
         internal AccessibilityTrait _accessibilityTraits()
         {
-            static AccessibilityTrait defaultProvider(Component c)
+            AccessibilityTrait defaultProvider(Component c)
             {
                 if (c is Behaviour)
                 {
@@ -570,7 +570,7 @@ static AccessibilityTrait defaultProvider(Component c)
         private Rect m_userAccessibilityFrame;
         internal Rect _accessibilityFrame()
         {
-            static Rect defaultProvider(Component c)
+            Rect defaultProvider(Component c)
             {
                 Rect defaultFrame = Rect.zero;
                 foreach (Renderer r in c.GetComponents<Renderer>())
@@ -608,7 +608,7 @@ static Rect defaultProvider(Component c)
         [SerializeField] private string m_userAccessibilityLabel;
         internal string _accessibilityLabel()
         {
-            static string defaultProvider(Component c)
+            string defaultProvider(Component c)
             {
                 return null;
             }
@@ -620,7 +620,7 @@ static string defaultProvider(Component c)
         [SerializeField] private string m_userAccessibilityValue;
         internal string _accessibilityValue()
         {
-            static string defaultProvider(Component c)
+            string defaultProvider(Component c)
             {
                 return null;
             }
@@ -632,7 +632,7 @@ static string defaultProvider(Component c)
         [SerializeField] private string m_userAccessibilityHint;
         internal string _accessibilityHint()
         {
-            static string defaultProvider(Component c)
+            string defaultProvider(Component c)
             {
                 return null;
             }
@@ -644,7 +644,7 @@ static string defaultProvider(Component c)
         [SerializeField] private string m_userAccessibilityIdentifier;
         internal string _accessibilityIdentifier()
         {
-            static string defaultProvider(Component c)
+            string defaultProvider(Component c)
             {
                 return null;
             }
@@ -656,7 +656,7 @@ static string defaultProvider(Component c)
         private Vector2 m_userAccessibilityActivationPoint;
         internal Vector2 _accessibilityActivationPoint()
         {
-            static Vector2 defaultProvider(Component c)
+            Vector2 defaultProvider(Component c)
             {
                 // use positiveInfinity to indicate no-value.
                 return Vector2.positiveInfinity;
@@ -669,7 +669,7 @@ static Vector2 defaultProvider(Component c)
         private AccessibilityCustomAction[] m_userAccessibilityCustomActions;
         internal AccessibilityCustomAction[] _accessibilityCustomActions()
         {
-            static AccessibilityCustomAction[] defaultProvider(Component c)
+            AccessibilityCustomAction[] defaultProvider(Component c)
             {
                 return null;
             }
@@ -681,7 +681,7 @@ static AccessibilityCustomAction[] defaultProvider(Component c)
         [SerializeField] private bool m_userAccessibilityViewIsModal;
         internal bool _accessibilityViewIsModal()
         {
-            static bool defaultProvider(Component c)
+            bool defaultProvider(Component c)
             {
                 return false;
             }
@@ -691,7 +691,7 @@ static bool defaultProvider(Component c)
 
         internal bool _accessibilityIncrement()
         {
-            static bool defaultProvider(Component c)
+            bool defaultProvider(Component c)
             {
                 return false;
             }
@@ -700,7 +700,7 @@ static bool defaultProvider(Component c)
 
         internal bool _accessibilityDecrement()
         {
-            static bool defaultProvider(Component c)
+            bool defaultProvider(Component c)
             {
                 return false;
             }
@@ -709,7 +709,7 @@ static bool defaultProvider(Component c)
 
         internal bool _accessibilityScroll(AccessibilityScrollDirection direction)
         {
-            static bool defaultProvider(Component c)
+            bool defaultProvider(Component c)
             {
                 return false;
             }
@@ -728,7 +728,7 @@ static bool defaultProvider(Component c)
 
         internal bool _accessibilityPerformEscape()
         {
-            static bool defaultProvider(Component c)
+            bool defaultProvider(Component c)
             {
                 return false;
             }
@@ -747,7 +747,7 @@ static bool defaultProvider(Component c)
 
         internal bool _accessibilityPerformMagicTap()
         {
-            static bool defaultProvider(Component c)
+            bool defaultProvider(Component c)
             {
                 return false;
             }
@@ -766,7 +766,7 @@ static bool defaultProvider(Component c)
 
         internal bool _accessibilityActivate()
         {
-            static bool defaultProvider(Component c)
+            bool defaultProvider(Component c)
             {
                 return false;
             }

plug-ins/Apple.Accessibility/Apple.Accessibility_Unity/Assets/Apple.Accessibility/Documentation~/Apple.Accessibility.md

@@ -11,6 +11,8 @@ See the [Quick-Start Guide](../../../../../../Documentation/Quickstart.md) for g
 ## Usage
 Please find an introduction to using Apple's Accessibility Plug-in below. For a comprehensive guide to Accessibility on Apple devices, please see [Accessibility Developer Documentation](https://developer.apple.com/documentation/accessibility/)
 
+The plugin supports Unity 2020.3 and above, but should work with older versions of Unity.
+
 ### Table of Contents
 [Accessibility Elements](#Accessibility-Elements)
 

plug-ins/Apple.Accessibility/Apple.Accessibility_Unity/Packages/manifest.json

@@ -1,14 +1,7 @@
 {
   "dependencies": {
     "com.apple.unityplugin.core": "file:../../../Apple.Core/Apple.Core_Unity/Assets/Apple.Core",
-    "com.unity.2d.sprite": "1.0.0",
-    "com.unity.2d.tilemap": "1.0.0",
-    "com.unity.ide.rider": "3.0.7",
-    "com.unity.ide.visualstudio": "2.0.14",
-    "com.unity.ide.vscode": "1.2.5",
     "com.unity.test-framework": "1.1.31",
-    "com.unity.textmeshpro": "3.0.6",
-    "com.unity.timeline": "1.4.8",
     "com.unity.ugui": "1.0.0",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",

plug-ins/Apple.Accessibility/Apple.Accessibility_Unity/Packages/packages-lock.json

@@ -6,50 +6,13 @@
       "source": "local",
       "dependencies": {}
     },
-    "com.unity.2d.sprite": {
-      "version": "1.0.0",
-      "depth": 0,
-      "source": "builtin",
-      "dependencies": {}
-    },
-    "com.unity.2d.tilemap": {
-      "version": "1.0.0",
-      "depth": 0,
-      "source": "builtin",
-      "dependencies": {}
-    },
     "com.unity.ext.nunit": {
       "version": "1.0.6",
       "depth": 1,
       "source": "registry",
       "dependencies": {},
       "url": "https://packages.unity.com"
     },
-    "com.unity.ide.rider": {
-      "version": "3.0.7",
-      "depth": 0,
-      "source": "registry",
-      "dependencies": {
-        "com.unity.ext.nunit": "1.0.6"
-      },
-      "url": "https://packages.unity.com"
-    },
-    "com.unity.ide.visualstudio": {
-      "version": "2.0.14",
-      "depth": 0,
-      "source": "registry",
-      "dependencies": {
-        "com.unity.test-framework": "1.1.9"
-      },
-      "url": "https://packages.unity.com"
-    },
-    "com.unity.ide.vscode": {
-      "version": "1.2.5",
-      "depth": 0,
-      "source": "registry",
-      "dependencies": {},
-      "url": "https://packages.unity.com"
-    },
     "com.unity.test-framework": {
       "version": "1.1.31",
       "depth": 0,
@@ -61,27 +24,6 @@
       },
       "url": "https://packages.unity.com"
     },
-    "com.unity.textmeshpro": {
-      "version": "3.0.6",
-      "depth": 0,
-      "source": "registry",
-      "dependencies": {
-        "com.unity.ugui": "1.0.0"
-      },
-      "url": "https://packages.unity.com"
-    },
-    "com.unity.timeline": {
-      "version": "1.4.8",
-      "depth": 0,
-      "source": "registry",
-      "dependencies": {
-        "com.unity.modules.director": "1.0.0",
-        "com.unity.modules.animation": "1.0.0",
-        "com.unity.modules.audio": "1.0.0",
-        "com.unity.modules.particlesystem": "1.0.0"
-      },
-      "url": "https://packages.unity.com"
-    },
     "com.unity.ugui": {
       "version": "1.0.0",
       "depth": 0,

plug-ins/Apple.Accessibility/Apple.Accessibility_Unity/ProjectSettings/ProjectSettings.asset

@@ -174,7 +174,7 @@ PlayerSettings:
   StripUnusedMeshComponents: 0
   VertexChannelCompressionMask: 4054
   iPhoneSdkVersion: 988
-  iOSTargetOSVersionString: 11.0
+  iOSTargetOSVersionString: 9.0
   tvOSSdkVersion: 0
   tvOSRequireExtendedGameController: 0
   tvOSTargetOSVersionString: 11.0
@@ -215,6 +215,7 @@ PlayerSettings:
   iOSLaunchScreeniPadCustomStoryboardPath: 
   iOSDeviceRequirements: []
   iOSURLSchemes: []
+  macOSURLSchemes: []
   iOSBackgroundModes: 0
   iOSMetalForceHardShadows: 0
   metalEditorSupport: 1

plug-ins/Apple.Accessibility/Native/Accessibility.xcodeproj/project.pbxproj

@@ -491,7 +491,7 @@
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
 				INFOPLIST_OUTPUT_FORMAT = XML;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.apple-plugins.AppleAccessibility-iOS";
 				PRODUCT_NAME = AppleAccessibility;
@@ -516,7 +516,7 @@
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
 				INFOPLIST_OUTPUT_FORMAT = XML;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.apple-plugins.AppleAccessibility-iOS";
 				PRODUCT_NAME = AppleAccessibility;
@@ -547,7 +547,7 @@
 				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
 				SWIFT_EMIT_LOC_STRINGS = YES;
-				TVOS_DEPLOYMENT_TARGET = 13.0;
+				TVOS_DEPLOYMENT_TARGET = 9.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -571,7 +571,7 @@
 				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
 				SWIFT_EMIT_LOC_STRINGS = YES;
-				TVOS_DEPLOYMENT_TARGET = 13.0;
+				TVOS_DEPLOYMENT_TARGET = 9.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};