Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

Commit 02bee71

Browse files
livecodepanoslivecodepanos
committed
Support building with Xcode 11.4 / iOS 13.4 SDK
1 parent f670ed5 commit 02bee71

File tree

8 files changed

+64
-13
lines changed

8 files changed

+64
-13
lines changed

‎Installer/package.txt‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -709,6 +709,22 @@ component Runtime.iOS
709709
file ios:iphonesimulator13.2/mobile-disable-ats-template.plist as "DisableATS.plist"
710710
file ios:iphonesimulator13.2/[email protected] as "Default4InchSplash.png" base ios:[email protected]
711711
file ios:iphonesimulator13.2/fontmap as "fontmap"
712+
into "[[ToolsFolder]]/Runtime/iOS/Simulator-13_4" place
713+
executable ios:iphonesimulator13.4/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphonesimulator10.2/standalone-mobile[[BaseEditionTagLower]].app/standalone-mobile[[BaseEditionTagLower]]
714+
executable ios:iphonesimulator13.4/revsecurity.ios-extension as RevSecurity base ios:iphonesimulator10.2/revsecurity.dylib
715+
executable ios:iphonesimulator13.4/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphonesimulator10.2/revpdfprinter.dylib
716+
executable ios:iphonesimulator13.4/revzip.ios-extension as RevZip base ios:iphonesimulator10.2/revzip.dylib
717+
executable ios:iphonesimulator13.4/revxml.ios-extension as RevXml base ios:iphonesimulator10.2/revxml.dylib
718+
executable ios:iphonesimulator13.4/revdb.ios-extension as RevDb base ios:iphonesimulator10.2/revdb.dylib
719+
executable ios:iphonesimulator13.4/dbsqlite.ios-extension as DbSqlite base ios:iphonesimulator10.2/dbsqlite.dylib
720+
executable ios:iphonesimulator13.4/dbmysql.ios-extension as DbMysql base ios:iphonesimulator10.2/dbmysql.dylib
721+
file ios:iphonesimulator13.4/mobile-template.plist as "Settings.plist"
722+
file ios:iphonesimulator13.4/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
723+
file ios:iphonesimulator13.4/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
724+
file ios:iphonesimulator13.4/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
725+
file ios:iphonesimulator13.4/mobile-disable-ats-template.plist as "DisableATS.plist"
726+
file ios:iphonesimulator13.4/[email protected] as "Default4InchSplash.png" base ios:[email protected]
727+
file ios:iphonesimulator13.4/fontmap as "fontmap"
712728
into "[[ToolsFolder]]/Runtime/iOS/Device-10_2" place
713729
executable ios:iphoneos10.2/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone
714730
executable ios:iphoneos10.2/revsecurity.ios-extension as RevSecurity
@@ -789,6 +805,26 @@ component Runtime.iOS
789805
file ios:iphoneos13.2/mobile-disable-ats-template.plist as "DisableATS.plist"
790806
file ios:iphoneos13.2/[email protected] as "Default4InchSplash.png" base ios:[email protected]
791807
file ios:iphoneos13.2/fontmap as "fontmap"
808+
into "[[ToolsFolder]]/Runtime/iOS/Device-13_4" place
809+
executable ios:iphoneos13.4/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphoneos10.2/standalone-mobile[[BaseEditionTagLower]].ios-engine
810+
executable ios:iphoneos13.4/revsecurity.ios-extension as RevSecurity base ios:iphoneos10.2/revsecurity.ios-extension
811+
executable ios:iphoneos13.4/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphoneos10.2/revpdfprinter.ios-extension
812+
executable ios:iphoneos13.4/revzip.ios-extension as RevZip base ios:iphoneos10.2/revzip.ios-extension
813+
executable ios:iphoneos13.4/revxml.ios-extension as RevXml base ios:iphoneos10.2/revxml.ios-extension
814+
executable ios:iphoneos13.4/revdb.ios-extension as RevDb base ios:iphoneos10.2/revdb.ios-extension
815+
executable ios:iphoneos13.4/dbsqlite.ios-extension as DbSqlite base ios:iphoneos10.2/dbsqlite.ios-extension
816+
executable ios:iphoneos13.4/dbmysql.ios-extension as DbMysql base ios:iphoneos10.2/dbmysql.ios-extension
817+
file ios:iphoneos13.4/mobile-device-template.plist as "Settings.plist"
818+
file ios:iphoneos13.4/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
819+
file ios:iphoneos13.4/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
820+
file ios:iphoneos13.4/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
821+
file ios:iphoneos13.4/template-entitlements.xcent as "Entitlements.xcent"
822+
file ios:iphoneos13.4/template-beta-report-entitlement.xcent as "BetaReportEntitlement.xcent"
823+
file ios:iphoneos13.4/template-remote-notification-entitlements.xcent as "RemoteNotificationEntitlements.xcent"
824+
file ios:iphoneos13.4/template-remote-notification-store-entitlements.xcent as "RemoteNotificationStoreEntitlements.xcent"
825+
file ios:iphoneos13.4/mobile-disable-ats-template.plist as "DisableATS.plist"
826+
file ios:iphoneos13.4/[email protected] as "Default4InchSplash.png" base ios:[email protected]
827+
file ios:iphoneos13.4/fontmap as "fontmap"
792828

793829
////////////////////////////////////////////////////////////////////////////////
794830

