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

Commit afbded6

Browse files
Auto-merge pull request #7176 from livecodepanos/merge-develop-9.5-23.09.2019
Merge develop 9.5 23.09.2019
2 parents c505bff + bab85ae commit afbded6

File tree

14 files changed

+96
-18
lines changed

14 files changed

+96
-18
lines changed

Installer/package.txt

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -724,6 +724,22 @@ component Runtime.iOS
724724
file ios:iphonesimulator12.1/mobile-disable-ats-template.plist as "DisableATS.plist"
725725
file ios:iphonesimulator12.1/[email protected] as "Default4InchSplash.png" base ios:[email protected]
726726
file ios:iphonesimulator12.1/fontmap as "fontmap"
727+
into "[[ToolsFolder]]/Runtime/iOS/Simulator-13_0" place
728+
executable ios:iphonesimulator13.0/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphonesimulator8.2/standalone-mobile[[BaseEditionTagLower]].app/standalone-mobile[[BaseEditionTagLower]]
729+
executable ios:iphonesimulator13.0/revsecurity.ios-extension as RevSecurity base ios:iphonesimulator8.2/revsecurity.dylib
730+
executable ios:iphonesimulator13.0/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphonesimulator8.2/revpdfprinter.dylib
731+
executable ios:iphonesimulator13.0/revzip.ios-extension as RevZip base ios:iphonesimulator8.2/revzip.dylib
732+
executable ios:iphonesimulator13.0/revxml.ios-extension as RevXml base ios:iphonesimulator8.2/revxml.dylib
733+
executable ios:iphonesimulator13.0/revdb.ios-extension as RevDb base ios:iphonesimulator8.2/revdb.dylib
734+
executable ios:iphonesimulator13.0/dbsqlite.ios-extension as DbSqlite base ios:iphonesimulator8.2/dbsqlite.dylib
735+
executable ios:iphonesimulator13.0/dbmysql.ios-extension as DbMysql base ios:iphonesimulator8.2/dbmysql.dylib
736+
file ios:iphonesimulator13.0/mobile-template.plist as "Settings.plist"
737+
file ios:iphonesimulator13.0/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
738+
file ios:iphonesimulator13.0/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
739+
file ios:iphonesimulator13.0/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
740+
file ios:iphonesimulator13.0/mobile-disable-ats-template.plist as "DisableATS.plist"
741+
file ios:iphonesimulator13.0/[email protected] as "Default4InchSplash.png" base ios:[email protected]
742+
file ios:iphonesimulator13.0/fontmap as "fontmap"
727743
into "[[ToolsFolder]]/Runtime/iOS/Device-9_2" place
728744
executable ios:iphoneos9.2/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone
729745
executable ios:iphoneos9.2/revsecurity.ios-extension as RevSecurity
@@ -804,6 +820,26 @@ component Runtime.iOS
804820
file ios:iphoneos12.1/mobile-disable-ats-template.plist as "DisableATS.plist"
805821
file ios:iphoneos12.1/[email protected] as "Default4InchSplash.png" base ios:[email protected]
806822
file ios:iphoneos12.1/fontmap as "fontmap"
823+
into "[[ToolsFolder]]/Runtime/iOS/Device-13_0" place
824+
executable ios:iphoneos13.0/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphoneos9.2/standalone-mobile[[BaseEditionTagLower]].ios-engine
825+
executable ios:iphoneos13.0/revsecurity.ios-extension as RevSecurity base ios:iphoneos9.2/revsecurity.ios-extension
826+
executable ios:iphoneos13.0/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphoneos9.2/revpdfprinter.ios-extension
827+
executable ios:iphoneos13.0/revzip.ios-extension as RevZip base ios:iphoneos9.2/revzip.ios-extension
828+
executable ios:iphoneos13.0/revxml.ios-extension as RevXml base ios:iphoneos9.2/revxml.ios-extension
829+
executable ios:iphoneos13.0/revdb.ios-extension as RevDb base ios:iphoneos9.2/revdb.ios-extension
830+
executable ios:iphoneos13.0/dbsqlite.ios-extension as DbSqlite base ios:iphoneos9.2/dbsqlite.ios-extension
831+
executable ios:iphoneos13.0/dbmysql.ios-extension as DbMysql base ios:iphoneos9.2/dbmysql.ios-extension
832+
file ios:iphoneos13.0/mobile-device-template.plist as "Settings.plist"
833+
file ios:iphoneos13.0/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
834+
file ios:iphoneos13.0/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
835+
file ios:iphoneos13.0/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
836+
file ios:iphoneos13.0/template-entitlements.xcent as "Entitlements.xcent"
837+
file ios:iphoneos13.0/template-beta-report-entitlement.xcent as "BetaReportEntitlement.xcent"
838+
file ios:iphoneos13.0/template-remote-notification-entitlements.xcent as "RemoteNotificationEntitlements.xcent"
839+
file ios:iphoneos13.0/template-remote-notification-store-entitlements.xcent as "RemoteNotificationStoreEntitlements.xcent"
840+
file ios:iphoneos13.0/mobile-disable-ats-template.plist as "DisableATS.plist"
841+
file ios:iphoneos13.0/[email protected] as "Default4InchSplash.png" base ios:[email protected]
842+
file ios:iphoneos13.0/fontmap as "fontmap"
807843

808844
////////////////////////////////////////////////////////////////////////////////
809845

