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

Commit ad9cf23

Browse files
livecodepanoslivecodepanos
committed
Added support for building with Xcode10 / iOS 12 SDK
1 parent 76ae8b1 commit ad9cf23

File tree

8 files changed

+54
-54
lines changed

8 files changed

+54
-54
lines changed

‎Installer/package.txt‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -684,22 +684,22 @@ component Runtime.iOS
684684
file ios:iphonesimulator11.2/mobile-disable-ats-template.plist as "DisableATS.plist"
685685
file ios:iphonesimulator11.2/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
686686
file ios:iphonesimulator11.2/fontmap as "fontmap"
687-
into "[[ToolsFolder]]/Runtime/iOS/Simulator-11_4" place
688-
executable ios:iphonesimulator11.4/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphonesimulator8.2/standalone-mobile[[BaseEditionTagLower]].app/standalone-mobile[[BaseEditionTagLower]]
689-
executable ios:iphonesimulator11.4/revsecurity.ios-extension as RevSecurity base ios:iphonesimulator8.2/revsecurity.dylib
690-
executable ios:iphonesimulator11.4/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphonesimulator8.2/revpdfprinter.dylib
691-
executable ios:iphonesimulator11.4/revzip.ios-extension as RevZip base ios:iphonesimulator8.2/revzip.dylib
692-
executable ios:iphonesimulator11.4/revxml.ios-extension as RevXml base ios:iphonesimulator8.2/revxml.dylib
693-
executable ios:iphonesimulator11.4/revdb.ios-extension as RevDb base ios:iphonesimulator8.2/revdb.dylib
694-
executable ios:iphonesimulator11.4/dbsqlite.ios-extension as DbSqlite base ios:iphonesimulator8.2/dbsqlite.dylib
695-
executable ios:iphonesimulator11.4/dbmysql.ios-extension as DbMysql base ios:iphonesimulator8.2/dbmysql.dylib
696-
file ios:iphonesimulator11.4/mobile-template.plist as "Settings.plist"
697-
file ios:iphonesimulator11.4/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
698-
file ios:iphonesimulator11.4/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
699-
file ios:iphonesimulator11.4/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
700-
file ios:iphonesimulator11.4/mobile-disable-ats-template.plist as "DisableATS.plist"
701-
file ios:iphonesimulator11.4/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
702-
file ios:iphonesimulator11.4/fontmap as "fontmap"
687+
into "[[ToolsFolder]]/Runtime/iOS/Simulator-12_0" place
688+
executable ios:iphonesimulator12.0/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphonesimulator8.2/standalone-mobile[[BaseEditionTagLower]].app/standalone-mobile[[BaseEditionTagLower]]
689+
executable ios:iphonesimulator12.0/revsecurity.ios-extension as RevSecurity base ios:iphonesimulator8.2/revsecurity.dylib
690+
executable ios:iphonesimulator12.0/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphonesimulator8.2/revpdfprinter.dylib
691+
executable ios:iphonesimulator12.0/revzip.ios-extension as RevZip base ios:iphonesimulator8.2/revzip.dylib
692+
executable ios:iphonesimulator12.0/revxml.ios-extension as RevXml base ios:iphonesimulator8.2/revxml.dylib
693+
executable ios:iphonesimulator12.0/revdb.ios-extension as RevDb base ios:iphonesimulator8.2/revdb.dylib
694+
executable ios:iphonesimulator12.0/dbsqlite.ios-extension as DbSqlite base ios:iphonesimulator8.2/dbsqlite.dylib
695+
executable ios:iphonesimulator12.0/dbmysql.ios-extension as DbMysql base ios:iphonesimulator8.2/dbmysql.dylib
696+
file ios:iphonesimulator12.0/mobile-template.plist as "Settings.plist"
697+
file ios:iphonesimulator12.0/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
698+
file ios:iphonesimulator12.0/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
699+
file ios:iphonesimulator12.0/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
700+
file ios:iphonesimulator12.0/mobile-disable-ats-template.plist as "DisableATS.plist"
701+
file ios:iphonesimulator12.0/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
702+
file ios:iphonesimulator12.0/fontmap as "fontmap"
703703
into "[[ToolsFolder]]/Runtime/iOS/Device-9_2" place
704704
executable ios:iphoneos9.2/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone
705705
executable ios:iphoneos9.2/revsecurity.ios-extension as RevSecurity
@@ -760,26 +760,26 @@ component Runtime.iOS
760760
file ios:iphoneos11.2/mobile-disable-ats-template.plist as "DisableATS.plist"
761761
file ios:iphoneos11.2/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
762762
file ios:iphoneos11.2/fontmap as "fontmap"
763-
into "[[ToolsFolder]]/Runtime/iOS/Device-11_4" place
764-
executable ios:iphoneos11.4/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphoneos9.2/standalone-mobile[[BaseEditionTagLower]].ios-engine
765-
executable ios:iphoneos11.4/revsecurity.ios-extension as RevSecurity base ios:iphoneos9.2/revsecurity.ios-extension
766-
executable ios:iphoneos11.4/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphoneos9.2/revpdfprinter.ios-extension
767-
executable ios:iphoneos11.4/revzip.ios-extension as RevZip base ios:iphoneos9.2/revzip.ios-extension
768-
executable ios:iphoneos11.4/revxml.ios-extension as RevXml base ios:iphoneos9.2/revxml.ios-extension
769-
executable ios:iphoneos11.4/revdb.ios-extension as RevDb base ios:iphoneos9.2/revdb.ios-extension
770-
executable ios:iphoneos11.4/dbsqlite.ios-extension as DbSqlite base ios:iphoneos9.2/dbsqlite.ios-extension
771-
executable ios:iphoneos11.4/dbmysql.ios-extension as DbMysql base ios:iphoneos9.2/dbmysql.ios-extension
772-
file ios:iphoneos11.4/mobile-device-template.plist as "Settings.plist"
773-
file ios:iphoneos11.4/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
774-
file ios:iphoneos11.4/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
775-
file ios:iphoneos11.4/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
776-
file ios:iphoneos11.4/template-entitlements.xcent as "Entitlements.xcent"
777-
file ios:iphoneos11.4/template-beta-report-entitlement.xcent as "BetaReportEntitlement.xcent"
778-
file ios:iphoneos11.4/template-remote-notification-entitlements.xcent as "RemoteNotificationEntitlements.xcent"
779-
file ios:iphoneos11.4/template-remote-notification-store-entitlements.xcent as "RemoteNotificationStoreEntitlements.xcent"
780-
file ios:iphoneos11.4/mobile-disable-ats-template.plist as "DisableATS.plist"
781-
file ios:iphoneos11.4/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
782-
file ios:iphoneos11.4/fontmap as "fontmap"
763+
into "[[ToolsFolder]]/Runtime/iOS/Device-12_0" place
764+
executable ios:iphoneos12.0/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphoneos9.2/standalone-mobile[[BaseEditionTagLower]].ios-engine
765+
executable ios:iphoneos12.0/revsecurity.ios-extension as RevSecurity base ios:iphoneos9.2/revsecurity.ios-extension
766+
executable ios:iphoneos12.0/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphoneos9.2/revpdfprinter.ios-extension
767+
executable ios:iphoneos12.0/revzip.ios-extension as RevZip base ios:iphoneos9.2/revzip.ios-extension
768+
executable ios:iphoneos12.0/revxml.ios-extension as RevXml base ios:iphoneos9.2/revxml.ios-extension
769+
executable ios:iphoneos12.0/revdb.ios-extension as RevDb base ios:iphoneos9.2/revdb.ios-extension
770+
executable ios:iphoneos12.0/dbsqlite.ios-extension as DbSqlite base ios:iphoneos9.2/dbsqlite.ios-extension
771+
executable ios:iphoneos12.0/dbmysql.ios-extension as DbMysql base ios:iphoneos9.2/dbmysql.ios-extension
772+
file ios:iphoneos12.0/mobile-device-template.plist as "Settings.plist"
773+
file ios:iphoneos12.0/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
774+
file ios:iphoneos12.0/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
775+
file ios:iphoneos12.0/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
776+
file ios:iphoneos12.0/template-entitlements.xcent as "Entitlements.xcent"
777+
file ios:iphoneos12.0/template-beta-report-entitlement.xcent as "BetaReportEntitlement.xcent"
778+
file ios:iphoneos12.0/template-remote-notification-entitlements.xcent as "RemoteNotificationEntitlements.xcent"
779+
file ios:iphoneos12.0/template-remote-notification-store-entitlements.xcent as "RemoteNotificationStoreEntitlements.xcent"
780+
file ios:iphoneos12.0/mobile-disable-ats-template.plist as "DisableATS.plist"
781+
file ios:iphoneos12.0/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
782+
file ios:iphoneos12.0/fontmap as "fontmap"
783783

