From aef9804784ee5d6ea3e9b6fd9af2d363083dfdca Mon Sep 17 00:00:00 2001 From: asiva Date: Thu, 27 Sep 2018 13:23:55 -0700 Subject: [PATCH] Roll engine to version d80c1de7b53af81a0b4385eb3f13de1ef77f0d2d Contains the following changes: d80c1de7b (HEAD -> master, upstream/master) Roll src/third_party/skia ab3144c3abb9..656cefe65d62 (11 commits) (#6362) edf6249e0 Add pushOffset to SceneBuilder (#6349) 3a01f3956 Change log level from ERROR to WARNING (#6361) 5ae470845 Roll src/third_party/skia 227d4e10276c..ab3144c3abb9 (11 commits) (#6360) 763627fff Do not export libdart symbols (#6337) 3052dbd79 SystemNavigator.pop can pop w/o UINavigationController (#6341) 0c096f798 Roll src/third_party/skia b3e48afc936d..227d4e10276c (1 commits) (#6359) b8c2a17a1 Roll src/third_party/skia cfe1264d7465..b3e48afc936d (3 commits) (#6356) c589b312a Expose push/popRoute on FlutterViewController (#6347) 075b3fcca Roll src/third_party/skia 5ea41fc89b26..cfe1264d7465 (1 commits) (#6355) 2dd9b99aa Roll Dart to version 808ed6238b9262660e31ea826f7aea6cfa3a3493 (#6354) 5b799381f Dont make any binaries specify an X11 dependency. (#6353) 309ac4e1b V0.8.2 fix compile problem with xcode10 (#6339) 26fdd1e4f Roll src/third_party/skia 5767fc042834..5ea41fc89b26 (3 commits) (#6351) cc44ca5d0 Perform persistent cache stores on the IO thread outside the frame workload. (#6350) f2a3df97e Wire up the Skia persistent GPU related artifacts cache. (#6278) --- bin/internal/engine.version | 2 +- packages/flutter_tools/test/dart_dependencies_test.dart | 2 +- .../test/data/dart_dependencies_test/bad_import/main.dart | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/internal/engine.version b/bin/internal/engine.version index 1e4030e3c0b..9bf6c53bec6 100644 --- a/bin/internal/engine.version +++ b/bin/internal/engine.version @@ -1 +1 @@ -9d4b80a60cb50ab48ee42e5689ef3263e1326efc +d80c1de7b53af81a0b4385eb3f13de1ef77f0d2d diff --git a/packages/flutter_tools/test/dart_dependencies_test.dart b/packages/flutter_tools/test/dart_dependencies_test.dart index dbfdc26509b..899701c2f86 100644 --- a/packages/flutter_tools/test/dart_dependencies_test.dart +++ b/packages/flutter_tools/test/dart_dependencies_test.dart @@ -92,7 +92,7 @@ void main() { builder.build(); fail('expect an exception to be thrown.'); } on DartDependencyException catch (error) { - expect(error.toString(), contains('Unable to parse URI')); + expect(error.toString(), contains("Couldn't parse URI")); } }); }); diff --git a/packages/flutter_tools/test/data/dart_dependencies_test/bad_import/main.dart b/packages/flutter_tools/test/data/dart_dependencies_test/bad_import/main.dart index c886ae45163..7f22c9066b7 100644 --- a/packages/flutter_tools/test/data/dart_dependencies_test/bad_import/main.dart +++ b/packages/flutter_tools/test/data/dart_dependencies_test/bad_import/main.dart @@ -2,4 +2,4 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import '[object Object].dart'; +import 'data://object.dart';