Skip to content

Commit 78e686b

Browse files
livecodealilivecodeali
committed
Merge remote-tracking branch 'origin/develop-8.2' into merge-develop_8.2_14.12.17
2 parents 019a368 + 101ea58 commit 78e686b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+395
-2048
lines changed

‎Installer/package.txt‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -656,22 +656,22 @@ component Runtime.iOS
656656
file ios:iphonesimulator10.2/mobile-disable-ats-template.plist as "DisableATS.plist"
657657
file ios:iphonesimulator10.2/[email protected] as "Default4InchSplash.png" base ios:[email protected]
658658
file ios:iphonesimulator10.2/fontmap as "fontmap"
659-
into "[[ToolsFolder]]/Runtime/iOS/Simulator-11_1" place
660-
executable ios:iphonesimulator11.1/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphonesimulator8.2/standalone-mobile[[BaseEditionTagLower]].app/standalone-mobile[[BaseEditionTagLower]]
661-
executable ios:iphonesimulator11.1/revsecurity.ios-extension as RevSecurity base ios:iphonesimulator8.2/revsecurity.dylib
662-
executable ios:iphonesimulator11.1/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphonesimulator8.2/revpdfprinter.dylib
663-
executable ios:iphonesimulator11.1/revzip.ios-extension as RevZip base ios:iphonesimulator8.2/revzip.dylib
664-
executable ios:iphonesimulator11.1/revxml.ios-extension as RevXml base ios:iphonesimulator8.2/revxml.dylib
665-
executable ios:iphonesimulator11.1/revdb.ios-extension as RevDb base ios:iphonesimulator8.2/revdb.dylib
666-
executable ios:iphonesimulator11.1/dbsqlite.ios-extension as DbSqlite base ios:iphonesimulator8.2/dbsqlite.dylib
667-
executable ios:iphonesimulator11.1/dbmysql.ios-extension as DbMysql base ios:iphonesimulator8.2/dbmysql.dylib
668-
file ios:iphonesimulator11.1/mobile-template.plist as "Settings.plist"
669-
file ios:iphonesimulator11.1/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
670-
file ios:iphonesimulator11.1/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
671-
file ios:iphonesimulator11.1/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
672-
file ios:iphonesimulator11.1/mobile-disable-ats-template.plist as "DisableATS.plist"
673-
file ios:iphonesimulator11.1/[email protected] as "Default4InchSplash.png" base ios:[email protected]
674-
file ios:iphonesimulator11.1/fontmap as "fontmap"
659+
into "[[ToolsFolder]]/Runtime/iOS/Simulator-11_2" place
660+
executable ios:iphonesimulator11.2/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphonesimulator8.2/standalone-mobile[[BaseEditionTagLower]].app/standalone-mobile[[BaseEditionTagLower]]
661+
executable ios:iphonesimulator11.2/revsecurity.ios-extension as RevSecurity base ios:iphonesimulator8.2/revsecurity.dylib
662+
executable ios:iphonesimulator11.2/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphonesimulator8.2/revpdfprinter.dylib
663+
executable ios:iphonesimulator11.2/revzip.ios-extension as RevZip base ios:iphonesimulator8.2/revzip.dylib
664+
executable ios:iphonesimulator11.2/revxml.ios-extension as RevXml base ios:iphonesimulator8.2/revxml.dylib
665+
executable ios:iphonesimulator11.2/revdb.ios-extension as RevDb base ios:iphonesimulator8.2/revdb.dylib
666+
executable ios:iphonesimulator11.2/dbsqlite.ios-extension as DbSqlite base ios:iphonesimulator8.2/dbsqlite.dylib
667+
executable ios:iphonesimulator11.2/dbmysql.ios-extension as DbMysql base ios:iphonesimulator8.2/dbmysql.dylib
668+
file ios:iphonesimulator11.2/mobile-template.plist as "Settings.plist"
669+
file ios:iphonesimulator11.2/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
670+
file ios:iphonesimulator11.2/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
671+
file ios:iphonesimulator11.2/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
672+
file ios:iphonesimulator11.2/mobile-disable-ats-template.plist as "DisableATS.plist"
673+
file ios:iphonesimulator11.2/[email protected] as "Default4InchSplash.png" base ios:[email protected]
674+
file ios:iphonesimulator11.2/fontmap as "fontmap"
675675
into "[[ToolsFolder]]/Runtime/iOS/Device-9_2" place
676676
executable ios:iphoneos9.2/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone
677677
executable ios:iphoneos9.2/revsecurity.ios-extension as RevSecurity
@@ -712,26 +712,26 @@ component Runtime.iOS
712712
file ios:iphoneos10.2/mobile-disable-ats-template.plist as "DisableATS.plist"
713713
file ios:iphoneos10.2/[email protected] as "Default4InchSplash.png" base ios:[email protected]
714714
file ios:iphoneos10.2/fontmap as "fontmap"
715-
into "[[ToolsFolder]]/Runtime/iOS/Device-11_1" place
716-
executable ios:iphoneos11.1/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphoneos9.2/standalone-mobile[[BaseEditionTagLower]].ios-engine
717-
executable ios:iphoneos11.1/revsecurity.ios-extension as RevSecurity base ios:iphoneos9.2/revsecurity.ios-extension
718-
executable ios:iphoneos11.1/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphoneos9.2/revpdfprinter.ios-extension
719-
executable ios:iphoneos11.1/revzip.ios-extension as RevZip base ios:iphoneos9.2/revzip.ios-extension
720-
executable ios:iphoneos11.1/revxml.ios-extension as RevXml base ios:iphoneos9.2/revxml.ios-extension
721-
executable ios:iphoneos11.1/revdb.ios-extension as RevDb base ios:iphoneos9.2/revdb.ios-extension
722-
executable ios:iphoneos11.1/dbsqlite.ios-extension as DbSqlite base ios:iphoneos9.2/dbsqlite.ios-extension
723-
executable ios:iphoneos11.1/dbmysql.ios-extension as DbMysql base ios:iphoneos9.2/dbmysql.ios-extension
724-
file ios:iphoneos11.1/mobile-device-template.plist as "Settings.plist"
725-
file ios:iphoneos11.1/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
726-
file ios:iphoneos11.1/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
727-
file ios:iphoneos11.1/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
728-
file ios:iphoneos11.1/template-entitlements.xcent as "Entitlements.xcent"
729-
file ios:iphoneos11.1/template-beta-report-entitlement.xcent as "BetaReportEntitlement.xcent"
730-
file ios:iphoneos11.1/template-remote-notification-entitlements.xcent as "RemoteNotificationEntitlements.xcent"
731-
file ios:iphoneos11.1/template-remote-notification-store-entitlements.xcent as "RemoteNotificationStoreEntitlements.xcent"
732-
file ios:iphoneos11.1/mobile-disable-ats-template.plist as "DisableATS.plist"
733-
file ios:iphoneos11.1/[email protected] as "Default4InchSplash.png" base ios:[email protected]
734-
file ios:iphoneos11.1/fontmap as "fontmap"
715+
into "[[ToolsFolder]]/Runtime/iOS/Device-11_2" place
716+
executable ios:iphoneos11.2/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphoneos9.2/standalone-mobile[[BaseEditionTagLower]].ios-engine
717+
executable ios:iphoneos11.2/revsecurity.ios-extension as RevSecurity base ios:iphoneos9.2/revsecurity.ios-extension
718+
executable ios:iphoneos11.2/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphoneos9.2/revpdfprinter.ios-extension
719+
executable ios:iphoneos11.2/revzip.ios-extension as RevZip base ios:iphoneos9.2/revzip.ios-extension
720+
executable ios:iphoneos11.2/revxml.ios-extension as RevXml base ios:iphoneos9.2/revxml.ios-extension
721+
executable ios:iphoneos11.2/revdb.ios-extension as RevDb base ios:iphoneos9.2/revdb.ios-extension
722+
executable ios:iphoneos11.2/dbsqlite.ios-extension as DbSqlite base ios:iphoneos9.2/dbsqlite.ios-extension
723+
executable ios:iphoneos11.2/dbmysql.ios-extension as DbMysql base ios:iphoneos9.2/dbmysql.ios-extension
724+
file ios:iphoneos11.2/mobile-device-template.plist as "Settings.plist"
725+
file ios:iphoneos11.2/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
726+
file ios:iphoneos11.2/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
727+
file ios:iphoneos11.2/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
728+
file ios:iphoneos11.2/template-entitlements.xcent as "Entitlements.xcent"
729+
file ios:iphoneos11.2/template-beta-report-entitlement.xcent as "BetaReportEntitlement.xcent"
730+
file ios:iphoneos11.2/template-remote-notification-entitlements.xcent as "RemoteNotificationEntitlements.xcent"
731+
file ios:iphoneos11.2/template-remote-notification-store-entitlements.xcent as "RemoteNotificationStoreEntitlements.xcent"
732+
file ios:iphoneos11.2/mobile-disable-ats-template.plist as "DisableATS.plist"
733+
file ios:iphoneos11.2/[email protected] as "Default4InchSplash.png" base ios:[email protected]
734+
file ios:iphoneos11.2/fontmap as "fontmap"
735735

736736
////////////////////////////////////////////////////////////////////////////////
737737

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

3232
IOS_SDKS ?= \

‎buildbot.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@
4242
'x86_64-linux-debian8',
4343
'armv6-android-api9',
4444
'universal-mac-macosx10.9', # Minimum deployment target
45-
'universal-ios-iphoneos11.1',
45+
'universal-ios-iphoneos11.2',
4646
'universal-ios-iphoneos10.2',
4747
'universal-ios-iphoneos9.2',
48-
'universal-ios-iphonesimulator11.1',
48+
'universal-ios-iphonesimulator11.2',
4949
'universal-ios-iphonesimulator10.2',
5050
'universal-ios-iphonesimulator9.2',
5151
'universal-ios-iphonesimulator8.2',

0 commit comments

Comments
 (0)