784784
////////////////////////////////////////////////////////////////////////////////
785785

‎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 11.4
29-
IPHONESIMULATOR_VERSIONS ?= 8.2 9.2 10.2 11.2 11.4
28+
IPHONEOS_VERSIONS ?= 9.2 10.2 11.2 12.0
29+
IPHONESIMULATOR_VERSIONS ?= 8.2 9.2 10.2 11.2 12.0
3030
SKIP_IPHONESIMULATOR_VERSIONS ?= 6.1 7.1
3131

3232
IOS_SDKS ?= \

‎config.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@
3131
'x86-android-sdk26_ndk16r15',
3232
'x86_64-android-sdk26_ndk16r15',
3333
'universal-mac-macosx10.9', # Minimum deployment target
34-
'universal-ios-iphoneos11.4',
34+
'universal-ios-iphoneos12.0',
3535
'universal-ios-iphoneos11.2',
3636
'universal-ios-iphoneos10.2',
3737
'universal-ios-iphoneos9.2',
38-
'universal-ios-iphonesimulator11.4',
38+
'universal-ios-iphonesimulator12.0',
3939
'universal-ios-iphonesimulator11.2',
4040
'universal-ios-iphonesimulator10.2',
4141
'universal-ios-iphonesimulator9.2',

‎docs/notes-base/platforms.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ Currently, the supported versions of Xcode are:
6060
* Xcode 6.2 and 7.2 on Mac OS X 10.10
6161
* Xcode 8.2 on MacOS X 10.11
6262
* Xcode 9.2 on MacOS 10.12 (Note: You need to upgrade to 10.12.6)
63-
* Xcode 9.4 on MacOS 10.13 (Note: You need to upgrade to 10.13.2)
63+
* Xcode 10.0 on MacOS 10.13 (Note: You need to upgrade to 10.13.4)
6464

