Skip to content

Commit 735a712

Browse files
livecodepanoslivecodepanos
committed
Add support for building with iOS 14.5 SDK
This patch updates all the relevant files to support building apps against iOS 14.5 SDK.
1 parent 564d4d5 commit 735a712

9 files changed

Lines changed: 60 additions & 8 deletions

File tree

‎Installer/package.txt‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -705,6 +705,21 @@ component Runtime.iOS
705705
file ios:iphonesimulator14.4/mobile-disable-ats-template.plist as "DisableATS.plist"
706706
file ios:iphonesimulator14.4/fontmap as "fontmap"
707707
file ios:iphonesimulator14.4/template.storyboard as "template.storyboard"
708+
into "[[ToolsFolder]]/Runtime/iOS/Simulator-14_5" place
709+
executable ios:iphonesimulator14.5/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphonesimulator11.2/standalone-mobile[[BaseEditionTagLower]].app/standalone-mobile[[BaseEditionTagLower]]
710+
executable ios:iphonesimulator14.5/revsecurity.ios-extension as RevSecurity base ios:iphonesimulator11.2/revsecurity.dylib
711+
executable ios:iphonesimulator14.5/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphonesimulator11.2/revpdfprinter.dylib
712+
executable ios:iphonesimulator14.5/revzip.ios-extension as RevZip base ios:iphonesimulator11.2/revzip.dylib
713+
executable ios:iphonesimulator14.5/revxml.ios-extension as RevXml base ios:iphonesimulator11.2/revxml.dylib
714+
executable ios:iphonesimulator14.5/revdb.ios-extension as RevDb base ios:iphonesimulator11.2/revdb.dylib
715+
executable ios:iphonesimulator14.5/dbsqlite.ios-extension as DbSqlite base ios:iphonesimulator11.2/dbsqlite.dylib
716+
executable ios:iphonesimulator14.5/dbmysql.ios-extension as DbMysql base ios:iphonesimulator11.2/dbmysql.dylib
717+
file ios:iphonesimulator14.5/mobile-template.plist as "Settings.plist"
718+
file ios:iphonesimulator14.5/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
719+
file ios:iphonesimulator14.5/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
720+
file ios:iphonesimulator14.5/mobile-disable-ats-template.plist as "DisableATS.plist"
721+
file ios:iphonesimulator14.5/fontmap as "fontmap"
722+
file ios:iphonesimulator14.5/template.storyboard as "template.storyboard"
708723
into "[[ToolsFolder]]/Runtime/iOS/Device-11_2" place
709724
executable ios:iphoneos11.2/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone
710725
executable ios:iphoneos11.2/revsecurity.ios-extension as RevSecurity
@@ -781,6 +796,25 @@ component Runtime.iOS
781796
file ios:iphoneos14.4/mobile-disable-ats-template.plist as "DisableATS.plist"
782797
file ios:iphoneos14.4/fontmap as "fontmap"
783798
file ios:iphoneos14.4/template.storyboard as "template.storyboard"
799+
into "[[ToolsFolder]]/Runtime/iOS/Device-14_5" place
800+
executable ios:iphoneos14.5/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphoneos11.2/standalone-mobile[[BaseEditionTagLower]].ios-engine
801+
executable ios:iphoneos14.5/revsecurity.ios-extension as RevSecurity base ios:iphoneos11.2/revsecurity.ios-extension
802+
executable ios:iphoneos14.5/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphoneos11.2/revpdfprinter.ios-extension
803+
executable ios:iphoneos14.5/revzip.ios-extension as RevZip base ios:iphoneos11.2/revzip.ios-extension
804+
executable ios:iphoneos14.5/revxml.ios-extension as RevXml base ios:iphoneos11.2/revxml.ios-extension
805+
executable ios:iphoneos14.5/revdb.ios-extension as RevDb base ios:iphoneos11.2/revdb.ios-extension
806+
executable ios:iphoneos14.5/dbsqlite.ios-extension as DbSqlite base ios:iphoneos11.2/dbsqlite.ios-extension
807+
executable ios:iphoneos14.5/dbmysql.ios-extension as DbMysql base ios:iphoneos11.2/dbmysql.ios-extension
808+
file ios:iphoneos14.5/mobile-device-template.plist as "Settings.plist"
809+
file ios:iphoneos14.5/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
810+
file ios:iphoneos14.5/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
811+
file ios:iphoneos14.5/template-entitlements.xcent as "Entitlements.xcent"
812+
file ios:iphoneos14.5/template-beta-report-entitlement.xcent as "BetaReportEntitlement.xcent"
813+
file ios:iphoneos14.5/template-remote-notification-entitlements.xcent as "RemoteNotificationEntitlements.xcent"
814+
file ios:iphoneos14.5/template-remote-notification-store-entitlements.xcent as "RemoteNotificationStoreEntitlements.xcent"
815+
file ios:iphoneos14.5/mobile-disable-ats-template.plist as "DisableATS.plist"
816+
file ios:iphoneos14.5/fontmap as "fontmap"
817+
file ios:iphoneos14.5/template.storyboard as "template.storyboard"
784818

