Commit 3b52c87d authored by Todd Volkert's avatar Todd Volkert Committed by GitHub

Bump deps on `package:file` and `package:process` (#8097)

parent 93c6dbb9
...@@ -8,7 +8,7 @@ environment: ...@@ -8,7 +8,7 @@ environment:
sdk: '>=1.19.0 <2.0.0' sdk: '>=1.19.0 <2.0.0'
dependencies: dependencies:
file: '^1.0.1' file: '^2.0.1'
json_rpc_2: '^2.0.0' json_rpc_2: '^2.0.0'
matcher: '>=0.12.0 <1.0.0' matcher: '>=0.12.0 <1.0.0'
path: '^1.4.0' path: '^1.4.0'
......
...@@ -338,7 +338,7 @@ Map<_Asset, List<_Asset>> _parseAssets( ...@@ -338,7 +338,7 @@ Map<_Asset, List<_Asset>> _parseAssets(
return result; return result;
excludeDirs = excludeDirs.map( excludeDirs = excludeDirs.map(
(String exclude) => path.absolute(exclude) + fs.pathSeparator).toList(); (String exclude) => path.absolute(exclude) + fs.path.separator).toList();
if (manifestDescriptor.containsKey('assets')) { if (manifestDescriptor.containsKey('assets')) {
for (String asset in manifestDescriptor['assets']) { for (String asset in manifestDescriptor['assets']) {
......
...@@ -199,7 +199,7 @@ void _traceCommand(List<String> args, { String workingDirectory }) { ...@@ -199,7 +199,7 @@ void _traceCommand(List<String> args, { String workingDirectory }) {
if (workingDirectory == null) if (workingDirectory == null)
printTrace(argsText); printTrace(argsText);
else else
printTrace("[$workingDirectory${fs.pathSeparator}] $argsText"); printTrace("[$workingDirectory${fs.path.separator}] $argsText");
} }
String _runWithLoggingSync(List<String> cmd, { String _runWithLoggingSync(List<String> cmd, {
......
...@@ -87,7 +87,7 @@ String getElapsedAsMilliseconds(Duration duration) => '${duration.inMilliseconds ...@@ -87,7 +87,7 @@ String getElapsedAsMilliseconds(Duration duration) => '${duration.inMilliseconds
/// Return a relative path if [fullPath] is contained by the cwd, else return an /// Return a relative path if [fullPath] is contained by the cwd, else return an
/// absolute path. /// absolute path.
String getDisplayPath(String fullPath) { String getDisplayPath(String fullPath) {
String cwd = fs.currentDirectory.path + fs.pathSeparator; String cwd = fs.currentDirectory.path + fs.path.separator;
return fullPath.startsWith(cwd) ? fullPath.substring(cwd.length) : fullPath; return fullPath.startsWith(cwd) ? fullPath.substring(cwd.length) : fullPath;
} }
......
...@@ -58,7 +58,7 @@ bool inRepo(List<String> fileList) { ...@@ -58,7 +58,7 @@ bool inRepo(List<String> fileList) {
if (fileList == null || fileList.isEmpty) if (fileList == null || fileList.isEmpty)
fileList = <String>[path.current]; fileList = <String>[path.current];
String root = path.normalize(path.absolute(Cache.flutterRoot)); String root = path.normalize(path.absolute(Cache.flutterRoot));
String prefix = root + fs.pathSeparator; String prefix = root + fs.path.separator;
for (String file in fileList) { for (String file in fileList) {
file = path.normalize(path.absolute(file)); file = path.normalize(path.absolute(file));
if (file == root || file.startsWith(prefix)) if (file == root || file.startsWith(prefix))
......
...@@ -87,7 +87,7 @@ class BuildCleanCommand extends FlutterCommand { ...@@ -87,7 +87,7 @@ class BuildCleanCommand extends FlutterCommand {
@override @override
Future<Null> runCommand() async { Future<Null> runCommand() async {
Directory buildDir = fs.directory(getBuildDirectory()); Directory buildDir = fs.directory(getBuildDirectory());
printStatus("Deleting '${buildDir.path}${fs.pathSeparator}'."); printStatus("Deleting '${buildDir.path}${fs.path.separator}'.");
if (!buildDir.existsSync()) if (!buildDir.existsSync())
return; return;
......
...@@ -66,7 +66,7 @@ class BuildAotCommand extends BuildSubCommand { ...@@ -66,7 +66,7 @@ class BuildAotCommand extends BuildSubCommand {
if (outputPath == null) if (outputPath == null)
throwToolExit(null); throwToolExit(null);
printStatus('Built to $outputPath${fs.pathSeparator}.'); printStatus('Built to $outputPath${fs.path.separator}.');
} }
} }
......
...@@ -12,7 +12,7 @@ dependencies: ...@@ -12,7 +12,7 @@ dependencies:
args: ^0.13.4 args: ^0.13.4
coverage: ^0.8.0 coverage: ^0.8.0
crypto: '>=1.1.1 <3.0.0' crypto: '>=1.1.1 <3.0.0'
file: '^1.0.1' file: 2.0.1
http: ^0.11.3 http: ^0.11.3
intl: '>=0.14.0 <0.15.0' intl: '>=0.14.0 <0.15.0'
json_rpc_2: ^2.0.0 json_rpc_2: ^2.0.0
...@@ -23,7 +23,7 @@ dependencies: ...@@ -23,7 +23,7 @@ dependencies:
package_config: '>=0.1.5 <2.0.0' package_config: '>=0.1.5 <2.0.0'
path: ^1.4.0 path: ^1.4.0
platform: 1.0.1 platform: 1.0.1
process: 1.1.0 process: 2.0.0
pub_semver: ^1.0.0 pub_semver: ^1.0.0
stack_trace: ^1.4.0 stack_trace: ^1.4.0
usage: ^3.0.0 usage: ^3.0.0
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment