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

Commit 2bba8e2

Browse files
livecodealilivecodeali
committed
Merge remote-tracking branch 'upstream/develop-8.1' into merge-develop-8.2_03.11.17
2 parents 9d61081 + d8e24fa commit 2bba8e2

33 files changed

+312
-108
lines changed

‎Installer/package.txt‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -647,22 +647,22 @@ component Runtime.iOS
647647
file ios:iphonesimulator10.2/mobile-disable-ats-template.plist as "DisableATS.plist"
648648
file ios:iphonesimulator10.2/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
649649
file ios:iphonesimulator10.2/fontmap as "fontmap"
650-
into "[[ToolsFolder]]/Runtime/iOS/Simulator-11_0" place
651-
executable ios:iphonesimulator11.0/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphonesimulator8.2/standalone-mobile[[BaseEditionTagLower]].app/standalone-mobile[[BaseEditionTagLower]]
652-
executable ios:iphonesimulator11.0/revsecurity.ios-extension as RevSecurity base ios:iphonesimulator8.2/revsecurity.dylib
653-
executable ios:iphonesimulator11.0/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphonesimulator8.2/revpdfprinter.dylib
654-
executable ios:iphonesimulator11.0/revzip.ios-extension as RevZip base ios:iphonesimulator8.2/revzip.dylib
655-
executable ios:iphonesimulator11.0/revxml.ios-extension as RevXml base ios:iphonesimulator8.2/revxml.dylib
656-
executable ios:iphonesimulator11.0/revdb.ios-extension as RevDb base ios:iphonesimulator8.2/revdb.dylib
657-
executable ios:iphonesimulator11.0/dbsqlite.ios-extension as DbSqlite base ios:iphonesimulator8.2/dbsqlite.dylib
658-
executable ios:iphonesimulator11.0/dbmysql.ios-extension as DbMysql base ios:iphonesimulator8.2/dbmysql.dylib
659-
file ios:iphonesimulator11.0/mobile-template.plist as "Settings.plist"
660-
file ios:iphonesimulator11.0/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
661-
file ios:iphonesimulator11.0/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
662-
file ios:iphonesimulator11.0/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
663-
file ios:iphonesimulator11.0/mobile-disable-ats-template.plist as "DisableATS.plist"
664-
file ios:iphonesimulator11.0/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
665-
file ios:iphonesimulator11.0/fontmap as "fontmap"
650+
into "[[ToolsFolder]]/Runtime/iOS/Simulator-11_1" place
651+
executable ios:iphonesimulator11.1/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphonesimulator8.2/standalone-mobile[[BaseEditionTagLower]].app/standalone-mobile[[BaseEditionTagLower]]
652+
executable ios:iphonesimulator11.1/revsecurity.ios-extension as RevSecurity base ios:iphonesimulator8.2/revsecurity.dylib
653+
executable ios:iphonesimulator11.1/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphonesimulator8.2/revpdfprinter.dylib
654+
executable ios:iphonesimulator11.1/revzip.ios-extension as RevZip base ios:iphonesimulator8.2/revzip.dylib
655+
executable ios:iphonesimulator11.1/revxml.ios-extension as RevXml base ios:iphonesimulator8.2/revxml.dylib
656+
executable ios:iphonesimulator11.1/revdb.ios-extension as RevDb base ios:iphonesimulator8.2/revdb.dylib
657+
executable ios:iphonesimulator11.1/dbsqlite.ios-extension as DbSqlite base ios:iphonesimulator8.2/dbsqlite.dylib
658+
executable ios:iphonesimulator11.1/dbmysql.ios-extension as DbMysql base ios:iphonesimulator8.2/dbmysql.dylib
659+
file ios:iphonesimulator11.1/mobile-template.plist as "Settings.plist"
660+
file ios:iphonesimulator11.1/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
661+
file ios:iphonesimulator11.1/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
662+
file ios:iphonesimulator11.1/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
663+
file ios:iphonesimulator11.1/mobile-disable-ats-template.plist as "DisableATS.plist"
664+
file ios:iphonesimulator11.1/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
665+
file ios:iphonesimulator11.1/fontmap as "fontmap"
666666
into "[[ToolsFolder]]/Runtime/iOS/Device-9_2" place
667667
executable ios:iphoneos9.2/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone
668668
executable ios:iphoneos9.2/revsecurity.ios-extension as RevSecurity
@@ -703,26 +703,26 @@ component Runtime.iOS
703703
file ios:iphoneos10.2/mobile-disable-ats-template.plist as "DisableATS.plist"
704704
file ios:iphoneos10.2/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
705705
file ios:iphoneos10.2/fontmap as "fontmap"
706-
into "[[ToolsFolder]]/Runtime/iOS/Device-11_0" place
707-
executable ios:iphoneos11.0/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphoneos9.2/standalone-mobile[[BaseEditionTagLower]].ios-engine
708-
executable ios:iphoneos11.0/revsecurity.ios-extension as RevSecurity base ios:iphoneos9.2/revsecurity.ios-extension
709-
executable ios:iphoneos11.0/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphoneos9.2/revpdfprinter.ios-extension
710-
executable ios:iphoneos11.0/revzip.ios-extension as RevZip base ios:iphoneos9.2/revzip.ios-extension
711-
executable ios:iphoneos11.0/revxml.ios-extension as RevXml base ios:iphoneos9.2/revxml.ios-extension
712-
executable ios:iphoneos11.0/revdb.ios-extension as RevDb base ios:iphoneos9.2/revdb.ios-extension
713-
executable ios:iphoneos11.0/dbsqlite.ios-extension as DbSqlite base ios:iphoneos9.2/dbsqlite.ios-extension
714-
executable ios:iphoneos11.0/dbmysql.ios-extension as DbMysql base ios:iphoneos9.2/dbmysql.ios-extension
715-
file ios:iphoneos11.0/mobile-device-template.plist as "Settings.plist"
716-
file ios:iphoneos11.0/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
717-
file ios:iphoneos11.0/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
718-
file ios:iphoneos11.0/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
719-
file ios:iphoneos11.0/template-entitlements.xcent as "Entitlements.xcent"
720-
file ios:iphoneos11.0/template-beta-report-entitlement.xcent as "BetaReportEntitlement.xcent"
721-
file ios:iphoneos11.0/template-remote-notification-entitlements.xcent as "RemoteNotificationEntitlements.xcent"
722-
file ios:iphoneos11.0/template-remote-notification-store-entitlements.xcent as "RemoteNotificationStoreEntitlements.xcent"
723-
file ios:iphoneos11.0/mobile-disable-ats-template.plist as "DisableATS.plist"
724-
file ios:iphoneos11.0/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
725-
file ios:iphoneos11.0/fontmap as "fontmap"
706+
into "[[ToolsFolder]]/Runtime/iOS/Device-11_1" place
707+
executable ios:iphoneos11.1/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphoneos9.2/standalone-mobile[[BaseEditionTagLower]].ios-engine
708+
executable ios:iphoneos11.1/revsecurity.ios-extension as RevSecurity base ios:iphoneos9.2/revsecurity.ios-extension
709+
executable ios:iphoneos11.1/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphoneos9.2/revpdfprinter.ios-extension
710+
executable ios:iphoneos11.1/revzip.ios-extension as RevZip base ios:iphoneos9.2/revzip.ios-extension
711+
executable ios:iphoneos11.1/revxml.ios-extension as RevXml base ios:iphoneos9.2/revxml.ios-extension
712+
executable ios:iphoneos11.1/revdb.ios-extension as RevDb base ios:iphoneos9.2/revdb.ios-extension
713+
executable ios:iphoneos11.1/dbsqlite.ios-extension as DbSqlite base ios:iphoneos9.2/dbsqlite.ios-extension
714+
executable ios:iphoneos11.1/dbmysql.ios-extension as DbMysql base ios:iphoneos9.2/dbmysql.ios-extension
715+
file ios:iphoneos11.1/mobile-device-template.plist as "Settings.plist"
716+
file ios:iphoneos11.1/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
717+
file ios:iphoneos11.1/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
718+
file ios:iphoneos11.1/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
719+
file ios:iphoneos11.1/template-entitlements.xcent as "Entitlements.xcent"
720+
file ios:iphoneos11.1/template-beta-report-entitlement.xcent as "BetaReportEntitlement.xcent"
721+
file ios:iphoneos11.1/template-remote-notification-entitlements.xcent as "RemoteNotificationEntitlements.xcent"
722+
file ios:iphoneos11.1/template-remote-notification-store-entitlements.xcent as "RemoteNotificationStoreEntitlements.xcent"
723+
file ios:iphoneos11.1/mobile-disable-ats-template.plist as "DisableATS.plist"
724+
file ios:iphoneos11.1/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
725+
file ios:iphoneos11.1/fontmap as "fontmap"
726726