785819
////////////////////////////////////////////////////////////////////////////////
786820

@@ -955,6 +989,8 @@ component TimeZone
955989
rfolder ios:iphonesimulator13.2/packaged_extensions/com.livecode.library.timezone/code
956990
into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
957991
rfolder ios:iphonesimulator14.4/packaged_extensions/com.livecode.library.timezone/code
992+
into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
993+
rfolder ios:iphonesimulator14.5/packaged_extensions/com.livecode.library.timezone/code
958994
into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
959995
rfolder ios:iphoneos11.2/packaged_extensions/com.livecode.library.timezone/code
960996
into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
@@ -963,6 +999,8 @@ component TimeZone
963999
rfolder ios:iphoneos13.2/packaged_extensions/com.livecode.library.timezone/code
9641000
into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
9651001
rfolder ios:iphoneos14.4/packaged_extensions/com.livecode.library.timezone/code
1002+
into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
1003+
rfolder ios:iphoneos14.5/packaged_extensions/com.livecode.library.timezone/code
9661004
into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
9671005
rfolder win-x86:packaged_extensions/com.livecode.library.timezone/code
9681006
into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ EMMAKE ?= emmake
2525

2626
# Some magic to control which versions of iOS we try to build. N.b. you may
2727
# also need to modify the buildbot configuration
28-
IPHONEOS_VERSIONS ?= 11.2 12.1 13.2 14.4
29-
IPHONESIMULATOR_VERSIONS ?= 11.2 12.1 13.2 14.4
28+
IPHONEOS_VERSIONS ?= 11.2 12.1 13.2 14.4 14.5
29+
IPHONESIMULATOR_VERSIONS ?= 11.2 12.1 13.2 14.4 14.5
3030
SKIP_IPHONEOS_VERSIONS ?= 9.2 10.2
3131
SKIP_IPHONESIMULATOR_VERSIONS ?= 6.1 7.1 8.2 9.2 10.2
3232

‎config.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,12 @@
3131
'x86-android-ndk16r15',
3232
'x86_64-android-ndk16r15',
3333
'universal-mac-macosx10.9', # Minimum deployment target
34+
'universal-ios-iphoneos14.5',
3435
'universal-ios-iphoneos14.4',
3536
'universal-ios-iphoneos13.2',
3637
'universal-ios-iphoneos12.1',
3738
'universal-ios-iphoneos11.2',
39+
'universal-ios-iphonesimulator14.5',
3840
'universal-ios-iphonesimulator14.4',
3941
'universal-ios-iphonesimulator13.2',
4042
'universal-ios-iphonesimulator12.1',

‎docs/notes-base/platforms.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ Currently, the supported versions of Xcode are:
6363
* Xcode 10.1 on MacOS 10.13 (Note: You need to upgrade to 10.13.4)
6464
* Xcode 11.3 on MacOS 10.14 (Note: You need to upgrade to 10.14.4)
6565
* Xcode 12.4 on MacOS 10.15 and above (Note: You need to upgrade to 10.15.4)
66+
* Xcode 12.5 on MacOS 11.0 and above
67+
6668

6769
It is also possible to set other versions of Xcode, to allow testing
6870
on a wider range of iOS simulators. For instance, on MacOS 10.13
@@ -75,6 +77,7 @@ We currently support building against the following versions of the iOS SDK:
7577
* 12.1 (included in Xcode 10.1)
7678
* 13.2 (included in Xcode 11.3)
7779
* 14.4 (included in Xcode 12.4)
80+
* 14.5 (included in Xcode 12.5)
7881

