Skip to content

Commit 3c0042a

Browse files
livecodepanoslivecodepanos
committed
[[ Bug 23064 ]] Add support for building apps against iOS 14.3 SDK
This patch updates all the relevant files to support building apps against iOS 14.3 SDK.
1 parent f0d9c53 commit 3c0042a

File tree

9 files changed

+52
-51
lines changed

9 files changed

+52
-51
lines changed

‎Installer/package.txt‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -705,21 +705,21 @@ component Runtime.iOS
705705
file ios:iphonesimulator13.2/mobile-disable-ats-template.plist as "DisableATS.plist"
706706
file ios:iphonesimulator13.2/fontmap as "fontmap"
707707
file ios:iphonesimulator13.2/template.storyboard as "template.storyboard"
708-
into "[[ToolsFolder]]/Runtime/iOS/Simulator-14_1" place
709-
executable ios:iphonesimulator14.1/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphonesimulator10.2/standalone-mobile[[BaseEditionTagLower]].app/standalone-mobile[[BaseEditionTagLower]]
710-
executable ios:iphonesimulator14.1/revsecurity.ios-extension as RevSecurity base ios:iphonesimulator10.2/revsecurity.dylib
711-
executable ios:iphonesimulator14.1/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphonesimulator10.2/revpdfprinter.dylib
712-
executable ios:iphonesimulator14.1/revzip.ios-extension as RevZip base ios:iphonesimulator10.2/revzip.dylib
713-
executable ios:iphonesimulator14.1/revxml.ios-extension as RevXml base ios:iphonesimulator10.2/revxml.dylib
714-
executable ios:iphonesimulator14.1/revdb.ios-extension as RevDb base ios:iphonesimulator10.2/revdb.dylib
715-
executable ios:iphonesimulator14.1/dbsqlite.ios-extension as DbSqlite base ios:iphonesimulator10.2/dbsqlite.dylib
716-
executable ios:iphonesimulator14.1/dbmysql.ios-extension as DbMysql base ios:iphonesimulator10.2/dbmysql.dylib
717-
file ios:iphonesimulator14.1/mobile-template.plist as "Settings.plist"
718-
file ios:iphonesimulator14.1/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
719-
file ios:iphonesimulator14.1/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
720-
file ios:iphonesimulator14.1/mobile-disable-ats-template.plist as "DisableATS.plist"
721-
file ios:iphonesimulator14.1/fontmap as "fontmap"
722-
file ios:iphonesimulator14.1/template.storyboard as "template.storyboard"
708+
into "[[ToolsFolder]]/Runtime/iOS/Simulator-14_3" place
709+
executable ios:iphonesimulator14.3/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphonesimulator10.2/standalone-mobile[[BaseEditionTagLower]].app/standalone-mobile[[BaseEditionTagLower]]
710+
executable ios:iphonesimulator14.3/revsecurity.ios-extension as RevSecurity base ios:iphonesimulator10.2/revsecurity.dylib
711+
executable ios:iphonesimulator14.3/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphonesimulator10.2/revpdfprinter.dylib
712+
executable ios:iphonesimulator14.3/revzip.ios-extension as RevZip base ios:iphonesimulator10.2/revzip.dylib
713+
executable ios:iphonesimulator14.3/revxml.ios-extension as RevXml base ios:iphonesimulator10.2/revxml.dylib
714+
executable ios:iphonesimulator14.3/revdb.ios-extension as RevDb base ios:iphonesimulator10.2/revdb.dylib
715+
executable ios:iphonesimulator14.3/dbsqlite.ios-extension as DbSqlite base ios:iphonesimulator10.2/dbsqlite.dylib
716+
executable ios:iphonesimulator14.3/dbmysql.ios-extension as DbMysql base ios:iphonesimulator10.2/dbmysql.dylib
717+
file ios:iphonesimulator14.3/mobile-template.plist as "Settings.plist"
718+
file ios:iphonesimulator14.3/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
719+
file ios:iphonesimulator14.3/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
720+
file ios:iphonesimulator14.3/mobile-disable-ats-template.plist as "DisableATS.plist"
721+
file ios:iphonesimulator14.3/fontmap as "fontmap"
722+
file ios:iphonesimulator14.3/template.storyboard as "template.storyboard"
723723
into "[[ToolsFolder]]/Runtime/iOS/Device-10_2" place
724724
executable ios:iphoneos10.2/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone
725725
executable ios:iphoneos10.2/revsecurity.ios-extension as RevSecurity
@@ -796,25 +796,25 @@ component Runtime.iOS
796796
file ios:iphoneos13.2/mobile-disable-ats-template.plist as "DisableATS.plist"
797797
file ios:iphoneos13.2/fontmap as "fontmap"
798798
file ios:iphoneos13.2/template.storyboard as "template.storyboard"
799-
into "[[ToolsFolder]]/Runtime/iOS/Device-14_1" place
800-
executable ios:iphoneos14.1/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphoneos10.2/standalone-mobile[[BaseEditionTagLower]].ios-engine
801-
executable ios:iphoneos14.1/revsecurity.ios-extension as RevSecurity base ios:iphoneos10.2/revsecurity.ios-extension
802-
executable ios:iphoneos14.1/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphoneos10.2/revpdfprinter.ios-extension
803-
executable ios:iphoneos14.1/revzip.ios-extension as RevZip base ios:iphoneos10.2/revzip.ios-extension
804-
executable ios:iphoneos14.1/revxml.ios-extension as RevXml base ios:iphoneos10.2/revxml.ios-extension
805-
executable ios:iphoneos14.1/revdb.ios-extension as RevDb base ios:iphoneos10.2/revdb.ios-extension
806-
executable ios:iphoneos14.1/dbsqlite.ios-extension as DbSqlite base ios:iphoneos10.2/dbsqlite.ios-extension
807-
executable ios:iphoneos14.1/dbmysql.ios-extension as DbMysql base ios:iphoneos10.2/dbmysql.ios-extension
808-
file ios:iphoneos14.1/mobile-device-template.plist as "Settings.plist"
809-
file ios:iphoneos14.1/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
810-
file ios:iphoneos14.1/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
811-
file ios:iphoneos14.1/template-entitlements.xcent as "Entitlements.xcent"
812-
file ios:iphoneos14.1/template-beta-report-entitlement.xcent as "BetaReportEntitlement.xcent"
813-
file ios:iphoneos14.1/template-remote-notification-entitlements.xcent as "RemoteNotificationEntitlements.xcent"
814-
file ios:iphoneos14.1/template-remote-notification-store-entitlements.xcent as "RemoteNotificationStoreEntitlements.xcent"
815-
file ios:iphoneos14.1/mobile-disable-ats-template.plist as "DisableATS.plist"
816-
file ios:iphoneos14.1/fontmap as "fontmap"
817-
file ios:iphoneos14.1/template.storyboard as "template.storyboard"
799+
into "[[ToolsFolder]]/Runtime/iOS/Device-14_3" place
800+
executable ios:iphoneos14.3/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphoneos10.2/standalone-mobile[[BaseEditionTagLower]].ios-engine
801+
executable ios:iphoneos14.3/revsecurity.ios-extension as RevSecurity base ios:iphoneos10.2/revsecurity.ios-extension
802+
executable ios:iphoneos14.3/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphoneos10.2/revpdfprinter.ios-extension
803+
executable ios:iphoneos14.3/revzip.ios-extension as RevZip base ios:iphoneos10.2/revzip.ios-extension
804+
executable ios:iphoneos14.3/revxml.ios-extension as RevXml base ios:iphoneos10.2/revxml.ios-extension
805+
executable ios:iphoneos14.3/revdb.ios-extension as RevDb base ios:iphoneos10.2/revdb.ios-extension
806+
executable ios:iphoneos14.3/dbsqlite.ios-extension as DbSqlite base ios:iphoneos10.2/dbsqlite.ios-extension
807+
executable ios:iphoneos14.3/dbmysql.ios-extension as DbMysql base ios:iphoneos10.2/dbmysql.ios-extension
808+
file ios:iphoneos14.3/mobile-device-template.plist as "Settings.plist"
809+
file ios:iphoneos14.3/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
810+
file ios:iphoneos14.3/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
811+
file ios:iphoneos14.3/template-entitlements.xcent as "Entitlements.xcent"
812+
file ios:iphoneos14.3/template-beta-report-entitlement.xcent as "BetaReportEntitlement.xcent"
813+
file ios:iphoneos14.3/template-remote-notification-entitlements.xcent as "RemoteNotificationEntitlements.xcent"
814+
file ios:iphoneos14.3/template-remote-notification-store-entitlements.xcent as "RemoteNotificationStoreEntitlements.xcent"
815+
file ios:iphoneos14.3/mobile-disable-ats-template.plist as "DisableATS.plist"
816+
file ios:iphoneos14.3/fontmap as "fontmap"
817+
file ios:iphoneos14.3/template.storyboard as "template.storyboard"
818818

