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

Commit eea5be6

Browse files
committed
Added support for Xcode 9.3 / iOS 11.3
1 parent a8f7126 commit eea5be6

8 files changed

Lines changed: 54 additions & 10 deletions

File tree

Installer/package.txt

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -648,6 +648,22 @@ component Runtime.iOS
648648
file ios:iphonesimulator11.2/mobile-disable-ats-template.plist as "DisableATS.plist"
649649
file ios:iphonesimulator11.2/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
650650
file ios:iphonesimulator11.2/fontmap as "fontmap"
651+
into "[[ToolsFolder]]/Runtime/iOS/Simulator-11_3" place
652+
executable ios:iphonesimulator11.3/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphonesimulator8.2/standalone-mobile[[BaseEditionTagLower]].app/standalone-mobile[[BaseEditionTagLower]]
653+
executable ios:iphonesimulator11.3/revsecurity.ios-extension as RevSecurity base ios:iphonesimulator8.2/revsecurity.dylib
654+
executable ios:iphonesimulator11.3/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphonesimulator8.2/revpdfprinter.dylib
655+
executable ios:iphonesimulator11.3/revzip.ios-extension as RevZip base ios:iphonesimulator8.2/revzip.dylib
656+
executable ios:iphonesimulator11.3/revxml.ios-extension as RevXml base ios:iphonesimulator8.2/revxml.dylib
657+
executable ios:iphonesimulator11.3/revdb.ios-extension as RevDb base ios:iphonesimulator8.2/revdb.dylib
658+
executable ios:iphonesimulator11.3/dbsqlite.ios-extension as DbSqlite base ios:iphonesimulator8.2/dbsqlite.dylib
659+
executable ios:iphonesimulator11.3/dbmysql.ios-extension as DbMysql base ios:iphonesimulator8.2/dbmysql.dylib
660+
file ios:iphonesimulator11.3/mobile-template.plist as "Settings.plist"
661+
file ios:iphonesimulator11.3/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
662+
file ios:iphonesimulator11.3/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
663+
file ios:iphonesimulator11.3/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
664+
file ios:iphonesimulator11.3/mobile-disable-ats-template.plist as "DisableATS.plist"
665+
file ios:iphonesimulator11.3/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
666+
file ios:iphonesimulator11.3/fontmap as "fontmap"
651667
into "[[ToolsFolder]]/Runtime/iOS/Device-9_2" place
652668
executable ios:iphoneos9.2/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone
653669
executable ios:iphoneos9.2/revsecurity.ios-extension as RevSecurity
@@ -708,6 +724,26 @@ component Runtime.iOS
708724
file ios:iphoneos11.2/mobile-disable-ats-template.plist as "DisableATS.plist"
709725
file ios:iphoneos11.2/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
710726
file ios:iphoneos11.2/fontmap as "fontmap"
727+
into "[[ToolsFolder]]/Runtime/iOS/Device-11_3" place
728+
executable ios:iphoneos11.3/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphoneos9.2/standalone-mobile[[BaseEditionTagLower]].ios-engine
729+
executable ios:iphoneos11.3/revsecurity.ios-extension as RevSecurity base ios:iphoneos9.2/revsecurity.ios-extension
730+
executable ios:iphoneos11.3/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphoneos9.2/revpdfprinter.ios-extension
731+
executable ios:iphoneos11.3/revzip.ios-extension as RevZip base ios:iphoneos9.2/revzip.ios-extension
732+
executable ios:iphoneos11.3/revxml.ios-extension as RevXml base ios:iphoneos9.2/revxml.ios-extension
733+
executable ios:iphoneos11.3/revdb.ios-extension as RevDb base ios:iphoneos9.2/revdb.ios-extension
734+
executable ios:iphoneos11.3/dbsqlite.ios-extension as DbSqlite base ios:iphoneos9.2/dbsqlite.ios-extension
735+
executable ios:iphoneos11.3/dbmysql.ios-extension as DbMysql base ios:iphoneos9.2/dbmysql.ios-extension
736+
file ios:iphoneos11.3/mobile-device-template.plist as "Settings.plist"
737+
file ios:iphoneos11.3/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
738+
file ios:iphoneos11.3/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
739+
file ios:iphoneos11.3/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
740+
file ios:iphoneos11.3/template-entitlements.xcent as "Entitlements.xcent"
741+
file ios:iphoneos11.3/template-beta-report-entitlement.xcent as "BetaReportEntitlement.xcent"
742+
file ios:iphoneos11.3/template-remote-notification-entitlements.xcent as "RemoteNotificationEntitlements.xcent"
743+
file ios:iphoneos11.3/template-remote-notification-store-entitlements.xcent as "RemoteNotificationStoreEntitlements.xcent"
744+
file ios:iphoneos11.3/mobile-disable-ats-template.plist as "DisableATS.plist"
745+
file ios:iphoneos11.3/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
746+
file ios:iphoneos11.3/fontmap as "fontmap"
711747

712748
////////////////////////////////////////////////////////////////////////////////
713749

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 ?= 9.2 10.2 11.2
29-
IPHONESIMULATOR_VERSIONS ?= 6.1 7.1 8.2 9.2 10.2 11.2
28+
IPHONEOS_VERSIONS ?= 9.2 10.2 11.2 11.3
29+
IPHONESIMULATOR_VERSIONS ?= 6.1 7.1 8.2 9.2 10.2 11.2 11.3
3030

3131
IOS_SDKS ?= \
3232
$(addprefix iphoneos,$(IPHONEOS_VERSIONS)) \

