From e1d1dd380c70ae9e026c62527b5fc0a014e27768 Mon Sep 17 00:00:00 2001
From: ed <eddavies95@gmail.com>
Date: Fri, 8 Oct 2021 11:29:29 +0100
Subject: [PATCH] iOS:  Fix compatibility when targeting older SDK versions

---
 .../accessibility/juce_ios_Accessibility.mm   | 21 +++++++++++++------
 .../accessibility/juce_mac_Accessibility.mm   |  2 +-
 .../native/juce_ios_ContentSharer.cpp         |  4 ++++
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/modules/juce_gui_basics/native/accessibility/juce_ios_Accessibility.mm b/modules/juce_gui_basics/native/accessibility/juce_ios_Accessibility.mm
index fab5b123ed..1dcdbbf0f9 100644
--- a/modules/juce_gui_basics/native/accessibility/juce_ios_Accessibility.mm
+++ b/modules/juce_gui_basics/native/accessibility/juce_ios_Accessibility.mm
@@ -117,7 +117,11 @@ private:
             addMethod (@selector (isAccessibilityElement),     getIsAccessibilityElement,     "c@:");
             addMethod (@selector (accessibilityFrame),         getAccessibilityFrame,         @encode (CGRect), "@:");
             addMethod (@selector (accessibilityElements),      getAccessibilityElements,      "@@:");
-            addMethod (@selector (accessibilityContainerType), getAccessibilityContainerType, "i@:");
+
+           #if JUCE_IOS_CONTAINER_API_AVAILABLE
+            if (@available (iOS 11.0, *))
+                addMethod (@selector (accessibilityContainerType), getAccessibilityContainerType, "i@:");
+           #endif
 
             addIvar<AccessibilityHandler*> ("handler");
 
@@ -210,11 +214,16 @@ private:
             addMethod (@selector (accessibilityIncrement), accessibilityPerformIncrement, "c@:");
             addMethod (@selector (accessibilityDecrement), accessibilityPerformDecrement, "c@:");
 
-            addMethod (@selector (accessibilityDataTableCellElementForRow:column:), getAccessibilityDataTableCellElementForRowColumn, "@@:ii");
-            addMethod (@selector (accessibilityRowCount),                           getAccessibilityRowCount,                         "i@:");
-            addMethod (@selector (accessibilityColumnCount),                        getAccessibilityColumnCount,                      "i@:");
-            addMethod (@selector (accessibilityRowRange),                           getAccessibilityRowIndexRange,                    @encode (NSRange), "@:");
-            addMethod (@selector (accessibilityColumnRange),                        getAccessibilityColumnIndexRange,                 @encode (NSRange), "@:");
+           #if JUCE_IOS_CONTAINER_API_AVAILABLE
+            if (@available (iOS 11.0, *))
+            {
+                addMethod (@selector (accessibilityDataTableCellElementForRow:column:), getAccessibilityDataTableCellElementForRowColumn, "@@:ii");
+                addMethod (@selector (accessibilityRowCount),                           getAccessibilityRowCount,                         "i@:");
+                addMethod (@selector (accessibilityColumnCount),                        getAccessibilityColumnCount,                      "i@:");
+                addMethod (@selector (accessibilityRowRange),                           getAccessibilityRowIndexRange,                    @encode (NSRange), "@:");
+                addMethod (@selector (accessibilityColumnRange),                        getAccessibilityColumnIndexRange,                 @encode (NSRange), "@:");
+            }
+           #endif
 
             if (elementType == Type::textElement)
             {
diff --git a/modules/juce_gui_basics/native/accessibility/juce_mac_Accessibility.mm b/modules/juce_gui_basics/native/accessibility/juce_mac_Accessibility.mm
index aba1bba1dc..b1a1b9be92 100644
--- a/modules/juce_gui_basics/native/accessibility/juce_mac_Accessibility.mm
+++ b/modules/juce_gui_basics/native/accessibility/juce_mac_Accessibility.mm
@@ -28,7 +28,7 @@ static void juceFreeAccessibilityPlatformSpecificData (NSAccessibilityElement<NS
 namespace juce
 {
 
-#if (! defined MAC_OS_X_VERSION_10_13) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_13
+#if ! defined (MAC_OS_X_VERSION_10_13) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_13
  using NSAccessibilityRole = NSString*;
  using NSAccessibilityNotificationName = NSString*;
 #endif
diff --git a/modules/juce_gui_basics/native/juce_ios_ContentSharer.cpp b/modules/juce_gui_basics/native/juce_ios_ContentSharer.cpp
index 4b5cce202a..059c068521 100644
--- a/modules/juce_gui_basics/native/juce_ios_ContentSharer.cpp
+++ b/modules/juce_gui_basics/native/juce_ios_ContentSharer.cpp
@@ -26,6 +26,10 @@
 namespace juce
 {
 
+#if ! defined (__IPHONE_10_0) || __IPHONE_OS_VERSION_MAX_ALLOWED < __IPHONE_10_0
+ using UIActivityType = NSString*;
+#endif
+
 class ContentSharer::ContentSharerNativeImpl    : public ContentSharer::Pimpl,
                                                   private Component
 {