819819
////////////////////////////////////////////////////////////////////////////////
820820

@@ -990,7 +990,7 @@ component TimeZone
990990
into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
991991
rfolder ios:iphonesimulator13.2/packaged_extensions/com.livecode.library.timezone/code
992992
into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
993-
rfolder ios:iphonesimulator14.1/packaged_extensions/com.livecode.library.timezone/code
993+
rfolder ios:iphonesimulator14.3/packaged_extensions/com.livecode.library.timezone/code
994994
into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
995995
rfolder ios:iphoneos10.2/packaged_extensions/com.livecode.library.timezone/code
996996
into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
@@ -1000,7 +1000,7 @@ component TimeZone
10001000
into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
10011001
rfolder ios:iphoneos13.2/packaged_extensions/com.livecode.library.timezone/code
10021002
into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
1003-
rfolder ios:iphoneos14.1/packaged_extensions/com.livecode.library.timezone/code
1003+
rfolder ios:iphoneos14.3/packaged_extensions/com.livecode.library.timezone/code
10041004
into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
10051005
rfolder win-x86:packaged_extensions/com.livecode.library.timezone/code
10061006
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 ?= 10.2 11.2 12.1 13.2 14.1
29-
IPHONESIMULATOR_VERSIONS ?= 10.2 11.2 12.1 13.2 14.1
28+
IPHONEOS_VERSIONS ?= 10.2 11.2 12.1 13.2 14.3
29+
IPHONESIMULATOR_VERSIONS ?= 10.2 11.2 12.1 13.2 14.3
3030
SKIP_IPHONEOS_VERSIONS ?= 9.2
3131
SKIP_IPHONESIMULATOR_VERSIONS ?= 6.1 7.1 8.2 9.2
3232