buildbot.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,11 @@
4141
'x86_64-linux-debian7',
4242
'armv6-android-api8',
4343
'universal-mac-macosx10.6', # Minimum deployment target
44+
'universal-ios-iphoneos11.3',
4445
'universal-ios-iphoneos11.2',
4546
'universal-ios-iphoneos10.2',
4647
'universal-ios-iphoneos9.2',
48+
'universal-ios-iphonesimulator11.3',
4749
'universal-ios-iphonesimulator11.2',
4850
'universal-ios-iphonesimulator10.2',
4951
'universal-ios-iphonesimulator9.2',

docs/notes/platforms.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ Currently, the supported versions of Xcode are:
6868
* Xcode 6.2 and 7.2 on Mac OS X 10.10
6969
* Xcode 8.2 on MacOS X 10.11
7070
* Xcode 9.2 on MacOS 10.12 (Note: You need to upgrade to 10.12.6)
71-
* Xcode 9.2 on MacOS 10.13
71+
* Xcode 9.3 on MacOS 10.13 (Note: You need to upgrade to 10.13.2)
7272

7373
It is also possible to set other versions of Xcode, to allow testing on a wider range of iOS simulators. For instance, on OS X 10.10 (Yosemite), you can add *Xcode 5.1* in the *Mobile Support* preferences, to let you test your stack on the *iOS Simulator 7.1*.
7474

@@ -80,6 +80,7 @@ We currently support deployment for the following versions of iOS:
8080
* 9.2
8181
* 10.2
8282
* 11.2
83+
* 11.3
8384

8485
## Android
8586

ide-support/revdeploylibraryios.livecodescript

Lines changed: 7 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 "6.1,7.1,8.2,9.2,10.2,11.2"
21+
return "6.1,7.1,8.2,9.2,10.2,11.2,11.3"
2222
end deployUsableIosSdk
2323

2424
// SN-2015-05-01: Return the pair iOS SDK / Xcode for the current MacOS version
@@ -42,16 +42,19 @@ function deployGetIphoneOSes
4242
else if tMacVersion < 101206 then
4343
put empty into tList[1]
4444
answer error "To use Xcode 9.2, you need to upgrade your Mac to MacOS Sierra 10.12.6"
45+
else if tMacVersion < 101302 then
46+
put empty into tList[1]
47+
answer error "To use Xcode 9.3, you need to upgrade your Mac to MacOS High Sierra 10.13.2"
4548
else
46-
// Xcode 9.2 requires a Mac running Mac OS 10.12.6 or later
47-
put "11.2,9.2" into tList[1]
49+
// Xcode 9.3 requires a Mac running Mac OS 10.13.2 or later
50+
put "11.3,9.3" into tList[1]
4851
end if
4952

5053
return tList
5154
end deployGetIphoneOSes
5255

5356
function deployGetIosMinimumVersions
54-
return "6.0,6.1,7.0,7.1,8.0,8.1,8.2,8.3,8.4,9.0,9.1,9.2,9.3,10.0,10.1,10.2,10.3,11.0,11.1,11.2"
57+
return "6.0,6.1,7.0,7.1,8.0,8.1,8.2,8.3,8.4,9.0,9.1,9.2,9.3,10.0,10.1,10.2,10.3,11.0,11.1,11.2,11.3"
5558
end deployGetIosMinimumVersions
5659

5760
////////////////////////////////////////////////////////////////////////////////

prebuilt/fetch-libraries.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ LIBS_ios=( OpenSSL ICU )
1414
LIBS_win32=( OpenSSL Curl ICU CEF )
1515
LIBS_linux=( OpenSSL Curl ICU CEF )
1616
LIBS_emscripten=( ICU )
17-
SUBPLATFORMS_ios=(iPhoneSimulator6.1 iPhoneSimulator7.1 iPhoneSimulator8.2 iPhoneSimulator9.2 iPhoneSimulator10.2 iPhoneSimulator11.2 iPhoneOS9.2 iPhoneOS10.2 iPhoneOS11.2)
17+
SUBPLATFORMS_ios=(iPhoneSimulator6.1 iPhoneSimulator7.1 iPhoneSimulator8.2 iPhoneSimulator9.2 iPhoneSimulator10.2 iPhoneSimulator11.2 iPhoneSimulator11.3 iPhoneOS9.2 iPhoneOS10.2 iPhoneOS11.2 iPhoneOS11.3)
1818

1919
# Fetch settings
2020
SCRIPT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)

prebuilt/scripts/ios.inc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,3 +48,5 @@ checkiOS 8_2_0 iPhoneSimulator 10.2 "i386 x86_64"
4848
checkiOS 8_2_0 iPhoneOS 10.2 "armv7 arm64"
4949
checkiOS 9_2_0 iPhoneSimulator 11.2 "i386 x86_64"
5050
checkiOS 9_2_0 iPhoneOS 11.2 "armv7 arm64"
51+
checkiOS 9_3_0 iPhoneSimulator 11.3 "i386 x86_64"
52+
checkiOS 9_3_0 iPhoneOS 11.3 "armv7 arm64"

tools/setup_xcode_sdks.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
# Update these lists if you need different SDK versions!
44

5-
iphoneos_versions = ["11.2", "10.2", "9.2"]
6-
iphonesimulator_versions = ["11.2", "10.2", "9.2", "8.2", "7.1", "6.1"]
5+
iphoneos_versions = ["11.3", "11.2", "10.2", "9.2"]
6+
iphonesimulator_versions = ["11.3", "11.2", "10.2", "9.2", "8.2", "7.1", "6.1"]
77
macosx_versions = ["10.8", "10.6"]
88

99
# This tool creates the symlinks required for Xcode builds of LiveCode.

0 commit comments

Comments
 (0)