6565
It is also possible to set other versions of Xcode, to allow testing
6666
on a wider range of iOS simulators. For instance, on MacOS 10.12
@@ -73,7 +73,7 @@ We currently support deployment for the following versions of iOS:
7373
* 9.2
7474
* 10.2
7575
* 11.2
76-
* 11.4
76+
* 12.0
7777

7878
## Android
7979

@@ -90,8 +90,8 @@ It will run on the following versions of Android:
9090
* 4.4 (KitKat)
9191
* 5.0-5.1 (Lollipop)
9292
* 6.0 (Marshmallow)
93-
* 7.0 (Nougat)
94-
* 8.0 (Oreo)
93+
* 7.x (Nougat)
94+
* 8.x (Oreo)
9595

9696
To enable deployment to Android devices, you need to download the
9797
[Android SDK](https://developer.android.com/sdk/index.html#Other), and

‎ide-support/revdeploylibraryios.livecodescript‎

Lines changed: 5 additions & 5 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 "8.2,9.2,10.2,11.2,11.4"
21+
return "8.2,9.2,10.2,11.2,12.0"
2222
end deployUsableIosSdk
2323

2424
// SN-2015-05-01: Return the pair iOS SDK / Xcode for the current MacOS version
@@ -46,17 +46,17 @@ function deployGetIphoneOSes
4646
put "11.2,9.2" into tList[1]
4747
else if tMacVersion < 101302 then
4848
put empty into tList[1]
49-
answer error "To use Xcode 9.4, you need to upgrade your Mac to MacOS High Sierra 10.13.2"
49+
answer error "To use Xcode 10.0, you need to upgrade your Mac to MacOS High Sierra 10.13.4"
5050
else
51-
// Xcode 9.4 requires a Mac running Mac OS 10.13.2 or later
52-
put "11.4,9.4" into tList[1]
51+
// Xcode 10.0 requires a Mac running Mac OS 10.13.4 or later
52+
put "12.0,10.0" into tList[1]
5353
end if
5454

5555
return tList
5656
end deployGetIphoneOSes
5757

5858
function deployGetIosMinimumVersions
59-
return "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,11.4"
59+
return "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,11.4,12.0"
6060
end deployGetIosMinimumVersions
6161

6262
////////////////////////////////////////////////////////////////////////////////

‎prebuilt/fetch-libraries.sh‎

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

18-
SUBPLATFORMS_ios=(iPhoneSimulator8.2 iPhoneSimulator9.2 iPhoneSimulator10.2 iPhoneSimulator11.2 iPhoneSimulator11.4 iPhoneOS9.2 iPhoneOS10.2 iPhoneOS11.2 iPhoneOS11.4)
18+
SUBPLATFORMS_ios=(iPhoneSimulator8.2 iPhoneSimulator9.2 iPhoneSimulator10.2 iPhoneSimulator11.2 iPhoneSimulator12.0 iPhoneOS9.2 iPhoneOS10.2 iPhoneOS11.2 iPhoneOS12.0)
1919
SUBPLATFORMS_win32=(v140_static_debug v140_static_release)
2020
SUBPLATFORMS_android=(sdk26_ndk16r15)
2121

‎prebuilt/scripts/ios.inc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,5 +75,5 @@ checkiOS iphonesimulator10.2 8_2_0 iPhoneSimulator 10.2 "i386 x86_64"
7575
checkiOS iphoneos10.2 8_2_0 iPhoneOS 10.2 "armv7 arm64"
7676
checkiOS iphonesimulator11.2 9_2_0 iPhoneSimulator 11.2 "i386 x86_64"
7777
checkiOS iphoneos11.2 9_2_0 iPhoneOS 11.2 "armv7 arm64"
78-
checkiOS iphonesimulator11.4 9_4_0 iPhoneSimulator 11.4 "i386 x86_64"
79-
checkiOS iphoneos11.4 9_4_0 iPhoneOS 11.4 "armv7 arm64"
78+
checkiOS iphonesimulator12.0 10_0_0 iPhoneSimulator 12.0 "i386 x86_64"
79+
checkiOS iphoneos12.0 10_0_0 iPhoneOS 12.0 "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 = ["11.4", "11.2", "10.2", "9.2"]
5-
iphonesimulator_versions = ["11.4", "11.2", "10.2","9.2", "8.2"]
4+
iphoneos_versions = ["12.0", "11.2", "10.2", "9.2"]
5+
iphonesimulator_versions = ["12.0", "11.2", "10.2","9.2", "8.2"]
66
macosx_versions = ["10.9"]
77

88

0 commit comments

Comments
 (0)