Updating my flutter fork to master.

.travis.yml

@@ -22,7 +22,8 @@ env:
 before_script:
   - ./dev/bots/travis_setup.sh
 script:
-  - (./bin/cache/dart-sdk/bin/dart ./dev/bots/test.dart && ./dev/bots/travis_upload.sh)
+  # TODO(tvolkert): Re-enable `&& ./dev/bots/travis_upload.sh`
+  - (./bin/cache/dart-sdk/bin/dart ./dev/bots/test.dart)
 cache:
   directories:
     - $HOME/.pub-cache

CONTRIBUTING.md

@@ -8,7 +8,7 @@ _See also: [Flutter's code of conduct](https://flutter.io/design-principles/#cod
 Things you will need
 --------------------
 
- * Linux or Mac OS X. (Windows is not yet supported.)
+ * Linux, Mac OS X, or Windows
  * git (used for source version control).
  * An IDE. We recommend [IntelliJ with the Flutter plugin](https://flutter.io/intellij-ide/).
  * An ssh client (used to authenticate with GitHub).
@@ -92,6 +92,8 @@ assume you want to check a single package and the flutter repository has several
 Running the tests
 -----------------
 
+_The `flutter test` command is not available on Windows (See [#8516](https://github.com/flutter/flutter/issues/8516))._
+
 To automatically find all files named `_test.dart` inside a package's `test/` subdirectory, and run them inside the flutter shell as a test, use the `flutter test` command, e.g:
 
  * `cd examples/stocks`

VERSION

@@ -6,4 +6,4 @@
 # incompatible way, this version number might not change. Instead, the version
 # number for package:flutter will update to reflect that change.
 
-0.0.11-dev
+0.0.12-dev

bin/internal/dart-sdk.version

@@ -1 +1 @@
-1.24.0-dev.6.7
+1.24.0

bin/internal/engine.version

@@ -1 +1 @@
-fffe502d437ac7931f08c6cef3e3f71fbd36adaa
+8a2d337446ca076048608c6b6a932110e7c0f9c9

bin/internal/gradle_wrapper.version

@@ -0,0 +1 @@
+0b5c1398d1d04ac245a310de98825cb7b3278e2a

dev/benchmarks/microbenchmarks/lib/stocks/animation_bench.dart

@@ -35,7 +35,7 @@ class BenchmarkingBinding extends LiveTestWidgetsFlutterBinding {
 
 Future<Null> main() async {
   assert(false); // don't run this in checked mode! Use --release.
-  stock_data.StockDataFetcher.actuallyFetchData = false;
+  stock_data.StockData.actuallyFetchData = false;
 
   final Stopwatch wallClockWatch = new Stopwatch();
   final Stopwatch cpuWatch = new Stopwatch();

dev/benchmarks/microbenchmarks/lib/stocks/build_bench.dart

@@ -17,7 +17,7 @@ const Duration kBenchmarkTime = const Duration(seconds: 15);
 
 Future<Null> main() async {
   assert(false); // don't run this in checked mode! Use --release.
-  stock_data.StockDataFetcher.actuallyFetchData = false;
+  stock_data.StockData.actuallyFetchData = false;
 
   // This allows us to call onBeginFrame even when the engine didn't request it,
   // and have it actually do something:

dev/benchmarks/microbenchmarks/lib/stocks/layout_bench.dart

@@ -16,7 +16,7 @@ import '../common.dart';
 const Duration kBenchmarkTime = const Duration(seconds: 15);
 
 Future<Null> main() async {
-  stock_data.StockDataFetcher.actuallyFetchData = false;
+  stock_data.StockData.actuallyFetchData = false;
 
   // This allows us to call onBeginFrame even when the engine didn't request it,
   // and have it actually do something:

dev/bots/docs.sh

@@ -14,7 +14,7 @@ bin/cache/dart-sdk/bin/pub global activate dartdoc 0.13.0+1
 # a custom index.html, placing everything into dev/docs/doc.
 (cd dev/tools; ../../bin/cache/dart-sdk/bin/pub get)
 FLUTTER_ROOT=$PWD bin/cache/dart-sdk/bin/dart dev/tools/dartdoc.dart
-FLUTTER_ROOT=$PWD bin/cache/dart-sdk/bin/dart dev/tools/javadoc.dart
+FLUTTER_ROOT=$PWD bin/cache/dart-sdk/bin/dart dev/tools/java_and_objc_doc.dart
 
 # Ensure google webmaster tools can verify our site.
 cp dev/docs/google2ed1af765c529f57.html dev/docs/doc

dev/bots/travis_setup.sh

@@ -5,10 +5,11 @@ echo $KEY_FILE | base64 --decode > ../gcloud_key_file.json
 
 set -x
 
-if [ -n "$TRAVIS" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
-  export CLOUDSDK_CORE_DISABLE_PROMPTS=1
-  curl https://sdk.cloud.google.com | bash
-fi
+# TODO(tvolkert): Re-enable once this is able to successfully run on Travis
+#if [ -n "$TRAVIS" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
+#  export CLOUDSDK_CORE_DISABLE_PROMPTS=1
+#  curl https://sdk.cloud.google.com | bash
+#fi
 
 # disable analytics on the bots and download Flutter dependencies
 ./bin/flutter config --no-analytics

dev/bots/travis_upload.sh

@@ -6,7 +6,10 @@ export PATH="$PWD/bin:$PWD/bin/cache/dart-sdk/bin:$PATH"
 
 LCOV_FILE=./packages/flutter/coverage/lcov.info
 
-if [ "$SHARD" = "coverage" ] && [ "$TRAVIS_PULL_REQUEST" = "false" ] && [ "$TRAVIS_BRANCH" = "master" ] && [ -f "$LCOV_FILE" ]; then
+if [ "$SHARD" = "coverage" ] && \
+   [ "$TRAVIS_PULL_REQUEST" = "false" ] && \
+   [ "$TRAVIS_BRANCH" = "master" ] && \
+   [ -f "$LCOV_FILE" ]; then
   GSUTIL=$HOME/google-cloud-sdk/bin/gsutil
   GCLOUD=$HOME/google-cloud-sdk/bin/gcloud
 

dev/devicelab/bin/tasks/routing_test.dart

@@ -0,0 +1,85 @@
+// Copyright (c) 2016 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:async';
+import 'dart:convert';
+import 'dart:io';
+
+import 'package:path/path.dart' as path;
+
+import 'package:flutter_devicelab/framework/adb.dart';
+import 'package:flutter_devicelab/framework/framework.dart';
+import 'package:flutter_devicelab/framework/utils.dart';
+
+void main() {
+  task(() async {
+    final Device device = await devices.workingDevice;
+    await device.unlock();
+    final Directory appDir = dir(path.join(flutterDirectory.path, 'dev/integration_tests/ui'));
+    section('TEST WHETHER `flutter drive --route` WORKS');
+    await inDirectory(appDir, () async {
+      return await flutter(
+        'drive',
+        options: <String>['--verbose', '-d', device.deviceId, '--route', '/smuggle-it', 'lib/route.dart'],
+        canFail: false,
+      );
+    });
+    section('TEST WHETHER `flutter run --route` WORKS');
+    await inDirectory(appDir, () async {
+      final Completer<Null> ready = new Completer<Null>();
+      bool ok;
+      print('run: starting...');
+      final Process run = await startProcess(
+        path.join(flutterDirectory.path, 'bin', 'flutter'),
+        <String>['run', '--verbose', '--observatory-port=8888', '-d', device.deviceId, '--route', '/smuggle-it', 'lib/route.dart'],
+      );
+      run.stdout
+        .transform(UTF8.decoder)
+        .transform(const LineSplitter())
+        .listen((String line) {
+          print('run:stdout: $line');
+          if (line == '[            ] For a more detailed help message, press "h". To quit, press "q".') {
+            print('run: ready!');
+            ready.complete();
+            ok ??= true;
+          }
+        });
+      run.stderr
+        .transform(UTF8.decoder)
+        .transform(const LineSplitter())
+        .listen((String line) {
+          stderr.writeln('run:stderr: $line');
+        });
+      run.exitCode.then((int exitCode) { ok = false; });
+      await Future.any<dynamic>(<Future<dynamic>>[ ready.future, run.exitCode ]);
+      if (!ok)
+        throw 'Failed to run test app.';
+      print('drive: starting...');
+      final Process drive = await startProcess(
+        path.join(flutterDirectory.path, 'bin', 'flutter'),
+        <String>['drive', '--use-existing-app', 'http://127.0.0.1:8888/', '--no-keep-app-running', 'lib/route.dart'],
+      );
+      drive.stdout
+        .transform(UTF8.decoder)
+        .transform(const LineSplitter())
+        .listen((String line) {
+          print('drive:stdout: $line');
+        });
+      drive.stderr
+        .transform(UTF8.decoder)
+        .transform(const LineSplitter())
+        .listen((String line) {
+          stderr.writeln('drive:stderr: $line');
+        });
+      int result;
+      result = await drive.exitCode;
+      if (result != 0)
+        throw 'Failed to drive test app (exit code $result).';
+      result = await run.exitCode;
+      if (result != 0)
+        throw 'Received unexpected exit code $result from run process.';
+    });
+    return new TaskResult.success(null);
+  });
+}

dev/devicelab/lib/framework/adb.dart

@@ -152,7 +152,7 @@ class AndroidDeviceDiscovery implements DeviceDiscovery {
           results.add(deviceID);
         }
       } else {
-        throw 'Failed to parse device from adb output: $line';
+        throw 'Failed to parse device from adb output: "$line"';
       }
     }
 
@@ -259,6 +259,7 @@ class AndroidDevice implements Device {
   Future<Map<String, dynamic>> getMemoryStats(String packageName) async {
     final String meminfo = await shellEval('dumpsys', <String>['meminfo', packageName]);
     final Match match = new RegExp(r'TOTAL\s+(\d+)').firstMatch(meminfo);
+    assert(match != null, 'could not parse dumpsys meminfo output');
     return <String, dynamic>{
       'total_kb': int.parse(match.group(1)),
     };

dev/devicelab/lib/framework/framework.dart

@@ -26,7 +26,7 @@ bool _isTaskRegistered = false;
 
 /// Registers a [task] to run, returns the result when it is complete.
 ///
-/// Note, the task does not run immediately but waits for the request via the
+/// The task does not run immediately but waits for the request via the
 /// VM service protocol to run it.
 ///
 /// It is ok for a [task] to perform many things. However, only one task can be

dev/devicelab/lib/framework/utils.dart

@@ -5,6 +5,7 @@
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
+import 'dart:math' as math;
 
 import 'package:args/args.dart';
 import 'package:meta/meta.dart';
@@ -116,7 +117,12 @@ void mkdirs(Directory directory) {
 bool exists(FileSystemEntity entity) => entity.existsSync();
 
 void section(String title) {
-  print('\n••• $title •••');
+  title = '╡ ••• $title ••• ╞';
+  final String line = '═' * math.max((80 - title.length) ~/ 2, 2);
+  String output = '$line$title$line';
+  if (output.length == 79)
+    output += '═';
+  print('\n\n$output\n');
 }
 
 Future<String> getDartVersion() async {
@@ -167,7 +173,7 @@ Future<Process> startProcess(
   String workingDirectory,
 }) async {
   final String command = '$executable ${arguments?.join(" ") ?? ""}';
-  print('Executing: $command');
+  print('\nExecuting: $command');
   environment ??= <String, String>{};
   environment['BOT'] = 'true';
   final Process process = await _processManager.start(
@@ -178,7 +184,8 @@ Future<Process> startProcess(
   final ProcessInfo processInfo = new ProcessInfo(command, process);
   _runningProcesses.add(processInfo);
 
-  process.exitCode.whenComplete(() {
+  process.exitCode.then((int exitCode) {
+    print('exitcode: $exitCode');
     _runningProcesses.remove(processInfo);
   });
 
@@ -211,15 +218,22 @@ Future<int> exec(
 }) async {
   final Process process = await startProcess(executable, arguments, environment: environment);
 
+  final Completer<Null> stdoutDone = new Completer<Null>();
+  final Completer<Null> stderrDone = new Completer<Null>();
   process.stdout
       .transform(UTF8.decoder)
       .transform(const LineSplitter())
-      .listen(print);
+      .listen((String line) {
+        print('stdout: $line');
+      }, onDone: () { stdoutDone.complete(); });
   process.stderr
       .transform(UTF8.decoder)
       .transform(const LineSplitter())
-      .listen(stderr.writeln);
+      .listen((String line) {
+        print('stderr: $line');
+      }, onDone: () { stderrDone.complete(); });
 
+  await Future.wait<Null>(<Future<Null>>[stdoutDone.future, stderrDone.future]);
   final int exitCode = await process.exitCode;
 
   if (exitCode != 0 && !canFail)
@@ -230,24 +244,39 @@ Future<int> exec(
 
 /// Executes a command and returns its standard output as a String.
 ///
-/// Standard error is redirected to the current process' standard error stream.
+/// For logging purposes, the command's output is also printed out.
 Future<String> eval(
   String executable,
   List<String> arguments, {
   Map<String, String> environment,
   bool canFail: false,
 }) async {
   final Process process = await startProcess(executable, arguments, environment: environment);
-  process.stderr.listen((List<int> data) {
-    stderr.add(data);
-  });
-  final String output = await UTF8.decodeStream(process.stdout);
+
+  final StringBuffer output = new StringBuffer();
+  final Completer<Null> stdoutDone = new Completer<Null>();
+  final Completer<Null> stderrDone = new Completer<Null>();
+  process.stdout
+      .transform(UTF8.decoder)
+      .transform(const LineSplitter())
+      .listen((String line) {
+        print('stdout: $line');
+        output.writeln(line);
+      }, onDone: () { stdoutDone.complete(); });
+  process.stderr
+      .transform(UTF8.decoder)
+      .transform(const LineSplitter())
+      .listen((String line) {
+        print('stderr: $line');
+      }, onDone: () { stderrDone.complete(); });
+
+  await Future.wait<Null>(<Future<Null>>[stdoutDone.future, stderrDone.future]);
   final int exitCode = await process.exitCode;
 
   if (exitCode != 0 && !canFail)
     fail('Executable failed with exit code $exitCode.');
 
-  return output.trimRight();
+  return output.toString().trimRight();
 }
 
 Future<int> flutter(String command, {

dev/devicelab/lib/tasks/microbenchmarks.dart

@@ -59,7 +59,7 @@ TaskFunction createMicrobenchmarkTask() {
 }
 
 Future<Process> _startFlutter({
-  String command = 'run',
+  String command: 'run',
   List<String> options: const <String>[],
   bool canFail: false,
   Map<String, String> environment,

dev/devicelab/manifest.yaml

@@ -119,13 +119,18 @@ tasks:
       Builds sample catalog markdown pages and Android screenshots
     stage: devicelab
     required_agent_capabilities: ["has-android-device"]
-    flaky: true
 
   complex_layout_semantics_perf:
     description: >
       Measures duration of building the initial semantics tree.
     stage: devicelab
     required_agent_capabilities: ["linux/android"]
+
+  routing_test:
+    description: >
+      Verifies that `flutter drive --route` still works. No performance numbers.
+    stage: devicelab
+    required_agent_capabilities: ["linux/android"]
     flaky: true
 
   # iOS on-device tests
@@ -277,7 +282,6 @@ tasks:
       with semantics enabled.
     stage: devicelab
     required_agent_capabilities: ["linux/android"]
-    flaky: true
 
   flutter_gallery__memory_nav:
     description: >

dev/devicelab/test/manifest_test.dart

@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'dart:io';
+
 import 'package:test/test.dart';
 
 import 'package:flutter_devicelab/framework/manifest.dart';
@@ -16,6 +18,12 @@ void main() {
       expect(task.description, 'Measures the startup time of the Flutter Gallery app on Android.\n');
       expect(task.stage, 'devicelab');
       expect(task.requiredAgentCapabilities, <String>['linux/android']);
+
+      for (ManifestTask task in manifest.tasks) {
+        final File taskFile = new File('bin/tasks/${task.name}.dart');
+        expect(taskFile.existsSync(), true,
+          reason: 'File ${taskFile.path} corresponding to manifest task "${task.name}" not found');
+      }
     });
   });
 

dev/docs/platform_integration/lib/ios.dart

@@ -0,0 +1,2 @@
+/// [Flutter platform integration APIs for iOS.](https://docs.flutter.io/objcdoc/)
+library iOS;