‎config.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@
3131
'x86-android-ndk16r15',
3232
'x86_64-android-ndk16r15',
3333
'universal-mac-macosx10.9', # Minimum deployment target
34-
'universal-ios-iphoneos14.1',
34+
'universal-ios-iphoneos14.3',
3535
'universal-ios-iphoneos13.2',
3636
'universal-ios-iphoneos12.1',
3737
'universal-ios-iphoneos11.2',
3838
'universal-ios-iphoneos10.2',
39-
'universal-ios-iphonesimulator14.1',
39+
'universal-ios-iphonesimulator14.3',
4040
'universal-ios-iphonesimulator13.2',
4141
'universal-ios-iphonesimulator12.1',
4242
'universal-ios-iphonesimulator11.2',

‎docs/notes-base/platforms.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ Currently, the supported versions of Xcode are:
6363
* Xcode 9.2 on MacOS 10.12 (Note: You need to upgrade to 10.12.6)
6464
* Xcode 10.1 on MacOS 10.13 (Note: You need to upgrade to 10.13.4)
6565
* Xcode 11.3 on MacOS 10.14 (Note: You need to upgrade to 10.14.4)
66-
* Xcode 12.1 on MacOS 10.15 (Note: You need to upgrade to 10.15.4)
66+
* Xcode 12.3 on MacOS 10.15 and above (Note: You need to upgrade to 10.15.4)
6767