7982
## Android
8083

‎docs/notes/bugfix-23183.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Add support for building apps against iOS 14.5 SDK

‎ide-support/revdeploylibraryios.livecodescript‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ local sDeviceSDKs
1818
-- SN-2015-03-24: [[ Bug 15037 ]] Add a consistent, strict list of the
1919
-- SDKs and device relying on the engines we provide in the shipped version
2020
function deployUsableIosSdk
21-
return "11.2,12.1,13.2,14.4"
21+
return "11.2,12.1,13.2,14.4,14.5"
2222
end deployUsableIosSdk
2323

2424
// SN-2015-05-01: Return the pair iOS SDK / Xcode for the current MacOS version
@@ -48,9 +48,11 @@ function deployGetIphoneOSes
4848
else if tMacVersion < 101504 then
4949
put empty into tList[1]
5050
answer error "To use Xcode 12.4, you need to upgrade your Mac to MacOS Catalina 10.15.4"
51-
else
52-
// Xcode 12.4 requires a Mac running Mac OS 10.15.4 or later
51+
else if tMacVersion < 110000 then
5352
put "14.4,12.4,14.4" into tList[1]
53+
else
54+
// Xcode 12.5 requires a Mac running Mac OS 11.0 or later
55+
put "14.5,12.5,14.5" into tList[1]
5456
end if
5557

5658
return tList
@@ -697,6 +699,10 @@ end deployIsValidSDK
697699
function deploySanitizeSystemVersion
698700
set the itemDel to "."
699701
get the systemVersion
702+
// TODO: Remove this workaround once bug 22887 is fixed
703+
if it is "10.16.0" then
704+
get shell("sw_vers -productVersion")
705+
end if
700706
if the length of item 2 of it is 0 then
701707
put 00 before item 2 of it
702708
else if the length of item 2 of it is 1 then

‎prebuilt/fetch-libraries.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ LIBS_win32=( Thirdparty OpenSSL Curl ICU CEF )
1515
LIBS_linux=( Thirdparty OpenSSL Curl ICU CEF )
1616
LIBS_emscripten=( Thirdparty ICU )
1717

18-
SUBPLATFORMS_ios=(iPhoneSimulator11.2 iPhoneSimulator12.1 iPhoneSimulator13.2 iPhoneSimulator14.4 iPhoneOS11.2 iPhoneOS12.1 iPhoneOS13.2 iPhoneOS14.4)
18+
SUBPLATFORMS_ios=(iPhoneSimulator11.2 iPhoneSimulator12.1 iPhoneSimulator13.2 iPhoneSimulator14.4 iPhoneSimulator14.5 iPhoneOS11.2 iPhoneOS12.1 iPhoneOS13.2 iPhoneOS14.4 iPhoneOS14.5)
1919
SUBPLATFORMS_win32=(v141_static_debug v141_static_release)
2020
SUBPLATFORMS_android=(ndk16r15)
2121

‎prebuilt/scripts/ios.inc‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,3 +76,5 @@ checkiOS iphonesimulator13.2 11_3_0 iPhoneSimulator 13.2 "x86_64"
7676
checkiOS iphoneos13.2 11_3_0 iPhoneOS 13.2 "armv7 arm64"
7777
checkiOS iphonesimulator14.4 12_4_0 iPhoneSimulator 14.4 "x86_64"
7878
checkiOS iphoneos14.4 12_4_0 iPhoneOS 14.4 "armv7 arm64"
79+
checkiOS iphonesimulator14.5 12_5_0 iPhoneSimulator 14.5 "x86_64"
80+
checkiOS iphoneos14.5 12_5_0 iPhoneOS 14.5 "armv7 arm64"

‎tools/setup_xcode_sdks.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/bin/python
22

33
# Update these lists if you need different SDK versions!
4-
iphoneos_versions = ["14.4", "13.2", "12.1", "11.2"]
5-
iphonesimulator_versions = ["14.4", "13.2", "12.1", "11.2"]
4+
iphoneos_versions = ["14.5", "14.4", "13.2", "12.1", "11.2"]
5+
iphonesimulator_versions = ["14.5", "14.4", "13.2", "12.1", "11.2"]
66
macosx_versions = ["10.9"]
77

88

0 commit comments

Comments
 (0)