Revert "Roll engine after dart roll (#12473)" (#12477)
This reverts commit e7061698147e80fa53ec3ed0cf048f4d68df7d68.
This causes preview-dart-2 test failures.
diff --git a/bin/internal/engine.version b/bin/internal/engine.version
index 2ea392a..94a5f30 100644
--- a/bin/internal/engine.version
+++ b/bin/internal/engine.version
@@ -1 +1 @@
-74e58f66d492a28a2c47ac5402d0b8b8a740cf62
+459f722b86415da01386fe41f37bafa842f11ae8
diff --git a/packages/flutter/lib/src/cupertino/route.dart b/packages/flutter/lib/src/cupertino/route.dart
index a2a9b3a..46355ad 100644
--- a/packages/flutter/lib/src/cupertino/route.dart
+++ b/packages/flutter/lib/src/cupertino/route.dart
@@ -88,9 +88,8 @@
assert(settings != null),
assert(maintainState != null),
assert(fullscreenDialog != null),
- super(settings: settings, fullscreenDialog: fullscreenDialog) {
- assert(opaque); // PageRoute makes it return true.
- }
+ assert(opaque), // PageRoute makes it return true.
+ super(settings: settings, fullscreenDialog: fullscreenDialog);
/// Builds the primary contents of the route.
final WidgetBuilder builder;
diff --git a/packages/flutter/lib/src/foundation/assertions.dart b/packages/flutter/lib/src/foundation/assertions.dart
index 02c164a..80c28d1 100644
--- a/packages/flutter/lib/src/foundation/assertions.dart
+++ b/packages/flutter/lib/src/foundation/assertions.dart
@@ -329,7 +329,7 @@
'_FakeAsync',
'_FrameCallbackEntry',
];
- final RegExp stackParser = new RegExp(r'^#[0-9]+ +([^.]+).* \(([^/]*)/.+:[0-9]+(?::[0-9]+)?\)$');
+ final RegExp stackParser = new RegExp(r'^#[0-9]+ +([^.]+).* \(([^/]*)/[^:]+:[0-9]+(?::[0-9]+)?\)$');
final RegExp packageParser = new RegExp(r'^([^:]+):(.+)$');
final List<String> result = <String>[];
final List<String> skipped = <String>[];
diff --git a/packages/flutter/lib/src/material/page.dart b/packages/flutter/lib/src/material/page.dart
index a400175..967277d 100644
--- a/packages/flutter/lib/src/material/page.dart
+++ b/packages/flutter/lib/src/material/page.dart
@@ -70,9 +70,8 @@
this.maintainState: true,
bool fullscreenDialog: false,
}) : assert(builder != null),
- super(settings: settings, fullscreenDialog: fullscreenDialog) {
- assert(opaque);
- }
+ assert(opaque),
+ super(settings: settings, fullscreenDialog: fullscreenDialog);
/// Builds the primary contents of the route.
final WidgetBuilder builder;
diff --git a/packages/flutter/lib/src/widgets/pages.dart b/packages/flutter/lib/src/widgets/pages.dart
index 026d6d0..6923837 100644
--- a/packages/flutter/lib/src/widgets/pages.dart
+++ b/packages/flutter/lib/src/widgets/pages.dart
@@ -81,11 +81,10 @@
this.maintainState: true,
}) : assert(pageBuilder != null),
assert(transitionsBuilder != null),
+ assert(opaque != null),
assert(barrierDismissible != null),
assert(maintainState != null),
- super(settings: settings) {
- assert(opaque != null);
- }
+ super(settings: settings);
/// Used build the route's primary contents.
///
