Added support for building with Xcode9.4 / iOS 11.4 SDK

Installer/package.txt

@@ -684,22 +684,22 @@ component Runtime.iOS
 		file ios:iphonesimulator11.2/mobile-disable-ats-template.plist as "DisableATS.plist"
 		file ios:iphonesimulator11.2/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
 		file ios:iphonesimulator11.2/fontmap as "fontmap"
-	into "[[ToolsFolder]]/Runtime/iOS/Simulator-11_3" place
-		executable ios:iphonesimulator11.3/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphonesimulator8.2/standalone-mobile[[BaseEditionTagLower]].app/standalone-mobile[[BaseEditionTagLower]]
-		executable ios:iphonesimulator11.3/revsecurity.ios-extension as RevSecurity base ios:iphonesimulator8.2/revsecurity.dylib
-		executable ios:iphonesimulator11.3/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphonesimulator8.2/revpdfprinter.dylib
-		executable ios:iphonesimulator11.3/revzip.ios-extension as RevZip base ios:iphonesimulator8.2/revzip.dylib
-		executable ios:iphonesimulator11.3/revxml.ios-extension as RevXml base ios:iphonesimulator8.2/revxml.dylib
-		executable ios:iphonesimulator11.3/revdb.ios-extension as RevDb base ios:iphonesimulator8.2/revdb.dylib
-		executable ios:iphonesimulator11.3/dbsqlite.ios-extension as DbSqlite base ios:iphonesimulator8.2/dbsqlite.dylib
-		executable ios:iphonesimulator11.3/dbmysql.ios-extension as DbMysql base ios:iphonesimulator8.2/dbmysql.dylib
-		file ios:iphonesimulator11.3/mobile-template.plist as "Settings.plist"
-		file ios:iphonesimulator11.3/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
-		file ios:iphonesimulator11.3/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
-		file ios:iphonesimulator11.3/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
-		file ios:iphonesimulator11.3/mobile-disable-ats-template.plist as "DisableATS.plist"
-		file ios:iphonesimulator11.3/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
-		file ios:iphonesimulator11.3/fontmap as "fontmap"
+	into "[[ToolsFolder]]/Runtime/iOS/Simulator-11_4" place
+		executable ios:iphonesimulator11.4/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphonesimulator8.2/standalone-mobile[[BaseEditionTagLower]].app/standalone-mobile[[BaseEditionTagLower]]
+		executable ios:iphonesimulator11.4/revsecurity.ios-extension as RevSecurity base ios:iphonesimulator8.2/revsecurity.dylib
+		executable ios:iphonesimulator11.4/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphonesimulator8.2/revpdfprinter.dylib
+		executable ios:iphonesimulator11.4/revzip.ios-extension as RevZip base ios:iphonesimulator8.2/revzip.dylib
+		executable ios:iphonesimulator11.4/revxml.ios-extension as RevXml base ios:iphonesimulator8.2/revxml.dylib
+		executable ios:iphonesimulator11.4/revdb.ios-extension as RevDb base ios:iphonesimulator8.2/revdb.dylib
+		executable ios:iphonesimulator11.4/dbsqlite.ios-extension as DbSqlite base ios:iphonesimulator8.2/dbsqlite.dylib
+		executable ios:iphonesimulator11.4/dbmysql.ios-extension as DbMysql base ios:iphonesimulator8.2/dbmysql.dylib
+		file ios:iphonesimulator11.4/mobile-template.plist as "Settings.plist"
+		file ios:iphonesimulator11.4/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
+		file ios:iphonesimulator11.4/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
+		file ios:iphonesimulator11.4/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
+		file ios:iphonesimulator11.4/mobile-disable-ats-template.plist as "DisableATS.plist"
+		file ios:iphonesimulator11.4/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
+		file ios:iphonesimulator11.4/fontmap as "fontmap"
 	into "[[ToolsFolder]]/Runtime/iOS/Device-9_2" place
 		executable ios:iphoneos9.2/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone
 		executable ios:iphoneos9.2/revsecurity.ios-extension as RevSecurity
@@ -760,26 +760,26 @@ component Runtime.iOS
 		file ios:iphoneos11.2/mobile-disable-ats-template.plist as "DisableATS.plist"
 		file ios:iphoneos11.2/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
 		file ios:iphoneos11.2/fontmap as "fontmap"