@@ -963,6 +999,8 @@ component TimeZone
963999
rfolder ios:iphonesimulator12.1/packaged_extensions/com.livecode.library.timezone/code
9641000
into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
9651001
rfolder ios:iphonesimulator13.2/packaged_extensions/com.livecode.library.timezone/code
1002+
into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
1003+
rfolder ios:iphonesimulator13.4/packaged_extensions/com.livecode.library.timezone/code
9661004
into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
9671005
rfolder ios:iphoneos10.2/packaged_extensions/com.livecode.library.timezone/code
9681006
into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
@@ -971,6 +1009,8 @@ component TimeZone
9711009
rfolder ios:iphoneos12.1/packaged_extensions/com.livecode.library.timezone/code
9721010
into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
9731011
rfolder ios:iphoneos13.2/packaged_extensions/com.livecode.library.timezone/code
1012+
into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
1013+
rfolder ios:iphoneos13.4/packaged_extensions/com.livecode.library.timezone/code
9741014
into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
9751015
rfolder win-x86:packaged_extensions/com.livecode.library.timezone/code
9761016
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
29-
IPHONESIMULATOR_VERSIONS ?= 10.2 11.2 12.1 13.2
28+
IPHONEOS_VERSIONS ?= 10.2 11.2 12.1 13.2 13.4
29+
IPHONESIMULATOR_VERSIONS ?= 10.2 11.2 12.1 13.2 13.4
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 & 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-iphoneos13.4',
3435
'universal-ios-iphoneos13.2',
3536
'universal-ios-iphoneos12.1',
3637
'universal-ios-iphoneos11.2',
3738
'universal-ios-iphoneos10.2',
39+
'universal-ios-iphonesimulator13.4',
3840
'universal-ios-iphonesimulator13.2',
3941
'universal-ios-iphonesimulator12.1',
4042
'universal-ios-iphonesimulator11.2',

‎docs/notes-base/platforms.md‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,18 +61,20 @@ Currently, the supported versions of Xcode are:
6161
* Xcode 9.2 on MacOS 10.12 (Note: You need to upgrade to 10.12.6)
6262
* Xcode 10.1 on MacOS 10.13 (Note: You need to upgrade to 10.13.4)
6363
* Xcode 11.3 on MacOS 10.14 (Note: You need to upgrade to 10.14.4)
64+
* Xcode 11.4 on MacOS 10.15 (Note: You need to upgrade to 10.15.2)
6465

6566
It is also possible to set other versions of Xcode, to allow testing
6667
on a wider range of iOS simulators. For instance, on MacOS 10.12
6768
(Sierra), you can add *Xcode 8.2* in the *Mobile Support* preferences,
6869
to let you test your stack on the *iOS Simulator 10.2*.
6970

70-
We currently support deployment for the following versions of iOS:
71+
We currently support building against the following versions of the iOS SDK:
7172

72-
* 10.2
73-
* 11.2
74-
* 12.1
75-
* 13.2
73+
* 10.2 (included in Xcode 8.2)
74+
* 11.2 (included in Xcode 9.2)
75+
* 12.1 (included in Xcode 10.1)
76+
* 13.2 (included in Xcode 11.3)
77+
* 13.4 (included in Xcode 11.4)
7678

7779
## Android
7880

‎ide-support/revdeploylibraryios.livecodescript‎

Lines changed: 8 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 "10.2,11.2,12.1,13.2"
21+
return "10.2,11.2,12.1,13.2,13.4"
2222
end deployUsableIosSdk
2323

2424
// SN-2015-05-01: Return the pair iOS SDK / Xcode for the current MacOS version
@@ -45,9 +45,14 @@ function deployGetIphoneOSes
4545
else if tMacVersion < 101404 then
4646
put empty into tList[1]
4747
answer error "To use Xcode 11.3, you need to upgrade your Mac to MacOS Mojave 10.14.4"
48-
else
49-
// Xcode 11.3 requires a Mac running Mac OS 10.14.4 or later
48+
else if tMacVersion < 101500 then
5049
put "13.2,11.3,13.3" into tList[1]
50+
else if tMacVersion < 101502 then
51+
put empty into tList[1]
52+
answer error "To use Xcode 11.4, you need to upgrade your Mac to MacOS Catalina 10.15.2"
53+
else
54+
// Xcode 11.4 requires a Mac running Mac OS 10.15.2 or later
55+
put "13.4,11.4,13.4" into tList[1]
5156
end if
5257

5358
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 iPhoneOS10.2 iPhoneOS11.2 iPhoneOS12.1 iPhoneOS13.2)
18+
SUBPLATFORMS_ios=(iPhoneSimulator10.2 iPhoneSimulator11.2 iPhoneSimulator12.1 iPhoneSimulator13.2 iPhoneSimulator13.4 iPhoneOS10.2 iPhoneOS11.2 iPhoneOS12.1 iPhoneOS13.2 iPhoneOS13.4)
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 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 iphonesimulator13.4 11_4_0 iPhoneSimulator 13.4 "x86_64"
80+
checkiOS iphoneos13.4 11_4_0 iPhoneOS 13.4 "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 = ["13.2", "12.1", "11.2", "10.2"]
5-
iphonesimulator_versions = ["13.2", "12.1", "11.2", "10.2"]
4+
iphoneos_versions = ["13.4", "13.2", "12.1", "11.2", "10.2"]
5+
iphonesimulator_versions = ["13.4", "13.2", "12.1", "11.2", "10.2"]
66
macosx_versions = ["10.9"]
77

88

0 commit comments

Comments
 (0)