Merge pull request livecode#7557 from livecodepanos/support_xcode_12.5

livecodepanos · web-flow · commit b40f83645fda · 2021-05-25T15:52:03.000+03:00
[[ Bug 23183 ]] Support building with Xcode 12.5 / iOS 14.5 SDK
diff --git a/Installer/package.txt b/Installer/package.txt
diff --git a/Makefile b/Makefile
@@ -25,10 +25,10 @@ EMMAKE ?= emmake
 
 # Some magic to control which versions of iOS we try to build.  N.b. you may
 # also need to modify the buildbot configuration
-IPHONEOS_VERSIONS ?= 10.2 11.2 12.1 13.2 14.4
-IPHONESIMULATOR_VERSIONS ?= 10.2 11.2 12.1 13.2 14.4
-SKIP_IPHONEOS_VERSIONS ?= 9.2
-SKIP_IPHONESIMULATOR_VERSIONS ?= 6.1 7.1 8.2 9.2
+IPHONEOS_VERSIONS ?= 11.2 12.1 13.2 14.4 14.5
+IPHONESIMULATOR_VERSIONS ?= 11.2 12.1 13.2 14.4 14.5
+SKIP_IPHONEOS_VERSIONS ?= 9.2 10.2
+SKIP_IPHONESIMULATOR_VERSIONS ?= 6.1 7.1 8.2 9.2 10.2
 
 
 IOS_SDKS ?= \
diff --git a/config.py b/config.py
@@ -31,16 +31,16 @@
     'x86-android-ndk16r15',
     'x86_64-android-ndk16r15',
     'universal-mac-macosx10.9', # Minimum deployment target
+    'universal-ios-iphoneos14.5',
     'universal-ios-iphoneos14.4',
     'universal-ios-iphoneos13.2',
     'universal-ios-iphoneos12.1',
     'universal-ios-iphoneos11.2',
-    'universal-ios-iphoneos10.2',
+    'universal-ios-iphonesimulator14.5',
     'universal-ios-iphonesimulator14.4',
     'universal-ios-iphonesimulator13.2',
     'universal-ios-iphonesimulator12.1',
     'universal-ios-iphonesimulator11.2',
-    'universal-ios-iphonesimulator10.2',
     'x86-win32', # TODO[2017-03-23] More specific ABI
     'x86_64-win32',
     'js-emscripten-sdk1.35',
diff --git a/docs/notes-base/platforms.md b/docs/notes-base/platforms.md
@@ -59,24 +59,25 @@ The Mac engine supports:
 iOS deployment is possible when running LiveCode IDE on a Mac, and provided Xcode is installed and has been set in LiveCode *Preferences* (in the *Mobile Support* pane).
 
 Currently, the supported versions of Xcode are:
-* Xcode 8.2 on MacOS X 10.11
 * Xcode 9.2 on MacOS 10.12 (Note: You need to upgrade to 10.12.6)
 * Xcode 10.1 on MacOS 10.13 (Note: You need to upgrade to 10.13.4)
 * Xcode 11.3 on MacOS 10.14 (Note: You need to upgrade to 10.14.4) 
 * Xcode 12.4 on MacOS 10.15 and above (Note: You need to upgrade to 10.15.4) 
+* Xcode 12.5 on MacOS 11.0 and above
+
 
 It is also possible to set other versions of Xcode, to allow testing
-on a wider range of iOS simulators. For instance, on MacOS 10.12
-(Sierra), you can add *Xcode 8.2* in the *Mobile Support* preferences,
-to let you test your stack on the *iOS Simulator 10.2*.
+on a wider range of iOS simulators. For instance, on MacOS 10.13
+(High Sierra), you can add *Xcode 9.2* in the *Mobile Support* preferences,
+to let you test your stack on the *iOS Simulator 11.2*.
 
 We currently support building against the following versions of the iOS SDK:
 
-* 10.2 (included in Xcode 8.2)
 * 11.2 (included in Xcode 9.2)
 * 12.1 (included in Xcode 10.1)
 * 13.2 (included in Xcode 11.3)
 * 14.4 (included in Xcode 12.4)
+* 14.5 (included in Xcode 12.5)
 
 ## Android
 
diff --git a/docs/notes/bugfix-23183.md b/docs/notes/bugfix-23183.md
@@ -0,0 +1 @@
+# Add support for building apps against iOS 14.5 SDK
diff --git a/ide-support/revdeploylibraryios.livecodescript b/ide-support/revdeploylibraryios.livecodescript
@@ -18,7 +18,7 @@ local sDeviceSDKs
 -- SN-2015-03-24: [[ Bug 15037 ]] Add a consistent, strict list of the
 --  SDKs and device relying on the engines we provide in the shipped version
 function deployUsableIosSdk
-   return "10.2,11.2,12.1,13.2,14.4"
+   return "11.2,12.1,13.2,14.4,14.5"
 end deployUsableIosSdk
 
 // SN-2015-05-01: Return the pair iOS SDK / Xcode for the current MacOS version
@@ -28,10 +28,8 @@ function deployGetIphoneOSes
    local tList, tMacVersion
    put deploySanitizeSystemVersion() into tMacVersion
    // Xcode 8.2 can be installed from Mac OSX 10.11.0 onwards
