Update to package:process v1.0.1 (#7607)
diff --git a/packages/flutter_tools/lib/src/android/android_device.dart b/packages/flutter_tools/lib/src/android/android_device.dart index 2c4c48d..ca914d4 100644 --- a/packages/flutter_tools/lib/src/android/android_device.dart +++ b/packages/flutter_tools/lib/src/android/android_device.dart
@@ -62,8 +62,7 @@ // We pass an encoding of LATIN1 so that we don't try and interpret the // `adb shell getprop` result as UTF8. ProcessResult result = processManager.runSync( - propCommand.first, - propCommand.sublist(1), + propCommand, stdoutEncoding: LATIN1 ); if (result.exitCode == 0) {
diff --git a/packages/flutter_tools/lib/src/android/android_workflow.dart b/packages/flutter_tools/lib/src/android/android_workflow.dart index 9a570f5..bbafc53 100644 --- a/packages/flutter_tools/lib/src/android/android_workflow.dart +++ b/packages/flutter_tools/lib/src/android/android_workflow.dart
@@ -71,7 +71,7 @@ try { printTrace('java -version'); - ProcessResult result = processManager.runSync('java', <String>['-version']); + ProcessResult result = processManager.runSync(<String>['java', '-version']); if (result.exitCode == 0) { javaVersion = result.stderr; List<String> versionLines = javaVersion.split('\n');
diff --git a/packages/flutter_tools/lib/src/base/os.dart b/packages/flutter_tools/lib/src/base/os.dart index 7b9fb6e..3d82ec6 100644 --- a/packages/flutter_tools/lib/src/base/os.dart +++ b/packages/flutter_tools/lib/src/base/os.dart
@@ -51,14 +51,14 @@ @override ProcessResult makeExecutable(File file) { - return processManager.runSync('chmod', <String>['a+x', file.path]); + return processManager.runSync(<String>['chmod', 'a+x', file.path]); } /// Return the path to the given executable, or `null` if `which` was not able /// to locate the binary. @override File which(String execName) { - ProcessResult result = processManager.runSync('which', <String>[execName]); + ProcessResult result = processManager.runSync(<String>['which', execName]); if (result.exitCode != 0) return null; String path = result.stdout.trim().split('\n').first.trim(); @@ -89,7 +89,7 @@ @override File which(String execName) { - ProcessResult result = processManager.runSync('where', <String>[execName]); + ProcessResult result = processManager.runSync(<String>['where', execName]); if (result.exitCode != 0) return null; return fs.file(result.stdout.trim().split('\n').first.trim());
diff --git a/packages/flutter_tools/lib/src/base/process.dart b/packages/flutter_tools/lib/src/base/process.dart index 9d5a479..4a5f6b7 100644 --- a/packages/flutter_tools/lib/src/base/process.dart +++ b/packages/flutter_tools/lib/src/base/process.dart
@@ -54,11 +54,8 @@ Map<String, String> environment }) async { _traceCommand(cmd, workingDirectory: workingDirectory); - String executable = cmd[0]; - List<String> arguments = cmd.length > 1 ? cmd.sublist(1) : <String>[]; Process process = await processManager.start( - executable, - arguments, + cmd, workingDirectory: workingDirectory, environment: _environment(allowReentrantFlutter, environment) ); @@ -127,8 +124,8 @@ Future<Process> runDetached(List<String> cmd) { _traceCommand(cmd); Future<Process> proc = processManager.start( - cmd[0], cmd.getRange(1, cmd.length).toList(), - mode: ProcessStartMode.DETACHED + cmd, + mode: ProcessStartMode.DETACHED, ); return proc; } @@ -139,10 +136,9 @@ }) async { _traceCommand(cmd, workingDirectory: workingDirectory); ProcessResult results = await processManager.run( - cmd[0], - cmd.getRange(1, cmd.length).toList(), + cmd, workingDirectory: workingDirectory, - environment: _environment(allowReentrantFlutter) + environment: _environment(allowReentrantFlutter), ); RunResult runResults = new RunResult(results); printTrace(runResults.toString()); @@ -152,7 +148,7 @@ bool exitsHappy(List<String> cli) { _traceCommand(cli); try { - return processManager.runSync(cli.first, cli.sublist(1)).exitCode == 0; + return processManager.runSync(cli).exitCode == 0; } catch (error) { return false; } @@ -216,10 +212,9 @@ }) { _traceCommand(cmd, workingDirectory: workingDirectory); ProcessResult results = processManager.runSync( - cmd[0], - cmd.getRange(1, cmd.length).toList(), + cmd, workingDirectory: workingDirectory, - environment: _environment(allowReentrantFlutter) + environment: _environment(allowReentrantFlutter), ); printTrace('Exit code ${results.exitCode} from: ${cmd.join(' ')}');
diff --git a/packages/flutter_tools/lib/src/commands/analyze_continuously.dart b/packages/flutter_tools/lib/src/commands/analyze_continuously.dart index 5a34c93..581afda 100644 --- a/packages/flutter_tools/lib/src/commands/analyze_continuously.dart +++ b/packages/flutter_tools/lib/src/commands/analyze_continuously.dart
@@ -158,10 +158,15 @@ Future<Null> start() async { String snapshot = path.join(sdk, 'bin/snapshots/analysis_server.dart.snapshot'); - List<String> args = <String>[snapshot, '--sdk', sdk]; + List<String> command = <String>[ + path.join(dartSdkPath, 'bin', 'dart'), + snapshot, + '--sdk', + sdk, + ]; - printTrace('dart ${args.join(' ')}'); - _process = await processManager.start(path.join(dartSdkPath, 'bin', 'dart'), args); + printTrace('dart ${command.skip(1).join(' ')}'); + _process = await processManager.start(command); _process.exitCode.whenComplete(() => _process = null); Stream<String> errorStream = _process.stderr.transform(UTF8.decoder).transform(const LineSplitter());
diff --git a/packages/flutter_tools/lib/src/commands/test.dart b/packages/flutter_tools/lib/src/commands/test.dart index c57993b..8986109 100644 --- a/packages/flutter_tools/lib/src/commands/test.dart +++ b/packages/flutter_tools/lib/src/commands/test.dart
@@ -139,7 +139,8 @@ Directory tempDir = fs.systemTempDirectory.createTempSync('flutter_tools'); try { File sourceFile = coverageFile.copySync(path.join(tempDir.path, 'lcov.source.info')); - ProcessResult result = processManager.runSync('lcov', <String>[ + ProcessResult result = processManager.runSync(<String>[ + 'lcov', '--add-tracefile', baseCoverageData, '--add-tracefile', sourceFile.path, '--output-file', coverageFile.path,
diff --git a/packages/flutter_tools/lib/src/ios/mac.dart b/packages/flutter_tools/lib/src/ios/mac.dart index 191d7bd..0a451ce 100644 --- a/packages/flutter_tools/lib/src/ios/mac.dart +++ b/packages/flutter_tools/lib/src/ios/mac.dart
@@ -41,7 +41,7 @@ } else { try { printTrace('xcrun clang'); - ProcessResult result = processManager.runSync('/usr/bin/xcrun', <String>['clang']); + ProcessResult result = processManager.runSync(<String>['/usr/bin/xcrun', 'clang']); if (result.stdout != null && result.stdout.contains('license')) _eulaSigned = false;
diff --git a/packages/flutter_tools/lib/src/ios/simulators.dart b/packages/flutter_tools/lib/src/ios/simulators.dart index 2b68783..4a50fd6 100644 --- a/packages/flutter_tools/lib/src/ios/simulators.dart +++ b/packages/flutter_tools/lib/src/ios/simulators.dart
@@ -190,9 +190,9 @@ // }, // "pairs": { ... }, - List<String> args = <String>['simctl', 'list', '--json', section.name]; - printTrace('$_xcrunPath ${args.join(' ')}'); - ProcessResult results = processManager.runSync(_xcrunPath, args); + List<String> command = <String>[_xcrunPath, 'simctl', 'list', '--json', section.name]; + printTrace(command.join(' ')); + ProcessResult results = processManager.runSync(command); if (results.exitCode != 0) { printError('Error executing simctl: ${results.exitCode}\n${results.stderr}'); return <String, Map<String, dynamic>>{};
diff --git a/packages/flutter_tools/lib/src/test/flutter_platform.dart b/packages/flutter_tools/lib/src/test/flutter_platform.dart index 6bd85a7..0a38ef4 100644 --- a/packages/flutter_tools/lib/src/test/flutter_platform.dart +++ b/packages/flutter_tools/lib/src/test/flutter_platform.dart
@@ -427,7 +427,7 @@ }) { assert(executable != null); // Please provide the path to the shell in the SKY_SHELL environment variable. assert(!startPaused || enableObservatory); - List<String> arguments = <String>[]; + List<String> command = <String>[executable]; if (enableObservatory) { // Some systems drive the _FlutterPlatform class in an unusual way, where // only one test file is processed at a time, and the operating @@ -439,27 +439,27 @@ // I mention this only so that you won't be tempted, as I was, to apply // the obvious simplification to this code and remove this entire feature. if (observatoryPort != null) - arguments.add('--observatory-port=$observatoryPort'); + command.add('--observatory-port=$observatoryPort'); if (diagnosticPort != null) - arguments.add('--diagnostic-port=$diagnosticPort'); + command.add('--diagnostic-port=$diagnosticPort'); if (startPaused) - arguments.add('--start-paused'); + command.add('--start-paused'); } else { - arguments.addAll(<String>['--disable-observatory', '--disable-diagnostic']); + command.addAll(<String>['--disable-observatory', '--disable-diagnostic']); } - arguments.addAll(<String>[ + command.addAll(<String>[ '--enable-dart-profiling', '--non-interactive', '--enable-checked-mode', '--packages=$packages', testPath, ]); - printTrace('$executable ${arguments.join(' ')}'); + printTrace(command.join(' ')); Map<String, String> environment = <String, String>{ 'FLUTTER_TEST': 'true', 'FONTCONFIG_FILE': _fontConfigFile.path, }; - return processManager.start(executable, arguments, environment: environment); + return processManager.start(command, environment: environment); } String get observatoryPortString => 'Observatory listening on http://${_kHost.address}:';
diff --git a/packages/flutter_tools/lib/src/version.dart b/packages/flutter_tools/lib/src/version.dart index 579290d..3bdd2e7 100644 --- a/packages/flutter_tools/lib/src/version.dart +++ b/packages/flutter_tools/lib/src/version.dart
@@ -74,7 +74,7 @@ /// A date String describing the last framework commit. static String get frameworkCommitDate { - return _runSync('git', <String>['log', '-n', '1', '--pretty=format:%ad', '--date=format:%Y-%m-%d %H:%M:%S'], Cache.flutterRoot); + return _runSync(<String>['git', 'log', '-n', '1', '--pretty=format:%ad', '--date=format:%Y-%m-%d %H:%M:%S'], Cache.flutterRoot); } static FlutterVersion getVersion([String flutterRoot]) { @@ -85,10 +85,10 @@ static String getVersionString({ bool whitelistBranchName: false }) { final String cwd = Cache.flutterRoot; - String commit = _shortGitRevision(_runSync('git', <String>['rev-parse', 'HEAD'], cwd)); + String commit = _shortGitRevision(_runSync(<String>['git', 'rev-parse', 'HEAD'], cwd)); commit = commit.isEmpty ? 'unknown' : commit; - String branch = _runSync('git', <String>['rev-parse', '--abbrev-ref', 'HEAD'], cwd); + String branch = _runSync(<String>['git', 'rev-parse', '--abbrev-ref', 'HEAD'], cwd); branch = branch == 'HEAD' ? 'master' : branch; if (whitelistBranchName || branch.isEmpty) { @@ -101,8 +101,8 @@ } } -String _runSync(String executable, List<String> arguments, String cwd) { - ProcessResult results = processManager.runSync(executable, arguments, workingDirectory: cwd); +String _runSync(List<String> command, String cwd) { + ProcessResult results = processManager.runSync(command, workingDirectory: cwd); return results.exitCode == 0 ? results.stdout.trim() : ''; }