-	into "[[ToolsFolder]]/Runtime/iOS/Device-11_3" place
-		executable ios:iphoneos11.3/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphoneos9.2/standalone-mobile[[BaseEditionTagLower]].ios-engine
-		executable ios:iphoneos11.3/revsecurity.ios-extension as RevSecurity base ios:iphoneos9.2/revsecurity.ios-extension
-		executable ios:iphoneos11.3/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphoneos9.2/revpdfprinter.ios-extension
-		executable ios:iphoneos11.3/revzip.ios-extension as RevZip base ios:iphoneos9.2/revzip.ios-extension
-		executable ios:iphoneos11.3/revxml.ios-extension as RevXml base ios:iphoneos9.2/revxml.ios-extension
-		executable ios:iphoneos11.3/revdb.ios-extension as RevDb base ios:iphoneos9.2/revdb.ios-extension
-		executable ios:iphoneos11.3/dbsqlite.ios-extension as DbSqlite base ios:iphoneos9.2/dbsqlite.ios-extension
-		executable ios:iphoneos11.3/dbmysql.ios-extension as DbMysql base ios:iphoneos9.2/dbmysql.ios-extension
-		file ios:iphoneos11.3/mobile-device-template.plist as "Settings.plist"
-		file ios:iphoneos11.3/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
-		file ios:iphoneos11.3/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
-		file ios:iphoneos11.3/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
-		file ios:iphoneos11.3/template-entitlements.xcent as "Entitlements.xcent"
-		file ios:iphoneos11.3/template-beta-report-entitlement.xcent as "BetaReportEntitlement.xcent"
-		file ios:iphoneos11.3/template-remote-notification-entitlements.xcent as "RemoteNotificationEntitlements.xcent"
-		file ios:iphoneos11.3/template-remote-notification-store-entitlements.xcent as "RemoteNotificationStoreEntitlements.xcent"
-		file ios:iphoneos11.3/mobile-disable-ats-template.plist as "DisableATS.plist"
-		file ios:iphoneos11.3/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
-		file ios:iphoneos11.3/fontmap as "fontmap"
+	into "[[ToolsFolder]]/Runtime/iOS/Device-11_4" place
+		executable ios:iphoneos11.4/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphoneos9.2/standalone-mobile[[BaseEditionTagLower]].ios-engine
+		executable ios:iphoneos11.4/revsecurity.ios-extension as RevSecurity base ios:iphoneos9.2/revsecurity.ios-extension
+		executable ios:iphoneos11.4/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphoneos9.2/revpdfprinter.ios-extension
+		executable ios:iphoneos11.4/revzip.ios-extension as RevZip base ios:iphoneos9.2/revzip.ios-extension
+		executable ios:iphoneos11.4/revxml.ios-extension as RevXml base ios:iphoneos9.2/revxml.ios-extension
+		executable ios:iphoneos11.4/revdb.ios-extension as RevDb base ios:iphoneos9.2/revdb.ios-extension
+		executable ios:iphoneos11.4/dbsqlite.ios-extension as DbSqlite base ios:iphoneos9.2/dbsqlite.ios-extension
+		executable ios:iphoneos11.4/dbmysql.ios-extension as DbMysql base ios:iphoneos9.2/dbmysql.ios-extension
+		file ios:iphoneos11.4/mobile-device-template.plist as "Settings.plist"
+		file ios:iphoneos11.4/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
+		file ios:iphoneos11.4/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
+		file ios:iphoneos11.4/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
+		file ios:iphoneos11.4/template-entitlements.xcent as "Entitlements.xcent"
+		file ios:iphoneos11.4/template-beta-report-entitlement.xcent as "BetaReportEntitlement.xcent"
+		file ios:iphoneos11.4/template-remote-notification-entitlements.xcent as "RemoteNotificationEntitlements.xcent"
+		file ios:iphoneos11.4/template-remote-notification-store-entitlements.xcent as "RemoteNotificationStoreEntitlements.xcent"
+		file ios:iphoneos11.4/mobile-disable-ats-template.plist as "DisableATS.plist"
+		file ios:iphoneos11.4/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
+		file ios:iphoneos11.4/fontmap as "fontmap"
 
 ////////////////////////////////////////////////////////////////////////////////
 

Makefile

@@ -25,8 +25,8 @@ EMMAKE ?= emmake
 
 # Some magic to control which versions of iOS we try to build.  N.b. you may
 # also need to modify the buildbot configuration
-IPHONEOS_VERSIONS ?= 9.2 10.2 11.2 11.3
-IPHONESIMULATOR_VERSIONS ?= 8.2 9.2 10.2 11.2 11.3
+IPHONEOS_VERSIONS ?= 9.2 10.2 11.2 11.4
+IPHONESIMULATOR_VERSIONS ?= 8.2 9.2 10.2 11.2 11.4
 SKIP_IPHONESIMULATOR_VERSIONS ?= 6.1 7.1
 
 IOS_SDKS ?= \

buildbot.py

@@ -42,11 +42,11 @@
     'x86_64-linux-debian8',
     'armv6-android-api9',
     'universal-mac-macosx10.9', # Minimum deployment target
-    'universal-ios-iphoneos11.3',
+    'universal-ios-iphoneos11.4',
     'universal-ios-iphoneos11.2',
     'universal-ios-iphoneos10.2',
     'universal-ios-iphoneos9.2',
-    'universal-ios-iphonesimulator11.3',
+    'universal-ios-iphonesimulator11.4',
     'universal-ios-iphonesimulator11.2',
     'universal-ios-iphonesimulator10.2',
     'universal-ios-iphonesimulator9.2',

