From 09020b6fe88c04bc0afb577e1b61aaf9db3b62ea Mon Sep 17 00:00:00 2001 From: Janice Collins Date: Mon, 10 Dec 2018 16:10:27 -0800 Subject: [PATCH 1/5] Enable flutter plugin test --- test/compare_output_test.dart | 4 +--- testing/test_package_flutter_plugin/.gitignore | 1 + tool/grind.dart | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) create mode 100644 testing/test_package_flutter_plugin/.gitignore diff --git a/test/compare_output_test.dart b/test/compare_output_test.dart index 905b2e459c..301a95b21f 100644 --- a/test/compare_output_test.dart +++ b/test/compare_output_test.dart @@ -67,9 +67,7 @@ void main() { 'Top level package requires Flutter but FLUTTER_ROOT environment variable not set|test_package_flutter_plugin requires the Flutter SDK, version solving failed'))); expect(result.stderr, isNot(contains('asynchronous gap'))); expect(result.exitCode, isNot(0)); - }, - skip: - true /* TODO(gspencer): Re-enable as soon as Flutter's config is sane again. */); + }); test("Validate --version works", () async { var args = [dartdocBin, '--version']; diff --git a/testing/test_package_flutter_plugin/.gitignore b/testing/test_package_flutter_plugin/.gitignore new file mode 100644 index 0000000000..cb172e9e44 --- /dev/null +++ b/testing/test_package_flutter_plugin/.gitignore @@ -0,0 +1 @@ +android/** diff --git a/tool/grind.dart b/tool/grind.dart index 42eef12c3e..8cc4343a37 100644 --- a/tool/grind.dart +++ b/tool/grind.dart @@ -592,8 +592,7 @@ Future serveFlutterDocs() async { } @Task('Validate flutter docs') -// TODO(jcollins-g): add buildDartdocFlutterPluginDocs once passing -@Depends(buildFlutterDocs) +@Depends(buildFlutterDocs, buildDartdocFlutterPluginDocs) void validateFlutterDocs() {} @Task('Build flutter docs') From ef9a570cdc8b6dc21612d1334ee9491882936a98 Mon Sep 17 00:00:00 2001 From: Janice Collins Date: Tue, 11 Dec 2018 13:00:04 -0800 Subject: [PATCH 2/5] Plugin makes flutter check take longer again --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c7ca622541..4e638d3690 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,9 +4,9 @@ dart: - stable - "dev/raw/latest" env: + - DARTDOC_BOT=flutter - DARTDOC_BOT=sdk-analyzer - DARTDOC_BOT=main - - DARTDOC_BOT=flutter - DARTDOC_BOT=packages - DARTDOC_BOT=sdk-docs script: ./tool/travis.sh From f32dee36254fc98a56b994c0953f7d1b8f325e8d Mon Sep 17 00:00:00 2001 From: Janice Collins Date: Wed, 12 Dec 2018 13:12:38 -0800 Subject: [PATCH 3/5] Add workaround for #1431 and use update-packages to make sure Flutter is ready to go before building docs --- tool/grind.dart | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tool/grind.dart b/tool/grind.dart index 8cc4343a37..84c8359241 100644 --- a/tool/grind.dart +++ b/tool/grind.dart @@ -640,6 +640,11 @@ class FlutterRepo { ['precache'], workingDirectory: flutterPath, ); + await launcher.runStreamed( + bin, + ['update-packages'], + workingDirectory: flutterPath, + ); } factory FlutterRepo.fromPath(String flutterPath, Map env, @@ -922,6 +927,7 @@ Future _buildDartdocFlutterPluginDocs() async { flutterRepo.cacheDart, [ '--enable-asserts', + '--exclude-packages', 'Dart', // TODO(jcollins-g): dart-lang/dartdoc#1431 pathLib.join(Directory.current.path, 'bin', 'dartdoc.dart'), '--json', '--link-to-remote', From 81aa5c6b0ace759530145562e0ead57ae8a580f3 Mon Sep 17 00:00:00 2001 From: Janice Collins Date: Wed, 12 Dec 2018 13:35:27 -0800 Subject: [PATCH 4/5] flag in wrong place --- tool/grind.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tool/grind.dart b/tool/grind.dart index 84c8359241..8014e2973a 100644 --- a/tool/grind.dart +++ b/tool/grind.dart @@ -927,8 +927,8 @@ Future _buildDartdocFlutterPluginDocs() async { flutterRepo.cacheDart, [ '--enable-asserts', - '--exclude-packages', 'Dart', // TODO(jcollins-g): dart-lang/dartdoc#1431 pathLib.join(Directory.current.path, 'bin', 'dartdoc.dart'), + '--exclude-packages', 'Dart', // TODO(jcollins-g): dart-lang/dartdoc#1431 '--json', '--link-to-remote', '--output', From d944d53c11bebf539d037736bdf36a339d26a1ce Mon Sep 17 00:00:00 2001 From: Janice Collins Date: Wed, 12 Dec 2018 13:35:34 -0800 Subject: [PATCH 5/5] dartfmt --- tool/grind.dart | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tool/grind.dart b/tool/grind.dart index 8014e2973a..614bc94a5b 100644 --- a/tool/grind.dart +++ b/tool/grind.dart @@ -928,7 +928,8 @@ Future _buildDartdocFlutterPluginDocs() async { [ '--enable-asserts', pathLib.join(Directory.current.path, 'bin', 'dartdoc.dart'), - '--exclude-packages', 'Dart', // TODO(jcollins-g): dart-lang/dartdoc#1431 + '--exclude-packages', + 'Dart', // TODO(jcollins-g): dart-lang/dartdoc#1431 '--json', '--link-to-remote', '--output',