diff --git a/packages/flutter_driver/pubspec.yaml b/packages/flutter_driver/pubspec.yaml index ec7bc60655c..ca21bc9ce93 100644 --- a/packages/flutter_driver/pubspec.yaml +++ b/packages/flutter_driver/pubspec.yaml @@ -8,7 +8,7 @@ environment: sdk: '>=1.19.0 <2.0.0' dependencies: - file: '^1.0.1' + file: '^2.0.1' json_rpc_2: '^2.0.0' matcher: '>=0.12.0 <1.0.0' path: '^1.4.0' diff --git a/packages/flutter_tools/lib/src/asset.dart b/packages/flutter_tools/lib/src/asset.dart index 729904bd5eb..39bfbec2eae 100644 --- a/packages/flutter_tools/lib/src/asset.dart +++ b/packages/flutter_tools/lib/src/asset.dart @@ -338,7 +338,7 @@ Map<_Asset, List<_Asset>> _parseAssets( return result; excludeDirs = excludeDirs.map( - (String exclude) => path.absolute(exclude) + fs.pathSeparator).toList(); + (String exclude) => path.absolute(exclude) + fs.path.separator).toList(); if (manifestDescriptor.containsKey('assets')) { for (String asset in manifestDescriptor['assets']) { diff --git a/packages/flutter_tools/lib/src/base/process.dart b/packages/flutter_tools/lib/src/base/process.dart index 4a5f6b7e9f2..c8edfbfd8a5 100644 --- a/packages/flutter_tools/lib/src/base/process.dart +++ b/packages/flutter_tools/lib/src/base/process.dart @@ -199,7 +199,7 @@ void _traceCommand(List args, { String workingDirectory }) { if (workingDirectory == null) printTrace(argsText); else - printTrace("[$workingDirectory${fs.pathSeparator}] $argsText"); + printTrace("[$workingDirectory${fs.path.separator}] $argsText"); } String _runWithLoggingSync(List cmd, { diff --git a/packages/flutter_tools/lib/src/base/utils.dart b/packages/flutter_tools/lib/src/base/utils.dart index 6c10a4d260a..805d6a9b34c 100644 --- a/packages/flutter_tools/lib/src/base/utils.dart +++ b/packages/flutter_tools/lib/src/base/utils.dart @@ -87,7 +87,7 @@ String getElapsedAsMilliseconds(Duration duration) => '${duration.inMilliseconds /// Return a relative path if [fullPath] is contained by the cwd, else return an /// absolute path. 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; } diff --git a/packages/flutter_tools/lib/src/commands/analyze_base.dart b/packages/flutter_tools/lib/src/commands/analyze_base.dart index cd419110a52..8d2c3fab827 100644 --- a/packages/flutter_tools/lib/src/commands/analyze_base.dart +++ b/packages/flutter_tools/lib/src/commands/analyze_base.dart @@ -58,7 +58,7 @@ bool inRepo(List fileList) { if (fileList == null || fileList.isEmpty) fileList = [path.current]; String root = path.normalize(path.absolute(Cache.flutterRoot)); - String prefix = root + fs.pathSeparator; + String prefix = root + fs.path.separator; for (String file in fileList) { file = path.normalize(path.absolute(file)); if (file == root || file.startsWith(prefix)) diff --git a/packages/flutter_tools/lib/src/commands/build.dart b/packages/flutter_tools/lib/src/commands/build.dart index ba09ac063d6..a45884369fe 100644 --- a/packages/flutter_tools/lib/src/commands/build.dart +++ b/packages/flutter_tools/lib/src/commands/build.dart @@ -87,7 +87,7 @@ class BuildCleanCommand extends FlutterCommand { @override Future runCommand() async { Directory buildDir = fs.directory(getBuildDirectory()); - printStatus("Deleting '${buildDir.path}${fs.pathSeparator}'."); + printStatus("Deleting '${buildDir.path}${fs.path.separator}'."); if (!buildDir.existsSync()) return; diff --git a/packages/flutter_tools/lib/src/commands/build_aot.dart b/packages/flutter_tools/lib/src/commands/build_aot.dart index b7f14f0e720..5ef7e3432bd 100644 --- a/packages/flutter_tools/lib/src/commands/build_aot.dart +++ b/packages/flutter_tools/lib/src/commands/build_aot.dart @@ -66,7 +66,7 @@ class BuildAotCommand extends BuildSubCommand { if (outputPath == null) throwToolExit(null); - printStatus('Built to $outputPath${fs.pathSeparator}.'); + printStatus('Built to $outputPath${fs.path.separator}.'); } } diff --git a/packages/flutter_tools/pubspec.yaml b/packages/flutter_tools/pubspec.yaml index 068e8edd62f..1be17ba4463 100644 --- a/packages/flutter_tools/pubspec.yaml +++ b/packages/flutter_tools/pubspec.yaml @@ -12,7 +12,7 @@ dependencies: args: ^0.13.4 coverage: ^0.8.0 crypto: '>=1.1.1 <3.0.0' - file: '^1.0.1' + file: 2.0.1 http: ^0.11.3 intl: '>=0.14.0 <0.15.0' json_rpc_2: ^2.0.0 @@ -23,7 +23,7 @@ dependencies: package_config: '>=0.1.5 <2.0.0' path: ^1.4.0 platform: 1.0.1 - process: 1.1.0 + process: 2.0.0 pub_semver: ^1.0.0 stack_trace: ^1.4.0 usage: ^3.0.0