Skip to content

upgrade the version of grinder used #1574

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 2 additions & 26 deletions pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,6 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "0.31.0-alpha.2"
ansicolor:
description:
name: ansicolor
url: "https://pub.dartlang.org"
source: hosted
version: "0.0.9"
args:
description:
name: args
Expand Down Expand Up @@ -96,7 +90,7 @@ packages:
name: grinder
url: "https://pub.dartlang.org"
source: hosted
version: "0.8.0+3"
version: "0.8.1"
html:
description:
name: html
Expand Down Expand Up @@ -175,12 +169,6 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "0.9.4"
mockable_filesystem:
description:
name: mockable_filesystem
url: "https://pub.dartlang.org"
source: hosted
version: "0.0.3"
multi_server_socket:
description:
name: multi_server_socket
Expand Down Expand Up @@ -313,12 +301,6 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.2"
supports_color:
description:
name: supports_color
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.1"
term_glyph:
description:
name: term_glyph
Expand All @@ -343,12 +325,6 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.5"
unscripted:
description:
name: unscripted
url: "https://pub.dartlang.org"
source: hosted
version: "0.6.2"
utf:
description:
name: utf
Expand All @@ -374,4 +350,4 @@ packages:
source: hosted
version: "2.1.13"
sdks:
dart: ">=1.23.0 <=2.0.0-dev.12.0"
dart: ">=1.23.0 <=2.0.0-dev.6.0"
12 changes: 7 additions & 5 deletions tool/grind.dart
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,17 @@ final Directory flutterDirDevTools =

final RegExp quotables = new RegExp(r'[ "\r\n\$]');
// from flutter:dev/tools/dartdoc.dart, modified
void _printStream(Stream<List<int>> stream, Stdout output,
{String prefix: ''}) {
void _printStream(
Stream<List<int>> stream,
Stdout output, {
String prefix: '',
}) {
assert(prefix != null);
stream
.transform(UTF8.decoder)
.transform(const LineSplitter())
.listen((String line) {
output.write('$prefix$line'.trim());
output.write('\n');
output.write(' $prefix${line.trim()}\n');
});
}

Expand Down Expand Up @@ -76,7 +78,7 @@ class _SubprocessLauncher {
/// TODO(jcollins-g): move this to grinder?
Future runStreamed(String executable, List<String> arguments,
{String workingDirectory}) async {
stderr.write('$prefix+ ');
stderr.write(' $prefix+ ');
if (workingDirectory != null) stderr.write('cd "$workingDirectory" && ');
if (environment != null) {
stderr.write(environment.keys.map((String key) {
Expand Down