@@ -980,6 +1016,8 @@ component TimeZone
9801016
rfolder ios:iphonesimulator11.2/packaged_extensions/com.livecode.library.timezone/code
9811017
into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
9821018
rfolder ios:iphonesimulator12.1/packaged_extensions/com.livecode.library.timezone/code
1019+
into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
1020+
rfolder ios:iphonesimulator13.0/packaged_extensions/com.livecode.library.timezone/code
9831021
into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
9841022
rfolder ios:iphoneos9.2/packaged_extensions/com.livecode.library.timezone/code
9851023
into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
@@ -988,6 +1026,8 @@ component TimeZone
9881026
rfolder ios:iphoneos11.2/packaged_extensions/com.livecode.library.timezone/code
9891027
into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
9901028
rfolder ios:iphoneos12.1/packaged_extensions/com.livecode.library.timezone/code
1029+
into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
1030+
rfolder ios:iphoneos13.0/packaged_extensions/com.livecode.library.timezone/code
9911031
into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
9921032
rfolder win-x86:packaged_extensions/com.livecode.library.timezone/code
9931033
into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place

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

3232
IOS_SDKS ?= \

config.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,12 @@
3131
'x86-android-ndk16r15',
3232
'x86_64-android-ndk16r15',
3333
'universal-mac-macosx10.9', # Minimum deployment target
34+
'universal-ios-iphoneos13.0',
3435
'universal-ios-iphoneos12.1',
3536
'universal-ios-iphoneos11.2',
3637
'universal-ios-iphoneos10.2',
3738
'universal-ios-iphoneos9.2',
39+
'universal-ios-iphonesimulator13.0',
3840
'universal-ios-iphonesimulator12.1',
3941
'universal-ios-iphonesimulator11.2',
4042
'universal-ios-iphonesimulator10.2',

docs/dictionary/keyword/dateItems.lcdoc

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,18 @@ The <dateItems> does not change depending on the user's settings, so you
4040
can use it (or the <seconds> format) to store a date and time in an
4141
invariant form that won't change.
4242

43+
>*Note:* A list in <dateItems> format can have values beyond the expected
44+
range for any given item (e.g. a day of the month of less than 1 or greater
45+
than the number of days in that month) without causing issues when converting
46+
it again later, outputting a date adjusted for such an irregularity. For
47+
example, the date 4 weeks from today can be determined by adding 28 to the
48+
third item (i.e. the day of the month) and then re-converting.
49+
50+
put the date into foo -- 9/19/19, for example
51+
convert foo to dateItems -- 2019,9,19,0,0,0,5
52+
add 28 to the item 3 of foo -- 2019,9,47,0,0,0,5
53+
convert foo to date -- 10/17/19
54+
4355
References: convert (command), date (function),
4456
seconds (function), time (function), command (glossary),
4557
keyword (glossary)

docs/dictionary/message/accelerationChanged.lcdoc

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,31 @@ Handle the <accelerationChanged> message if you want to perform an
3535
action when the acceleration along any axis changes
3636

3737
The <accelerationChanged> message is sent to the current card of the
38-
defaultStack at the interval specified by the mobileEnableAccelerometer
39-
command.
38+
defaultStack at the interval specified by the
39+
<mobileEnableAccelerometer> command.
4040

4141
You can use the difference between the time values in two
4242
<accelerationChanged> events to give an indication of how much time
4343
passed between the samples.
4444

45+
>*Note:* On Android, the change in acceleration output is in meters
46+
> per second squared whereas on iOS, it is in G-forces. In order to
47+
> normalize these changes in acceleration, you must detect the
48+
> <platform> and convert appropriately. For example:
49+
50+
on accelerationChanged pXAccel, pYAccel, pZAccel
51+
if the platform is "iphone" then
52+
-- Convert from g-forces to m/s^2
53+
multiply pXAccel by 9.81
54+
multiply pYAccel by 9.81
55+
multiply pZAccel by 9.81
56+
end if
57+
-- the rest of your code
58+
end accelerationChanged
59+
4560
References: mobileStopTrackingSensor (command),
46-
mobileStartTrackingSensor (command)
61+
mobileStartTrackingSensor (command),
62+
mobileEnableAccelerometer (command), platform (function)
4763

4864
Tags: ui
4965

docs/dictionary/property/cursorMovement.lcdoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ The mechanism to be used used for moving the cursor in a field
2626
- "visual": moves the cursor in visual order
2727
- "logical": moves the cursor to the next character in logical
2828
(reading) order
29-
- "empty": moves the cursor using the default behavior on the current
29+
- "default": moves the cursor using the default behavior on the current
3030
platform
3131

3232

docs/notes-base/platforms.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ Currently, the supported versions of Xcode are:
6262
* Xcode 8.2 on MacOS X 10.11
6363
* Xcode 9.2 on MacOS 10.12 (Note: You need to upgrade to 10.12.6)
6464
* Xcode 10.1 on MacOS 10.13 (Note: You need to upgrade to 10.13.4)
65+
* Xcode 11.0 on MacOS 10.14 (Note: You need to upgrade to 10.14.3)
6566

6667
It is also possible to set other versions of Xcode, to allow testing
6768
on a wider range of iOS simulators. For instance, on MacOS 10.12
@@ -75,6 +76,7 @@ We currently support deployment for the following versions of iOS:
7576
* 10.2
7677
* 11.2
7778
* 12.1
79+
* 13.0
7880

7981
## Android
8082

docs/notes/bugfix-19495.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Explained a feature in the dateItems entry where out-of-range values can be used effectively.

docs/notes/bugfix-21111.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Explained mobile accelerometer differences in the accelerationChanged entry

docs/notes/bugfix-22380.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Corrected documented list of mechanisms available to cursorMovement

0 commit comments

Comments
 (0)