6868
It is also possible to set other versions of Xcode, to allow testing
6969
on a wider range of iOS simulators. For instance, on MacOS 10.12
@@ -76,7 +76,7 @@ We currently support building against the following versions of the iOS SDK:
7676
* 11.2 (included in Xcode 9.2)
7777
* 12.1 (included in Xcode 10.1)
7878
* 13.2 (included in Xcode 11.3)
79-
* 14.1 (included in Xcode 12.1)
79+
* 14.3 (included in Xcode 12.3)
8080

8181
## Android
8282

‎docs/notes/bugfix-23064.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.3 SDK

‎ide-support/revdeploylibraryios.livecodescript‎

Lines changed: 4 additions & 4 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 "10.2,11.2,12.1,13.2,14.1"
21+
return "10.2,11.2,12.1,13.2,14.3"
2222
end deployUsableIosSdk
2323

2424
// SN-2015-05-01: Return the pair iOS SDK / Xcode for the current MacOS version
@@ -49,10 +49,10 @@ function deployGetIphoneOSes
4949
put "13.2,11.3,13.3" into tList[1]
5050
else if tMacVersion < 101504 then
5151
put empty into tList[1]
52-
answer error "To use Xcode 12.1, you need to upgrade your Mac to MacOS Catalina 10.15.4"
52+
answer error "To use Xcode 12.3, you need to upgrade your Mac to MacOS Catalina 10.15.4"
5353
else
54-
// Xcode 12.1 requires a Mac running Mac OS 10.15.4 or later
55-
put "14.1,12.1,14.1" into tList[1]
54+
// Xcode 12.3 requires a Mac running Mac OS 10.15.4 or later
55+
put "14.3,12.3,14.3" into tList[1]
5656
end if
5757

5858
return tList

‎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=(iPhoneSimulator10.2 iPhoneSimulator11.2 iPhoneSimulator12.1 iPhoneSimulator13.2 iPhoneSimulator14.1 iPhoneOS10.2 iPhoneOS11.2 iPhoneOS12.1 iPhoneOS13.2 iPhoneOS14.1)
18+
SUBPLATFORMS_ios=(iPhoneSimulator10.2 iPhoneSimulator11.2 iPhoneSimulator12.1 iPhoneSimulator13.2 iPhoneSimulator14.3 iPhoneOS10.2 iPhoneOS11.2 iPhoneOS12.1 iPhoneOS13.2 iPhoneOS14.3)
1919
SUBPLATFORMS_win32=(v141_static_debug v141_static_release)
2020
SUBPLATFORMS_android=(ndk16r15)
2121

‎prebuilt/scripts/ios.inc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,5 +76,5 @@ checkiOS iphonesimulator12.1 10_1_0 iPhoneSimulator 12.1 "x86_64"
7676
checkiOS iphoneos12.1 10_1_0 iPhoneOS 12.1 "armv7 arm64"
7777
checkiOS iphonesimulator13.2 11_3_0 iPhoneSimulator 13.2 "x86_64"
7878
checkiOS iphoneos13.2 11_3_0 iPhoneOS 13.2 "armv7 arm64"
79-
checkiOS iphonesimulator14.1 12_1_0 iPhoneSimulator 14.1 "x86_64"
80-
checkiOS iphoneos14.1 12_1_0 iPhoneOS 14.1 "armv7 arm64"
79+
checkiOS iphonesimulator14.3 12_3_0 iPhoneSimulator 14.3 "x86_64"
80+
checkiOS iphoneos14.3 12_3_0 iPhoneOS 14.3 "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.1", "13.2", "12.1", "11.2", "10.2"]
5-
iphonesimulator_versions = ["14.1", "13.2", "12.1", "11.2", "10.2"]
4+
iphoneos_versions = ["14.3", "13.2", "12.1", "11.2", "10.2"]
5+
iphonesimulator_versions = ["14.3", "13.2", "12.1", "11.2", "10.2"]
66
macosx_versions = ["10.9"]
77

88

0 commit comments

Comments
 (0)