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

Merge develop 9.5 26.09.2019 #7180

Merged
livecodepanos merged 3 commits into from
Sep 26, 2019
Merged

Merge develop 9.5 26.09.2019 #7180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0305030
Added support for building with Xcode 11.1 / iOS 13.1 SDK
livecodepanos Sep 25, 2019
6984ad1
Merge pull request #7178 from livecodepanos/ios13.1
livecodepanos Sep 25, 2019
2f98f1e
Merge remote-tracking branch 'upstream/develop-9.5' into merge-develo…
livecodepanos Sep 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 36 additions & 36 deletions Installer/package.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -725,21 +725,21 @@ component Runtime.iOS
file ios:iphonesimulator12.1/[email protected] as "Default4InchSplash.png" base ios:[email protected]
file ios:iphonesimulator12.1/fontmap as "fontmap"
into "[[ToolsFolder]]/Runtime/iOS/Simulator-13_0" place
executable ios:iphonesimulator13.0/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphonesimulator8.2/standalone-mobile[[BaseEditionTagLower]].app/standalone-mobile[[BaseEditionTagLower]]
executable ios:iphonesimulator13.0/revsecurity.ios-extension as RevSecurity base ios:iphonesimulator8.2/revsecurity.dylib
executable ios:iphonesimulator13.0/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphonesimulator8.2/revpdfprinter.dylib
executable ios:iphonesimulator13.0/revzip.ios-extension as RevZip base ios:iphonesimulator8.2/revzip.dylib
executable ios:iphonesimulator13.0/revxml.ios-extension as RevXml base ios:iphonesimulator8.2/revxml.dylib
executable ios:iphonesimulator13.0/revdb.ios-extension as RevDb base ios:iphonesimulator8.2/revdb.dylib
executable ios:iphonesimulator13.0/dbsqlite.ios-extension as DbSqlite base ios:iphonesimulator8.2/dbsqlite.dylib
executable ios:iphonesimulator13.0/dbmysql.ios-extension as DbMysql base ios:iphonesimulator8.2/dbmysql.dylib
file ios:iphonesimulator13.0/mobile-template.plist as "Settings.plist"
file ios:iphonesimulator13.0/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
file ios:iphonesimulator13.0/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
file ios:iphonesimulator13.0/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
file ios:iphonesimulator13.0/mobile-disable-ats-template.plist as "DisableATS.plist"
file ios:iphonesimulator13.0/[email protected] as "Default4InchSplash.png" base ios:[email protected]
file ios:iphonesimulator13.0/fontmap as "fontmap"
executable ios:iphonesimulator13.1/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphonesimulator8.2/standalone-mobile[[BaseEditionTagLower]].app/standalone-mobile[[BaseEditionTagLower]]
executable ios:iphonesimulator13.1/revsecurity.ios-extension as RevSecurity base ios:iphonesimulator8.2/revsecurity.dylib
executable ios:iphonesimulator13.1/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphonesimulator8.2/revpdfprinter.dylib
executable ios:iphonesimulator13.1/revzip.ios-extension as RevZip base ios:iphonesimulator8.2/revzip.dylib
executable ios:iphonesimulator13.1/revxml.ios-extension as RevXml base ios:iphonesimulator8.2/revxml.dylib
executable ios:iphonesimulator13.1/revdb.ios-extension as RevDb base ios:iphonesimulator8.2/revdb.dylib
executable ios:iphonesimulator13.1/dbsqlite.ios-extension as DbSqlite base ios:iphonesimulator8.2/dbsqlite.dylib
executable ios:iphonesimulator13.1/dbmysql.ios-extension as DbMysql base ios:iphonesimulator8.2/dbmysql.dylib
file ios:iphonesimulator13.1/mobile-template.plist as "Settings.plist"
file ios:iphonesimulator13.1/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
file ios:iphonesimulator13.1/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
file ios:iphonesimulator13.1/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
file ios:iphonesimulator13.1/mobile-disable-ats-template.plist as "DisableATS.plist"
file ios:iphonesimulator13.1/[email protected] as "Default4InchSplash.png" base ios:[email protected]
file ios:iphonesimulator13.1/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
Expand Down Expand Up @@ -821,25 +821,25 @@ component Runtime.iOS
file ios:iphoneos12.1/[email protected] as "Default4InchSplash.png" base ios:[email protected]
file ios:iphoneos12.1/fontmap as "fontmap"
into "[[ToolsFolder]]/Runtime/iOS/Device-13_0" place
executable ios:iphoneos13.0/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphoneos9.2/standalone-mobile[[BaseEditionTagLower]].ios-engine
executable ios:iphoneos13.0/revsecurity.ios-extension as RevSecurity base ios:iphoneos9.2/revsecurity.ios-extension
executable ios:iphoneos13.0/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphoneos9.2/revpdfprinter.ios-extension
executable ios:iphoneos13.0/revzip.ios-extension as RevZip base ios:iphoneos9.2/revzip.ios-extension
executable ios:iphoneos13.0/revxml.ios-extension as RevXml base ios:iphoneos9.2/revxml.ios-extension
executable ios:iphoneos13.0/revdb.ios-extension as RevDb base ios:iphoneos9.2/revdb.ios-extension
executable ios:iphoneos13.0/dbsqlite.ios-extension as DbSqlite base ios:iphoneos9.2/dbsqlite.ios-extension
executable ios:iphoneos13.0/dbmysql.ios-extension as DbMysql base ios:iphoneos9.2/dbmysql.ios-extension
file ios:iphoneos13.0/mobile-device-template.plist as "Settings.plist"
file ios:iphoneos13.0/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
file ios:iphoneos13.0/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
file ios:iphoneos13.0/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
file ios:iphoneos13.0/template-entitlements.xcent as "Entitlements.xcent"
file ios:iphoneos13.0/template-beta-report-entitlement.xcent as "BetaReportEntitlement.xcent"
file ios:iphoneos13.0/template-remote-notification-entitlements.xcent as "RemoteNotificationEntitlements.xcent"
file ios:iphoneos13.0/template-remote-notification-store-entitlements.xcent as "RemoteNotificationStoreEntitlements.xcent"
file ios:iphoneos13.0/mobile-disable-ats-template.plist as "DisableATS.plist"
file ios:iphoneos13.0/[email protected] as "Default4InchSplash.png" base ios:[email protected]
file ios:iphoneos13.0/fontmap as "fontmap"
executable ios:iphoneos13.1/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphoneos9.2/standalone-mobile[[BaseEditionTagLower]].ios-engine
executable ios:iphoneos13.1/revsecurity.ios-extension as RevSecurity base ios:iphoneos9.2/revsecurity.ios-extension
executable ios:iphoneos13.1/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphoneos9.2/revpdfprinter.ios-extension
executable ios:iphoneos13.1/revzip.ios-extension as RevZip base ios:iphoneos9.2/revzip.ios-extension
executable ios:iphoneos13.1/revxml.ios-extension as RevXml base ios:iphoneos9.2/revxml.ios-extension
executable ios:iphoneos13.1/revdb.ios-extension as RevDb base ios:iphoneos9.2/revdb.ios-extension
executable ios:iphoneos13.1/dbsqlite.ios-extension as DbSqlite base ios:iphoneos9.2/dbsqlite.ios-extension
executable ios:iphoneos13.1/dbmysql.ios-extension as DbMysql base ios:iphoneos9.2/dbmysql.ios-extension
file ios:iphoneos13.1/mobile-device-template.plist as "Settings.plist"
file ios:iphoneos13.1/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
file ios:iphoneos13.1/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
file ios:iphoneos13.1/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
file ios:iphoneos13.1/template-entitlements.xcent as "Entitlements.xcent"
file ios:iphoneos13.1/template-beta-report-entitlement.xcent as "BetaReportEntitlement.xcent"
file ios:iphoneos13.1/template-remote-notification-entitlements.xcent as "RemoteNotificationEntitlements.xcent"
file ios:iphoneos13.1/template-remote-notification-store-entitlements.xcent as "RemoteNotificationStoreEntitlements.xcent"
file ios:iphoneos13.1/mobile-disable-ats-template.plist as "DisableATS.plist"
file ios:iphoneos13.1/[email protected] as "Default4InchSplash.png" base ios:[email protected]
file ios:iphoneos13.1/fontmap as "fontmap"