727727
////////////////////////////////////////////////////////////////////////////////
728728

‎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.0
29-
IPHONESIMULATOR_VERSIONS ?= 6.1 7.1 8.2 9.2 10.2 11.0
28+
IPHONEOS_VERSIONS ?= 9.2 10.2 11.1
29+
IPHONESIMULATOR_VERSIONS ?= 6.1 7.1 8.2 9.2 10.2 11.1
3030

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

‎buildbot.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@
4141
'x86_64-linux-debian7',
4242
'armv6-android-api8',
4343
'universal-mac-macosx10.6', # Minimum deployment target
44-
'universal-ios-iphoneos11.0',
44+
'universal-ios-iphoneos11.1',
4545
'universal-ios-iphoneos10.2',
4646
'universal-ios-iphoneos9.2',
47-
'universal-ios-iphonesimulator11.0',
47+
'universal-ios-iphonesimulator11.1',
4848
'universal-ios-iphonesimulator10.2',
4949
'universal-ios-iphonesimulator9.2',
5050
'universal-ios-iphonesimulator8.2',

‎docs/notes/bugfix-16551.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Ensure the "hilitedButtonName" returns the name of the hilited button

‎docs/notes/bugfix-20478.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Prevent crash on quit when using the commandName

‎docs/notes/bugfix-20504.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Fetching a char of a string can cause incorrect comparisons later on

