Merging changes from flutter/flutter

.travis.yml

@@ -17,6 +17,7 @@ install:
 env:
   - SHARD=analyze
   - SHARD=tests
+  - SHARD=coverage
   - SHARD=docs
 before_script:
   - ./dev/bots/travis_setup.sh

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.10-dev
+0.0.11-dev

bin/internal/engine.version

@@ -1 +1 @@
-18fdfb86bb3876fcbb4e1d25e5b2aad0c5cd669f
+fffe502d437ac7931f08c6cef3e3f71fbd36adaa

dev/benchmarks/complex_layout/android/app/build.gradle

@@ -48,7 +48,7 @@ flutter {
 }
 
 dependencies {
-    androidTestCompile 'com.android.support:support-annotations:25.0.0'
+    androidTestCompile 'com.android.support:support-annotations:25.4.0'
     androidTestCompile 'com.android.support.test:runner:0.5'
     androidTestCompile 'com.android.support.test:rules:0.5'
 }

dev/benchmarks/complex_layout/android/build.gradle

@@ -11,6 +11,9 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        maven {
+            url "https://maven.google.com"
+        }
     }
 }
 

dev/benchmarks/microbenchmarks/android/app/build.gradle

@@ -40,7 +40,7 @@ flutter {
 }
 
 dependencies {
-    androidTestCompile 'com.android.support:support-annotations:25.0.0'
+    androidTestCompile 'com.android.support:support-annotations:25.4.0'
     androidTestCompile 'com.android.support.test:runner:0.5'
     androidTestCompile 'com.android.support.test:rules:0.5'
 }

dev/benchmarks/microbenchmarks/android/build.gradle

@@ -11,6 +11,9 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        maven {
+            url "https://maven.google.com"
+        }
     }
 }
 

dev/bots/analyze-sample-code.dart

@@ -130,6 +130,7 @@ Future<Null> main() async {
     }
     final List<String> buffer = <String>[];
     buffer.add('// generated code');