////////////////////////////////////////////////////////////////////////////////

Expand Down Expand Up @@ -1017,7 +1017,7 @@ component TimeZone
into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
rfolder ios:iphonesimulator12.1/packaged_extensions/com.livecode.library.timezone/code
into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
rfolder ios:iphonesimulator13.0/packaged_extensions/com.livecode.library.timezone/code
rfolder ios:iphonesimulator13.1/packaged_extensions/com.livecode.library.timezone/code
into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
rfolder ios:iphoneos9.2/packaged_extensions/com.livecode.library.timezone/code
into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
Expand All @@ -1027,7 +1027,7 @@ component TimeZone
into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
rfolder ios:iphoneos12.1/packaged_extensions/com.livecode.library.timezone/code
into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
rfolder ios:iphoneos13.0/packaged_extensions/com.livecode.library.timezone/code
rfolder ios:iphoneos13.1/packaged_extensions/com.livecode.library.timezone/code
into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
rfolder win-x86:packaged_extensions/com.livecode.library.timezone/code
into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
Expand Down
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 12.1 13.0
IPHONESIMULATOR_VERSIONS ?= 8.2 9.2 10.2 11.2 12.1 13.0
IPHONEOS_VERSIONS ?= 9.2 10.2 11.2 12.1 13.1
IPHONESIMULATOR_VERSIONS ?= 8.2 9.2 10.2 11.2 12.1 13.1
SKIP_IPHONESIMULATOR_VERSIONS ?= 6.1 7.1