‎docs/notes/bugfix-20538.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Ensure flushEvents("all") works on MacOS

‎docs/notes/bugfix-20592.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Ensure iOS standalones are treated as unique by fingerprint scanning

‎docs/notes/platforms.md‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ The Mac engine supports:
5656
* 10.10.x (Yosemite) on Intel
5757
* 10.11.x (El Capitan) on Intel
5858
* 10.12.x (Sierra) on Intel
59+
* 10.13.x (High Sierra) on Intel
5960

6061
## iOS
6162
iOS deployment is possible when running LiveCode IDE on a Mac, and provided Xcode is installed and has been set in LiveCode *Preferences* (in the *Mobile Support* pane).
@@ -66,7 +67,8 @@ Currently, the supported versions of Xcode are:
6667
* Xcode 6.2 on MacOS X 10.9
6768
* Xcode 6.2 and 7.2 on Mac OS X 10.10
6869
* Xcode 8.2 on MacOS X 10.11
69-
* Xcode 9.0 on MacOS 10.12 (Note: You need to upgrade to 10.12.6)
70+
* Xcode 9.1 on MacOS 10.12 (Note: You need to upgrade to 10.12.6)
71+
* Xcode 9.1 on MacOS 10.13
7072

7173
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*.
7274

@@ -77,7 +79,7 @@ We currently support deployment for the following versions of iOS:
7779
* 8.2 [simulator]
7880
* 9.2
7981
* 10.2
80-
* 11.0
82+
* 11.1
8183

8284
## Android
8385

@@ -97,6 +99,7 @@ processors. It will run on the following versions of Android:
9799
* 5.0-5.1 (Lollipop)
98100
* 6.0 (Marshmallow)
99101
* 7.0 (Nougat)
102+
* 8.0 (Oreo)
100103

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

‎engine/src/deploy.cpp‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -367,6 +367,12 @@ bool MCDeployParameters::InitWithArray(MCExecContext &ctxt, MCArrayRef p_array)
367367
kMCStringOptionCompareCaseless))
368368
banner_class = kMCLicenseClassProfessionalEvaluation;
369369

370+
371+
if (!ctxt.CopyOptElementAsString(p_array, MCNAME("uuid"), false, t_temp_string))
372+
return false;
373+
MCValueAssign(uuid, t_temp_string);
374+
MCValueRelease(t_temp_string);
375+
370376
return true;
371377
}
372378

0 commit comments

Comments
 (0)