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

Commit d74cc36

Browse files
peter-bpeter-b
committed
Merge branch 'develop-8.1' into develop
Trivial conflict in tools/setup_xcode_sdks.py
2 parents d05bf01 + 9ac2e41 commit d74cc36

39 files changed

+470
-314
lines changed

‎Installer/package.txt‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -608,22 +608,22 @@ component Runtime.iOS
608608
file ios:iphonesimulator9.2/mobile-disable-ats-template.plist as "DisableATS.plist"
609609
file ios:iphonesimulator9.2/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
610610
file ios:iphonesimulator9.2/fontmap as "fontmap"
611-
into "[[ToolsFolder]]/Runtime/iOS/Simulator-10_0" place
612-
executable ios:iphonesimulator10.0/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphonesimulator8.2/standalone-mobile[[BaseEditionTagLower]].app/standalone-mobile[[BaseEditionTagLower]]
613-
executable ios:iphonesimulator10.0/revsecurity.ios-extension as RevSecurity base ios:iphonesimulator8.2/revsecurity.dylib
614-
executable ios:iphonesimulator10.0/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphonesimulator8.2/revpdfprinter.dylib
615-
executable ios:iphonesimulator10.0/revzip.ios-extension as RevZip base ios:iphonesimulator8.2/revzip.dylib
616-
executable ios:iphonesimulator10.0/revxml.ios-extension as RevXml base ios:iphonesimulator8.2/revxml.dylib
617-
executable ios:iphonesimulator10.0/revdb.ios-extension as RevDb base ios:iphonesimulator8.2/revdb.dylib
618-
executable ios:iphonesimulator10.0/dbsqlite.ios-extension as DbSqlite base ios:iphonesimulator8.2/dbsqlite.dylib
619-
executable ios:iphonesimulator10.0/dbmysql.ios-extension as DbMysql base ios:iphonesimulator8.2/dbmysql.dylib
620-
file ios:iphonesimulator10.0/mobile-template.plist as "Settings.plist"
621-
file ios:iphonesimulator10.0/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
622-
file ios:iphonesimulator10.0/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
623-
file ios:iphonesimulator10.0/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
624-
file ios:iphonesimulator10.0/mobile-disable-ats-template.plist as "DisableATS.plist"
625-
file ios:iphonesimulator10.0/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
626-
file ios:iphonesimulator10.0/fontmap as "fontmap"
611+
into "[[ToolsFolder]]/Runtime/iOS/Simulator-10_1" place
612+
executable ios:iphonesimulator10.1/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphonesimulator8.2/standalone-mobile[[BaseEditionTagLower]].app/standalone-mobile[[BaseEditionTagLower]]
613+
executable ios:iphonesimulator10.1/revsecurity.ios-extension as RevSecurity base ios:iphonesimulator8.2/revsecurity.dylib
614+
executable ios:iphonesimulator10.1/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphonesimulator8.2/revpdfprinter.dylib
615+
executable ios:iphonesimulator10.1/revzip.ios-extension as RevZip base ios:iphonesimulator8.2/revzip.dylib
616+
executable ios:iphonesimulator10.1/revxml.ios-extension as RevXml base ios:iphonesimulator8.2/revxml.dylib
617+
executable ios:iphonesimulator10.1/revdb.ios-extension as RevDb base ios:iphonesimulator8.2/revdb.dylib
618+
executable ios:iphonesimulator10.1/dbsqlite.ios-extension as DbSqlite base ios:iphonesimulator8.2/dbsqlite.dylib
619+
executable ios:iphonesimulator10.1/dbmysql.ios-extension as DbMysql base ios:iphonesimulator8.2/dbmysql.dylib
620+
file ios:iphonesimulator10.1/mobile-template.plist as "Settings.plist"
621+
file ios:iphonesimulator10.1/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
622+
file ios:iphonesimulator10.1/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
623+
file ios:iphonesimulator10.1/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
624+
file ios:iphonesimulator10.1/mobile-disable-ats-template.plist as "DisableATS.plist"
625+
file ios:iphonesimulator10.1/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
626+
file ios:iphonesimulator10.1/fontmap as "fontmap"
627627
into "[[ToolsFolder]]/Runtime/iOS/Device-9_2" place
628628
executable ios:iphoneos9.2/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone
629629
executable ios:iphoneos9.2/revsecurity.ios-extension as RevSecurity
@@ -644,26 +644,26 @@ component Runtime.iOS
644644
file ios:iphoneos9.2/mobile-disable-ats-template.plist as "DisableATS.plist"
645645
file ios:iphoneos9.2/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
646646
file ios:iphoneos9.2/fontmap as "fontmap"
647-
into "[[ToolsFolder]]/Runtime/iOS/Device-10_0" place
648-
executable ios:iphoneos10.0/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphoneos9.2/standalone-mobile[[BaseEditionTagLower]].lcext
649-
executable ios:iphoneos10.0/revsecurity.ios-extension as RevSecurity base ios:iphoneos9.2/revsecurity.lcext
650-
executable ios:iphoneos10.0/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphoneos9.2/revpdfprinter.lcext
651-
executable ios:iphoneos10.0/revzip.ios-extension as RevZip base ios:iphoneos9.2/revzip.lcext
652-
executable ios:iphoneos10.0/revxml.ios-extension as RevXml base ios:iphoneos9.2/revxml.lcext
653-
executable ios:iphoneos10.0/revdb.ios-extension as RevDb base ios:iphoneos9.2/revdb.lcext
654-
executable ios:iphoneos10.0/dbsqlite.ios-extension as DbSqlite base ios:iphoneos9.2/dbsqlite.lcext
655-
executable ios:iphoneos10.0/dbmysql.ios-extension as DbMysql base ios:iphoneos9.2/dbmysql.lcext
656-
file ios:iphoneos10.0/mobile-device-template.plist as "Settings.plist"
657-
file ios:iphoneos10.0/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
658-
file ios:iphoneos10.0/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
659-
file ios:iphoneos10.0/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
660-
file ios:iphoneos10.0/template-entitlements.xcent as "Entitlements.xcent"
661-
file ios:iphoneos10.0/template-beta-report-entitlement.xcent as "BetaReportEntitlement.xcent"
662-
file ios:iphoneos10.0/template-remote-notification-entitlements.xcent as "RemoteNotificationEntitlements.xcent"
663-
file ios:iphoneos10.0/template-remote-notification-store-entitlements.xcent as "RemoteNotificationStoreEntitlements.xcent"
664-
file ios:iphoneos10.0/mobile-disable-ats-template.plist as "DisableATS.plist"
665-
file ios:iphoneos10.0/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
666-
file ios:iphoneos10.0/fontmap as "fontmap"
647+
into "[[ToolsFolder]]/Runtime/iOS/Device-10_1" place
648+
executable ios:iphoneos10.1/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphoneos9.2/standalone-mobile[[BaseEditionTagLower]].ios-engine
649+
executable ios:iphoneos10.1/revsecurity.ios-extension as RevSecurity base ios:iphoneos9.2/revsecurity.ios-extension
650+
executable ios:iphoneos10.1/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphoneos9.2/revpdfprinter.ios-extension
651+
executable ios:iphoneos10.1/revzip.ios-extension as RevZip base ios:iphoneos9.2/revzip.ios-extension
652+
executable ios:iphoneos10.1/revxml.ios-extension as RevXml base ios:iphoneos9.2/revxml.ios-extension
653+
executable ios:iphoneos10.1/revdb.ios-extension as RevDb base ios:iphoneos9.2/revdb.ios-extension
654+
executable ios:iphoneos10.1/dbsqlite.ios-extension as DbSqlite base ios:iphoneos9.2/dbsqlite.ios-extension
655+
executable ios:iphoneos10.1/dbmysql.ios-extension as DbMysql base ios:iphoneos9.2/dbmysql.ios-extension
656+
file ios:iphoneos10.1/mobile-device-template.plist as "Settings.plist"
657+
file ios:iphoneos10.1/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
658+
file ios:iphoneos10.1/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
659+
file ios:iphoneos10.1/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
660+
file ios:iphoneos10.1/template-entitlements.xcent as "Entitlements.xcent"
661+
file ios:iphoneos10.1/template-beta-report-entitlement.xcent as "BetaReportEntitlement.xcent"
662+
file ios:iphoneos10.1/template-remote-notification-entitlements.xcent as "RemoteNotificationEntitlements.xcent"
663+
file ios:iphoneos10.1/template-remote-notification-store-entitlements.xcent as "RemoteNotificationStoreEntitlements.xcent"
664+
file ios:iphoneos10.1/mobile-disable-ats-template.plist as "DisableATS.plist"
665+
file ios:iphoneos10.1/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
666+
file ios:iphoneos10.1/fontmap as "fontmap"
667667

668668
////////////////////////////////////////////////////////////////////////////////
669669

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

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

‎builder/builder_utilities.livecodescript‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
script "BuilderUtilities"
22

3-
constant kMergExtVersion = "2016-10-3"
3+
constant kMergExtVersion = "2016-10-26"
44
constant kTSNetVersion = "1.2.3"
55

66
local sEngineDir

‎docs/notes/bugfix-18441.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Make sure the purchaseStateUpdate callback is sent with status=complete when necessary

‎docs/notes/bugfix-18473.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Prevent hang when adjusting field pixmap offset

‎docs/notes/bugfix-18536.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Added support for Xcode 8.1 / iOS 10.1

‎docs/notes/bugfix-18578.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Ensure color name rgb value mapping is in alphabetical order

‎docs/notes/bugfix-18604.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Fix crash when converting objective-c objects to LiveCode values

‎docs/notes/bugfix-18614.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Fix Linux player crash when accessing properties

‎docs/notes/bugfix-18625.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Fix browser javascripthandlers not working on iOS after loading a new page

0 commit comments

Comments
 (0)