+    buffer.add('import \'dart:async\';');
     buffer.add('import \'dart:math\' as math;');
     buffer.add('import \'dart:ui\' as ui;');
     for (FileSystemEntity file in flutterPackage.listSync(recursive: false, followLinks: false)) {

dev/bots/docs.sh

@@ -8,7 +8,7 @@ set -e
 bin/flutter --version
 
 # Install dartdoc.
-bin/cache/dart-sdk/bin/pub global activate dartdoc 0.12.0
+bin/cache/dart-sdk/bin/pub global activate dartdoc 0.13.0+1
 
 # This script generates a unified doc set, and creates
 # a custom index.html, placing everything into dev/docs/doc.

dev/bots/test.dart

@@ -8,6 +8,8 @@ import 'dart:io';
 
 import 'package:path/path.dart' as path;
 
+typedef Future<Null> ShardRunner();
+
 final String flutterRoot = path.dirname(path.dirname(path.dirname(path.fromUri(Platform.script))));
 final String flutter = path.join(flutterRoot, 'bin', Platform.isWindows ? 'flutter.bat' : 'flutter');
 final String dart = path.join(flutterRoot, 'bin', 'cache', 'dart-sdk', 'bin', Platform.isWindows ? 'dart.exe' : 'dart');
@@ -22,6 +24,13 @@ final String yellow = hasColor ? '\x1B[33m' : '';
 final String cyan = hasColor ? '\x1B[36m' : '';
 final String reset = hasColor ? '\x1B[0m' : '';
 
+const Map<String, ShardRunner> _kShards = const <String, ShardRunner>{
+  'docs': _generateDocs,
+  'analyze': _analyzeRepo,
+  'tests': _runTests,
+  'coverage': _runCoverage,
+};
+
 /// When you call this, you can set FLUTTER_TEST_ARGS to pass custom
 /// arguments to flutter test. For example, you might want to call this
 /// script using FLUTTER_TEST_ARGS=--local-engine=host_debug_unopt to
@@ -33,94 +42,111 @@ final String reset = hasColor ? '\x1B[0m' : '';
 /// SHARD=analyze bin/cache/dart-sdk/bin/dart dev/bots/test.dart
 /// FLUTTER_TEST_ARGS=--local-engine=host_debug_unopt bin/cache/dart-sdk/bin/dart dev/bots/test.dart
 Future<Null> main() async {
-  if (Platform.environment['SHARD'] == 'docs') {
-    print('${bold}DONE: test.dart does nothing in the docs shard.$reset');
-  } else if (Platform.environment['SHARD'] == 'analyze') {
-    // Analyze all the Dart code in the repo.
-    await _runFlutterAnalyze(flutterRoot,
-      options: <String>['--flutter-repo'],
-    );
+  final String shard = Platform.environment['SHARD'] ?? 'tests';
+  if (!_kShards.containsKey(shard))
+    throw new ArgumentError('Invalid shard: $shard');
+  await _kShards[shard]();
+}
 
-    // Analyze all the sample code in the repo
-    await _runCommand(dart, <String>[path.join(flutterRoot, 'dev', 'bots', 'analyze-sample-code.dart')],
-      workingDirectory: flutterRoot,
-    );
+Future<Null> _generateDocs() async {
+  print('${bold}DONE: test.dart does nothing in the docs shard.$reset');
+}
 
-    // Try with the --watch analyzer, to make sure it returns success also.
-    // The --benchmark argument exits after one run.
-    await _runFlutterAnalyze(flutterRoot,
-      options: <String>['--flutter-repo', '--watch', '--benchmark'],
-    );
+Future<Null> _analyzeRepo() async {
+  // Analyze all the Dart code in the repo.
+  await _runFlutterAnalyze(flutterRoot,
+    options: <String>['--flutter-repo'],
+  );
 
-    // Try an analysis against a big version of the gallery.
-    await _runCommand(dart, <String>[path.join(flutterRoot, 'dev', 'tools', 'mega_gallery.dart')],
-      workingDirectory: flutterRoot,
-    );
-    await _runFlutterAnalyze(path.join(flutterRoot, 'dev', 'benchmarks', 'mega_gallery'),
-      options: <String>['--watch', '--benchmark'],
-    );
+  // Analyze all the sample code in the repo
+  await _runCommand(dart, <String>[path.join(flutterRoot, 'dev', 'bots', 'analyze-sample-code.dart')],
+    workingDirectory: flutterRoot,
+  );
 
-    print('${bold}DONE: Analysis successful.$reset');
-  } else {
-    // Verify that the tests actually return failure on failure and success on success.
-    final String automatedTests = path.join(flutterRoot, 'dev', 'automated_tests');
-    await _runFlutterTest(automatedTests,
-      script: path.join('test_smoke_test', 'fail_test.dart'),
-      expectFailure: true,
-      printOutput: false,
-    );
-    await _runFlutterTest(automatedTests,
-      script: path.join('test_smoke_test', 'pass_test.dart'),
-      printOutput: false,
-    );
-    await _runFlutterTest(automatedTests,
-      script: path.join('test_smoke_test', 'crash1_test.dart'),
-      expectFailure: true,
-      printOutput: false,
-    );
-    await _runFlutterTest(automatedTests,
-      script: path.join('test_smoke_test', 'crash2_test.dart'),
-      expectFailure: true,
-      printOutput: false,
-    );
-    await _runFlutterTest(automatedTests,
-      script: path.join('test_smoke_test', 'syntax_error_test.broken_dart'),
-      expectFailure: true,
-      printOutput: false,
-    );
-    await _runFlutterTest(automatedTests,
-      script: path.join('test_smoke_test', 'missing_import_test.broken_dart'),
-      expectFailure: true,
-      printOutput: false,
-    );
-    await _runCommand(flutter, <String>['drive', '--use-existing-app', '-t', path.join('test_driver', 'failure.dart')],
-      workingDirectory: path.join(flutterRoot, 'packages', 'flutter_driver'),
-      expectFailure: true,
-      printOutput: false,
-    );
+  // Try with the --watch analyzer, to make sure it returns success also.
+  // The --benchmark argument exits after one run.
+  await _runFlutterAnalyze(flutterRoot,
+    options: <String>['--flutter-repo', '--watch', '--benchmark'],
+  );
 
-    final List<String> coverageFlags = <String>[];
-    if (Platform.environment['TRAVIS'] != null && Platform.environment['TRAVIS_PULL_REQUEST'] == 'false')
-      coverageFlags.add('--coverage');
+  // Try an analysis against a big version of the gallery.
+  await _runCommand(dart, <String>[path.join(flutterRoot, 'dev', 'tools', 'mega_gallery.dart')],
+    workingDirectory: flutterRoot,
+  );
+  await _runFlutterAnalyze(path.join(flutterRoot, 'dev', 'benchmarks', 'mega_gallery'),
+    options: <String>['--watch', '--benchmark'],
+  );
 
-    // Run tests.
-    await _runFlutterTest(path.join(flutterRoot, 'packages', 'flutter'),
-      options: coverageFlags,
-    );
-    await _runFlutterTest(path.join(flutterRoot, 'packages', 'flutter_driver'));
-    await _runFlutterTest(path.join(flutterRoot, 'packages', 'flutter_test'));
-    await _pubRunTest(path.join(flutterRoot, 'packages', 'flutter_tools'));
-
-    await _runAllDartTests(path.join(flutterRoot, 'dev', 'devicelab'));
-    await _runFlutterTest(path.join(flutterRoot, 'dev', 'manual_tests'));
-    await _runFlutterTest(path.join(flutterRoot, 'examples', 'hello_world'));
-    await _runFlutterTest(path.join(flutterRoot, 'examples', 'layers'));
-    await _runFlutterTest(path.join(flutterRoot, 'examples', 'stocks'));
-    await _runFlutterTest(path.join(flutterRoot, 'examples', 'flutter_gallery'));
-    await _runFlutterTest(path.join(flutterRoot, 'examples', 'catalog'));
-
-    print('${bold}DONE: All tests successful.$reset');
+  print('${bold}DONE: Analysis successful.$reset');
+}
+
+Future<Null> _runTests() async {
+  // Verify that the tests actually return failure on failure and success on success.
+  final String automatedTests = path.join(flutterRoot, 'dev', 'automated_tests');
+  await _runFlutterTest(automatedTests,
+    script: path.join('test_smoke_test', 'fail_test.dart'),
+    expectFailure: true,
+    printOutput: false,
+  );
+  await _runFlutterTest(automatedTests,
+    script: path.join('test_smoke_test', 'pass_test.dart'),
+    printOutput: false,
+  );
+  await _runFlutterTest(automatedTests,
+    script: path.join('test_smoke_test', 'crash1_test.dart'),
+    expectFailure: true,
+    printOutput: false,
+  );
+  await _runFlutterTest(automatedTests,
+    script: path.join('test_smoke_test', 'crash2_test.dart'),
+    expectFailure: true,
+    printOutput: false,
+  );
+  await _runFlutterTest(automatedTests,
+    script: path.join('test_smoke_test', 'syntax_error_test.broken_dart'),
+    expectFailure: true,
+    printOutput: false,
+  );
+  await _runFlutterTest(automatedTests,
+    script: path.join('test_smoke_test', 'missing_import_test.broken_dart'),
+    expectFailure: true,
+    printOutput: false,
+  );
+  await _runCommand(flutter, <String>['drive', '--use-existing-app', '-t', path.join('test_driver', 'failure.dart')],
+    workingDirectory: path.join(flutterRoot, 'packages', 'flutter_driver'),
+    expectFailure: true,
+    printOutput: false,
+  );
+
+  // Run tests.
+  await _runFlutterTest(path.join(flutterRoot, 'packages', 'flutter'));
+  await _runFlutterTest(path.join(flutterRoot, 'packages', 'flutter_driver'));
+  await _runFlutterTest(path.join(flutterRoot, 'packages', 'flutter_test'));
+  await _pubRunTest(path.join(flutterRoot, 'packages', 'flutter_tools'));
+
+  await _runAllDartTests(path.join(flutterRoot, 'dev', 'devicelab'));
+  await _runFlutterTest(path.join(flutterRoot, 'dev', 'manual_tests'));
+  await _runFlutterTest(path.join(flutterRoot, 'examples', 'hello_world'));
+  await _runFlutterTest(path.join(flutterRoot, 'examples', 'layers'));
+  await _runFlutterTest(path.join(flutterRoot, 'examples', 'stocks'));
+  await _runFlutterTest(path.join(flutterRoot, 'examples', 'flutter_gallery'));
+  await _runFlutterTest(path.join(flutterRoot, 'examples', 'catalog'));
+
+  print('${bold}DONE: All tests successful.$reset');
+}
+
+Future<Null> _runCoverage() async {
+  if (Platform.environment['TRAVIS'] == null ||
+      Platform.environment['TRAVIS_PULL_REQUEST'] != 'false') {
+    print('${bold}DONE: test.dart does not run coverage for Travis pull requests');
+    return;
   }
+
+  await _runFlutterTest(path.join(flutterRoot, 'packages', 'flutter'),
+    options: const <String>['--coverage'],
+  );
+
+  print('${bold}DONE: Coverage collection successful.$reset');
 }
 
 Future<Null> _pubRunTest(

dev/bots/travis_upload.sh

@@ -6,7 +6,7 @@ export PATH="$PWD/bin:$PWD/bin/cache/dart-sdk/bin:$PATH"
 
 LCOV_FILE=./packages/flutter/coverage/lcov.info
 
-if [ "$SHARD" = "tests" ] && [ "$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/lib/framework/adb.dart

@@ -306,16 +306,31 @@ class IosDeviceDiscovery implements DeviceDiscovery {
     _workingDevice = allDevices[new math.Random().nextInt(allDevices.length)];
   }
 
+  // Physical device line format to be matched:
+  // My iPhone (10.3.2) [75b90e947c5f429fa67f3e9169fda0d89f0492f1]
+  //
+  // Other formats in output (desktop, simulator) to be ignored:
+  // my-mac-pro [2C10513E-4dA5-405C-8EF5-C44353DB3ADD]
+  // iPhone 6s (9.3) [F6CEE7CF-81EB-4448-81B4-1755288C7C11] (Simulator)
+  static final RegExp _deviceRegex = new RegExp(r'^.* +\(.*\) +\[(.*)\]$');
+
   @override
   Future<List<String>> discoverDevices() async {
-    // TODO: use the -k UniqueDeviceID option, which requires much less parsing.
-    final List<String> iosDeviceIds = grep('UniqueDeviceID', from: await eval('ideviceinfo', <String>[]))
-      .map((String line) => line.split(' ').last).toList();
-
-    if (iosDeviceIds.isEmpty)
+    final List<String> iosDeviceIDs = <String>[];
+    final Iterable<String> deviceLines = (await eval('instruments', <String>['-s', 'devices']))
+        .split('\n')
+        .map((String line) => line.trim());
+    for (String line in deviceLines) {
+      final Match match = _deviceRegex.firstMatch(line);
+      if (match != null) {
+        final String deviceID = match.group(1);
+        iosDeviceIDs.add(deviceID);
+      }
+    }
+    if (iosDeviceIDs.isEmpty)
       throw 'No connected iOS devices found.';
 
-    return iosDeviceIds;
+    return iosDeviceIDs;
   }
 
   @override

dev/devicelab/lib/framework/ios.dart

@@ -16,11 +16,17 @@ const String _kTestXcconfigFileName = 'TestConfig.xcconfig';
 const FileSystem _fs = const io.LocalFileSystem();
 
 /// Patches the given Xcode project adding provisioning certificates and team
-/// information required to build and run the project.
+/// information required to build and run the project, if
+/// FLUTTER_DEVICELAB_XCODE_PROVISIONING_CONFIG is set. If it is not set,
+/// we rely on automatic signing by Xcode.
 Future<Null> prepareProvisioningCertificates(String flutterProjectPath) async {
   final String certificateConfig = await _readProvisioningConfigFile();
-  await _patchXcconfigFilesIfNotPatched(flutterProjectPath);
+  if (certificateConfig == null) {
+    // No cert config available, rely on automatic signing by Xcode.
+    return;
+  }
 
+  await _patchXcconfigFilesIfNotPatched(flutterProjectPath);
   final File testXcconfig = _fs.file(path.join(flutterProjectPath, 'ios/Flutter/$_kTestXcconfigFileName'));
   await testXcconfig.writeAsString(certificateConfig);
 }
@@ -76,18 +82,11 @@ $specificMessage
   }
 
   if (!dart_io.Platform.environment.containsKey(_kProvisioningConfigFileEnvironmentVariable)) {
-    throwUsageError('''
+    print('''
 $_kProvisioningConfigFileEnvironmentVariable variable is not defined in your
-environment. Please, define it and try again.
-
-Example provisioning xcconfig:
-
-ProvisioningStyle=Manual
-CODE_SIGN_IDENTITY=...
-PROVISIONING_PROFILE=...
-DEVELOPMENT_TEAM=...
-PROVISIONING_PROFILE_SPECIFIER=...
+environment. Relying on automatic signing by Xcode...
 '''.trim());
+    return null;
   }
 
   final String filePath = dart_io.Platform.environment[_kProvisioningConfigFileEnvironmentVariable];

dev/devicelab/lib/tasks/gallery.dart

@@ -31,11 +31,8 @@ class GalleryTransitionTest {
     await inDirectory(galleryDirectory, () async {
       await flutter('packages', options: <String>['get']);
 
-      if (deviceOperatingSystem == DeviceOperatingSystem.ios) {
+      if (deviceOperatingSystem == DeviceOperatingSystem.ios)
         await prepareProvisioningCertificates(galleryDirectory.path);
-        // This causes an Xcode project to be created.
-        await flutter('build', options: <String>['ios', '--profile']);
-      }
 
       final String testDriver = semanticsEnabled
           ? 'transitions_perf_with_semantics.dart'