[flutter_tool] process.dart cleanup (#39899)
diff --git a/packages/flutter_tools/lib/src/ios/xcodeproj.dart b/packages/flutter_tools/lib/src/ios/xcodeproj.dart index 7a52b55..181905f 100644 --- a/packages/flutter_tools/lib/src/ios/xcodeproj.dart +++ b/packages/flutter_tools/lib/src/ios/xcodeproj.dart
@@ -14,7 +14,6 @@ import '../base/os.dart'; import '../base/platform.dart'; import '../base/process.dart'; -import '../base/process_manager.dart'; import '../base/utils.dart'; import '../build_info.dart'; import '../cache.dart'; @@ -211,7 +210,9 @@ return; } try { - final ProcessResult result = processManager.runSync(<String>[_executable, '-version']); + final RunResult result = processUtils.runSync( + <String>[_executable, '-version'], + ); if (result.exitCode != 0) { return; } @@ -255,16 +256,20 @@ /// version below. Map<String, String> getBuildSettings(String projectPath, String target) { try { - final String out = runCheckedSync(<String>[ - _executable, - '-project', - fs.path.absolute(projectPath), - '-target', - target, - '-showBuildSettings', - ], workingDirectory: projectPath); + final String out = processUtils.runSync( + <String>[ + _executable, + '-project', + fs.path.absolute(projectPath), + '-target', + target, + '-showBuildSettings', + ], + throwOnError: true, + workingDirectory: projectPath, + ).stdout.trim(); return parseXcodeBuildSettings(out); - } catch(error) { + } on ProcessException catch (error) { printTrace('Unexpected failure to get the build settings: $error.'); return const <String, String>{}; } @@ -291,8 +296,9 @@ // showBuildSettings is reported to ocassionally timeout. Here, we give it // a lot of wiggle room (locally on Flutter Gallery, this takes ~1s). // When there is a timeout, we retry once. - final RunResult result = await runCheckedAsync( + final RunResult result = await processUtils.run( showBuildSettingsCommand, + throwOnError: true, workingDirectory: projectPath, timeout: timeout, timeoutRetries: 1, @@ -313,7 +319,7 @@ } void cleanWorkspace(String workspacePath, String scheme) { - runSync(<String>[ + processUtils.runSync(<String>[ _executable, '-workspace', workspacePath, @@ -325,11 +331,15 @@ } Future<XcodeProjectInfo> getInfo(String projectPath, {String projectFilename}) async { - final RunResult result = await runCheckedAsync(<String>[ - _executable, - '-list', - if (projectFilename != null) ...<String>['-project', projectFilename], - ], workingDirectory: projectPath); + final RunResult result = await processUtils.run( + <String>[ + _executable, + '-list', + if (projectFilename != null) ...<String>['-project', projectFilename], + ], + throwOnError: true, + workingDirectory: projectPath, + ); return XcodeProjectInfo.fromXcodeBuildOutput(result.toString()); } }