-   if tMacVersion < 101100 then
-      answer error "To deploy to an iOS device or simulator, you need to upgrade your Mac to at least Mac OSX 10.11.0"
-   else if tMacVersion < 101200 then
-      put "10.2,8.2,10.2" into tList[1]
+   if tMacVersion < 101200 then
+      answer error "To deploy to an iOS device or simulator, you need to upgrade your Mac to at least Mac OSX 10.12.0"
    else if tMacVersion < 101206 then
       put empty into tList[1]
       answer error "To use Xcode 9.2, you need to upgrade your Mac to MacOS Sierra 10.12.6"
@@ -50,9 +48,11 @@ function deployGetIphoneOSes
    else if tMacVersion < 101504 then
       put empty into tList[1]
       answer error "To use Xcode 12.4, you need to upgrade your Mac to MacOS Catalina 10.15.4"
-   else
-      // Xcode 12.4 requires a Mac running Mac OS 10.15.4 or later
+   else if tMacVersion < 110000 then 
       put "14.4,12.4,14.4" into tList[1]
+   else
+      // Xcode 12.5 requires a Mac running Mac OS 11.0 or later
+      put "14.5,12.5,14.5" into tList[1]
    end if
    
    return tList
@@ -699,6 +699,10 @@ end deployIsValidSDK
 function deploySanitizeSystemVersion
    set the itemDel to "."
    get the systemVersion   
+   // TODO: Remove this workaround once bug 22887 is fixed
+   if it is "10.16.0" then
+      get shell("sw_vers -productVersion")
+   end if
    if the length of item 2 of it is 0 then
       put 00 before item 2 of it
    else if the length of item 2 of it is 1 then
diff --git a/prebuilt/fetch-libraries.sh b/prebuilt/fetch-libraries.sh
@@ -15,7 +15,7 @@ LIBS_win32=( Thirdparty OpenSSL Curl ICU CEF )
 LIBS_linux=( Thirdparty OpenSSL Curl ICU CEF )
 LIBS_emscripten=( Thirdparty ICU )
 
-SUBPLATFORMS_ios=(iPhoneSimulator10.2 iPhoneSimulator11.2 iPhoneSimulator12.1 iPhoneSimulator13.2 iPhoneSimulator14.4 iPhoneOS10.2 iPhoneOS11.2 iPhoneOS12.1 iPhoneOS13.2 iPhoneOS14.4)
+SUBPLATFORMS_ios=(iPhoneSimulator11.2 iPhoneSimulator12.1 iPhoneSimulator13.2 iPhoneSimulator14.4 iPhoneSimulator14.5 iPhoneOS11.2 iPhoneOS12.1 iPhoneOS13.2 iPhoneOS14.4 iPhoneOS14.5)
 SUBPLATFORMS_win32=(v141_static_debug v141_static_release)
 SUBPLATFORMS_android=(ndk16r15)
 
diff --git a/prebuilt/scripts/ios.inc b/prebuilt/scripts/ios.inc
@@ -68,8 +68,6 @@ else
 fi
 
 # Detect iOS variants
-checkiOS iphonesimulator10.2 8_2_0 iPhoneSimulator 10.2 "i386 x86_64"
-checkiOS iphoneos10.2 8_2_0 iPhoneOS 10.2 "armv7 arm64"
 checkiOS iphonesimulator11.2 9_2_0 iPhoneSimulator 11.2 "x86_64"
 checkiOS iphoneos11.2 9_2_0 iPhoneOS 11.2 "armv7 arm64"
 checkiOS iphonesimulator12.1 10_1_0 iPhoneSimulator 12.1 "x86_64"
@@ -78,3 +76,5 @@ checkiOS iphonesimulator13.2 11_3_0 iPhoneSimulator 13.2 "x86_64"
 checkiOS iphoneos13.2 11_3_0 iPhoneOS 13.2 "armv7 arm64"
 checkiOS iphonesimulator14.4 12_4_0 iPhoneSimulator 14.4 "x86_64"
 checkiOS iphoneos14.4 12_4_0 iPhoneOS 14.4 "armv7 arm64"
+checkiOS iphonesimulator14.5 12_5_0 iPhoneSimulator 14.5 "x86_64"
+checkiOS iphoneos14.5 12_5_0 iPhoneOS 14.5 "armv7 arm64"
diff --git a/tools/setup_xcode_sdks.py b/tools/setup_xcode_sdks.py
@@ -1,8 +1,8 @@
 #!/bin/python
 
 # Update these lists if you need different SDK versions!
-iphoneos_versions = ["14.4", "13.2", "12.1", "11.2", "10.2"]
-iphonesimulator_versions = ["14.4", "13.2", "12.1", "11.2", "10.2"]
+iphoneos_versions = ["14.5", "14.4", "13.2", "12.1", "11.2"]
+iphonesimulator_versions = ["14.5", "14.4", "13.2", "12.1", "11.2"]
 macosx_versions = ["10.9"]
 
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Add support for building apps against iOS 14.5 SDK`