docs/notes-base/platforms.md

@@ -60,7 +60,7 @@ Currently, the supported versions of Xcode are:
 * Xcode 6.2 and 7.2 on Mac OS X 10.10
 * Xcode 8.2 on MacOS X 10.11
 * Xcode 9.2 on MacOS 10.12 (Note: You need to upgrade to 10.12.6)
-* Xcode 9.3 on MacOS 10.13 (Note: You need to upgrade to 10.13.2)
+* Xcode 9.4 on MacOS 10.13 (Note: You need to upgrade to 10.13.2)
 
 It is also possible to set other versions of Xcode, to allow testing
 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:
 * 9.2
 * 10.2
 * 11.2
-* 11.3
+* 11.4
 
 ## Android
 

ide-support/revdeploylibraryios.livecodescript

@@ -1,4 +1,4 @@
-script "revDeployLibraryIOS"
+script "revDeployLibraryIOS"
 ////////////////////////////////////////////////////////////////////////////////
 
 local sDeploySimulators
@@ -18,7 +18,7 @@ local sDeviceSDKs
 -- SN-2015-03-24: [[ Bug 15037 ]] Add a consistent, strict list of the
 --  SDKs and device relying on the engines we provide in the shipped version
 function deployUsableIosSdk
-   return "8.2,9.2,10.2,11.2,11.3"
+   return "8.2,9.2,10.2,11.2,11.4"
 end deployUsableIosSdk
 
 // SN-2015-05-01: Return the pair iOS SDK / Xcode for the current MacOS version
@@ -46,17 +46,17 @@ function deployGetIphoneOSes
       put "11.2,9.2" into tList[1]
    else if tMacVersion < 101302 then
       put empty into tList[1]
-      answer error "To use Xcode 9.3, you need to upgrade your Mac to MacOS High Sierra 10.13.2"
+      answer error "To use Xcode 9.4, you need to upgrade your Mac to MacOS High Sierra 10.13.2"
    else
-      // Xcode 9.3 requires a Mac running Mac OS 10.13.2 or later
-      put "11.3,9.3" into tList[1]
+      // Xcode 9.4 requires a Mac running Mac OS 10.13.2 or later
+      put "11.4,9.4" into tList[1]
    end if
 
    return tList
 end deployGetIphoneOSes
 
 function deployGetIosMinimumVersions
-   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"
+   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"
 end deployGetIosMinimumVersions
 
 ////////////////////////////////////////////////////////////////////////////////

prebuilt/fetch-libraries.sh

@@ -15,7 +15,7 @@ LIBS_win32=( OpenSSL Curl ICU CEF )
 LIBS_linux=( OpenSSL Curl ICU CEF )
 LIBS_emscripten=( ICU )
 
-SUBPLATFORMS_ios=(iPhoneSimulator8.2 iPhoneSimulator9.2 iPhoneSimulator10.2 iPhoneSimulator11.2 iPhoneSimulator11.3 iPhoneOS9.2 iPhoneOS10.2 iPhoneOS11.2 iPhoneOS11.3)
+SUBPLATFORMS_ios=(iPhoneSimulator8.2 iPhoneSimulator9.2 iPhoneSimulator10.2 iPhoneSimulator11.2 iPhoneSimulator11.4 iPhoneOS9.2 iPhoneOS10.2 iPhoneOS11.2 iPhoneOS11.4)
 SUBPLATFORMS_win32=(v140_static_debug v140_static_release)
 
 # Fetch settings

prebuilt/scripts/ios.inc

@@ -75,5 +75,5 @@ checkiOS iphonesimulator10.2 8_2_0 iPhoneSimulator 10.2 "i386 x86_64"
 checkiOS iphoneos10.2 8_2_0 iPhoneOS 10.2 "armv7 arm64"
 checkiOS iphonesimulator11.2 9_2_0 iPhoneSimulator 11.2 "i386 x86_64"
 checkiOS iphoneos11.2 9_2_0 iPhoneOS 11.2 "armv7 arm64"
-checkiOS iphonesimulator11.3 9_3_0 iPhoneSimulator 11.3 "i386 x86_64"
-checkiOS iphoneos11.3 9_3_0 iPhoneOS 11.3 "armv7 arm64"
+checkiOS iphonesimulator11.4 9_4_0 iPhoneSimulator 11.4 "i386 x86_64"
+checkiOS iphoneos11.4 9_4_0 iPhoneOS 11.4 "armv7 arm64"

tools/setup_xcode_sdks.py

@@ -1,8 +1,8 @@
 #!/bin/python
 
 # Update these lists if you need different SDK versions!
-iphoneos_versions = ["11.3", "11.2", "10.2", "9.2"]
-iphonesimulator_versions = ["11.3", "11.2", "10.2","9.2", "8.2"]
+iphoneos_versions = ["11.4", "11.2", "10.2", "9.2"]
+iphonesimulator_versions = ["11.4", "11.2", "10.2","9.2", "8.2"]
 macosx_versions = ["10.9"]