IOS_SDKS ?= \
Expand Down
4 changes: 2 additions & 2 deletions config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@
'x86-android-ndk16r15',
'x86_64-android-ndk16r15',
'universal-mac-macosx10.9', # Minimum deployment target
'universal-ios-iphoneos13.0',
'universal-ios-iphoneos13.1',
'universal-ios-iphoneos12.1',
'universal-ios-iphoneos11.2',
'universal-ios-iphoneos10.2',
'universal-ios-iphoneos9.2',
'universal-ios-iphonesimulator13.0',
'universal-ios-iphonesimulator13.1',
'universal-ios-iphonesimulator12.1',
'universal-ios-iphonesimulator11.2',
'universal-ios-iphonesimulator10.2',
Expand Down
4 changes: 2 additions & 2 deletions docs/notes-base/platforms.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ Currently, the supported versions of Xcode are:
* 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 10.1 on MacOS 10.13 (Note: You need to upgrade to 10.13.4)
* Xcode 11.0 on MacOS 10.14 (Note: You need to upgrade to 10.14.3)
* Xcode 11.1 on MacOS 10.14 (Note: You need to upgrade to 10.14.3)

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
Expand All @@ -76,7 +76,7 @@ We currently support deployment for the following versions of iOS:
* 10.2
* 11.2
* 12.1
* 13.0
* 13.1

## Android

Expand Down
8 changes: 4 additions & 4 deletions ide-support/revdeploylibraryios.livecodescript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,12.1,13.0"
return "8.2,9.2,10.2,11.2,12.1,13.1"
end deployUsableIosSdk

// SN-2015-05-01: Return the pair iOS SDK / Xcode for the current MacOS version
Expand Down Expand Up @@ -49,15 +49,15 @@ function deployGetIphoneOSes
put empty into tList[1]
answer error "To use Xcode 11.0, you need to upgrade your Mac to MacOS Mojave 10.14.3"
else
// Xcode 11.0 requires a Mac running Mac OS 10.14.3 or later
put "12.1,10.1" into tList[1]
// Xcode 11.1 requires a Mac running Mac OS 10.14.3 or later
put "13.1,11.1" 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,11.4,12.0,12.1,13.0"
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,12.1,13.0,13.1"
end deployGetIosMinimumVersions

////////////////////////////////////////////////////////////////////////////////
Expand Down
2 changes: 1 addition & 1 deletion prebuilt/fetch-libraries.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ LIBS_win32=( Thirdparty OpenSSL Curl ICU CEF )
LIBS_linux=( Thirdparty OpenSSL Curl ICU CEF )
LIBS_emscripten=( Thirdparty ICU )

SUBPLATFORMS_ios=(iPhoneSimulator8.2 iPhoneSimulator9.2 iPhoneSimulator10.2 iPhoneSimulator11.2 iPhoneSimulator12.1 iPhoneSimulator13.0 iPhoneOS9.2 iPhoneOS10.2 iPhoneOS11.2 iPhoneOS12.1 iPhoneOS13.0)
SUBPLATFORMS_ios=(iPhoneSimulator8.2 iPhoneSimulator9.2 iPhoneSimulator10.2 iPhoneSimulator11.2 iPhoneSimulator12.1 iPhoneSimulator13.1 iPhoneOS9.2 iPhoneOS10.2 iPhoneOS11.2 iPhoneOS12.1 iPhoneOS13.1)
SUBPLATFORMS_win32=(v141_static_debug v141_static_release)
SUBPLATFORMS_android=(ndk16r15)

Expand Down
4 changes: 2 additions & 2 deletions prebuilt/scripts/ios.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,5 +77,5 @@ checkiOS iphonesimulator11.2 9_2_0 iPhoneSimulator 11.2 "x86_64"
checkiOS iphoneos11.2 9_2_0 iPhoneOS 11.2 "armv7 arm64"
checkiOS iphonesimulator12.1 10_1_0 iPhoneSimulator 12.1 "x86_64"
checkiOS iphoneos12.1 10_1_0 iPhoneOS 12.1 "armv7 arm64"
checkiOS iphonesimulator13.0 11_0_0 iPhoneSimulator 13.0 "x86_64"
checkiOS iphoneos13.0 11_0_0 iPhoneOS 13.0 "armv7 arm64"
checkiOS iphonesimulator13.1 11_1_0 iPhoneSimulator 13.1 "x86_64"
checkiOS iphoneos13.1 11_1_0 iPhoneOS 13.1 "armv7 arm64"
4 changes: 2 additions & 2 deletions tools/setup_xcode_sdks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#!/bin/python

# Update these lists if you need different SDK versions!
iphoneos_versions = ["13.0", "12.1", "11.2", "10.2", "9.2"]
iphonesimulator_versions = ["13.0", "12.1", "11.2", "10.2","9.2", "8.2"]
iphoneos_versions = ["13.1", "12.1", "11.2", "10.2", "9.2"]
iphonesimulator_versions = ["13.1", "12.1", "11.2", "10.2","9.2", "8.2"]
macosx_versions = ["10.9"]


Expand Down