From b2c98f9a4eb5eef85e0c69b99713beb4ceba02ca Mon Sep 17 00:00:00 2001 From: Yegor Date: Thu, 3 May 2018 19:24:48 -0700 Subject: [PATCH] Roll engine to e976be13c51448f89107d082ec81e2b6731671fa (#17266) * Roll engine to e976be13c51448f89107d082ec81e2b6731671fa * move away from deprecated constants --- bin/internal/engine.version | 2 +- .../test_smoke_test/crash1_test.dart | 2 +- .../test_smoke_test/crash2_test.dart | 2 +- .../bin/tasks/gradle_plugin_test.dart | 4 ++-- dev/devicelab/lib/framework/ios.dart | 2 +- dev/devicelab/lib/framework/runner.dart | 4 ++-- dev/devicelab/lib/framework/utils.dart | 2 +- dev/devicelab/lib/tasks/microbenchmarks.dart | 2 +- .../flutter_driver/lib/src/driver/driver.dart | 2 +- .../flutter_goldens/lib/flutter_goldens.dart | 4 ++-- packages/flutter_tools/lib/src/asset.dart | 2 +- .../lib/src/base/file_system.dart | 8 ++++---- packages/flutter_tools/lib/src/base/io.dart | 15 ++++++++------- .../lib/src/base/port_scanner.dart | 6 +++--- .../flutter_tools/lib/src/base/process.dart | 2 +- packages/flutter_tools/lib/src/cache.dart | 2 +- .../lib/src/commands/analyze_base.dart | 2 +- .../flutter_tools/lib/src/commands/create.dart | 6 +++--- .../flutter_tools/lib/src/commands/drive.dart | 4 ++-- .../lib/src/commands/fuchsia_reload.dart | 2 +- .../lib/src/commands/ide_config.dart | 4 ++-- .../lib/src/dependency_checker.dart | 2 +- packages/flutter_tools/lib/src/devfs.dart | 6 +++--- packages/flutter_tools/lib/src/ios/mac.dart | 2 +- .../flutter_tools/lib/src/ios/simulators.dart | 2 +- .../lib/src/protocol_discovery.dart | 2 +- .../flutter_tools/lib/src/resident_runner.dart | 2 +- packages/flutter_tools/lib/src/services.dart | 2 +- .../lib/src/test/flutter_platform.dart | 18 +++++++++--------- .../flutter_tools/lib/src/test/runner.dart | 2 +- packages/flutter_tools/test/base/io_test.dart | 2 +- packages/flutter_tools/test/cache_test.dart | 2 +- .../test/commands/create_test.dart | 2 +- .../test/commands/devices_test.dart | 8 ++++---- .../test/commands/fuchsia_reload_test.dart | 4 ++-- .../flutter_tools/test/dart/pub_get_test.dart | 4 ++-- packages/flutter_tools/test/devfs_test.dart | 4 ++-- packages/flutter_tools/test/src/mocks.dart | 2 +- .../lib/src/fuchsia_remote_connection.dart | 4 ++-- 39 files changed, 75 insertions(+), 74 deletions(-) diff --git a/bin/internal/engine.version b/bin/internal/engine.version index 2910411780..277181ff3b 100644 --- a/bin/internal/engine.version +++ b/bin/internal/engine.version @@ -1 +1 @@ -ae0d3a553688bcc11fd367faf5675159585990a5 +e976be13c51448f89107d082ec81e2b6731671fa diff --git a/dev/automated_tests/test_smoke_test/crash1_test.dart b/dev/automated_tests/test_smoke_test/crash1_test.dart index 58cfe2040d..97aa99c68b 100644 --- a/dev/automated_tests/test_smoke_test/crash1_test.dart +++ b/dev/automated_tests/test_smoke_test/crash1_test.dart @@ -11,7 +11,7 @@ import 'package:flutter_test/flutter_test.dart'; void main() { test('test smoke test -- this test should fail', () async { - if (system.Process.killPid(system.pid, system.ProcessSignal.SIGSEGV)) { + if (system.Process.killPid(system.pid, system.ProcessSignal.sigsegv)) { print('system.Process.killPid returned before the process ended!'); print('Sleeping for a few seconds just in case signal delivery is delayed or our signal handler is being slow...'); system.sleep(const Duration(seconds: 10)); // don't sleep too much, we must not time out diff --git a/dev/automated_tests/test_smoke_test/crash2_test.dart b/dev/automated_tests/test_smoke_test/crash2_test.dart index 2008592121..736f367ef8 100644 --- a/dev/automated_tests/test_smoke_test/crash2_test.dart +++ b/dev/automated_tests/test_smoke_test/crash2_test.dart @@ -8,5 +8,5 @@ import 'dart:io' as system; // see //flutter/dev/bots/test.dart void main() { - system.Process.killPid(system.pid, system.ProcessSignal.SIGSEGV); + system.Process.killPid(system.pid, system.ProcessSignal.sigsegv); } \ No newline at end of file diff --git a/dev/devicelab/bin/tasks/gradle_plugin_test.dart b/dev/devicelab/bin/tasks/gradle_plugin_test.dart index bc11e95220..dd6c33475b 100644 --- a/dev/devicelab/bin/tasks/gradle_plugin_test.dart +++ b/dev/devicelab/bin/tasks/gradle_plugin_test.dart @@ -131,7 +131,7 @@ class FlutterProject { final File buildScript = new File( path.join(androidPath, 'app', 'build.gradle'), ); - buildScript.openWrite(mode: FileMode.APPEND).write(''' + buildScript.openWrite(mode: FileMode.append).write(''' android { buildTypes { @@ -147,7 +147,7 @@ android { final File buildScript = new File( path.join(androidPath, 'app', 'build.gradle'), ); - buildScript.openWrite(mode: FileMode.APPEND).write(''' + buildScript.openWrite(mode: FileMode.append).write(''' android { flavorDimensions "mode" diff --git a/dev/devicelab/lib/framework/ios.dart b/dev/devicelab/lib/framework/ios.dart index b9119acf20..d79ba0f88f 100644 --- a/dev/devicelab/lib/framework/ios.dart +++ b/dev/devicelab/lib/framework/ios.dart @@ -52,7 +52,7 @@ Future _patchXcconfigFilesIfNotPatched(String flutterProjectPath) async { final String contents = await file.readAsString(); final bool alreadyPatched = contents.contains(include); if (!alreadyPatched) { - final IOSink patchOut = file.openWrite(mode: FileMode.APPEND); + final IOSink patchOut = file.openWrite(mode: FileMode.append); patchOut.writeln(); // in case EOF is not preceded by line break patchOut.writeln(include); await patchOut.close(); diff --git a/dev/devicelab/lib/framework/runner.dart b/dev/devicelab/lib/framework/runner.dart index 91299323d7..ce3b4e42da 100644 --- a/dev/devicelab/lib/framework/runner.dart +++ b/dev/devicelab/lib/framework/runner.dart @@ -67,14 +67,14 @@ Future> runTask(String taskName, { bool silent: false }) as await runner.exitCode.timeout(const Duration(seconds: 1)); return taskResult; } on TimeoutException catch (timeout) { - runner.kill(ProcessSignal.SIGINT); + runner.kill(ProcessSignal.sigint); return { 'success': false, 'reason': 'Timeout waiting for $waitingFor: ${timeout.message}', }; } finally { if (!runnerFinished) - runner.kill(ProcessSignal.SIGKILL); + runner.kill(ProcessSignal.sigkill); await stdoutSub.cancel(); await stderrSub.cancel(); } diff --git a/dev/devicelab/lib/framework/utils.dart b/dev/devicelab/lib/framework/utils.dart index e34e41f404..d925dfd684 100644 --- a/dev/devicelab/lib/framework/utils.dart +++ b/dev/devicelab/lib/framework/utils.dart @@ -460,7 +460,7 @@ Future findAvailablePort() async { while (true) { try { final ServerSocket socket = - await ServerSocket.bind(InternetAddress.LOOPBACK_IP_V4, port); + await ServerSocket.bind(InternetAddress.loopbackIPv4, port); await socket.close(); return port; } catch (_) { diff --git a/dev/devicelab/lib/tasks/microbenchmarks.dart b/dev/devicelab/lib/tasks/microbenchmarks.dart index 08d6d8973f..b44bde5f75 100644 --- a/dev/devicelab/lib/tasks/microbenchmarks.dart +++ b/dev/devicelab/lib/tasks/microbenchmarks.dart @@ -126,7 +126,7 @@ Future> _readJsonResults(Process process) { if (line.contains(jsonEnd)) { jsonStarted = false; processWasKilledIntentionally = true; - process.kill(ProcessSignal.SIGINT); // flutter run doesn't quit automatically + process.kill(ProcessSignal.sigint); // flutter run doesn't quit automatically final String jsonOutput = jsonBuf.toString(); try { completer.complete(json.decode(jsonOutput)); diff --git a/packages/flutter_driver/lib/src/driver/driver.dart b/packages/flutter_driver/lib/src/driver/driver.dart index 01e7e61e69..9cc78667c3 100644 --- a/packages/flutter_driver/lib/src/driver/driver.dart +++ b/packages/flutter_driver/lib/src/driver/driver.dart @@ -373,7 +373,7 @@ class FlutterDriver { if (_logCommunicationToFile) { final f.File file = fs.file(p.join(testOutputsDirectory, 'flutter_driver_commands_$_driverId.log')); file.createSync(recursive: true); // no-op if file exists - file.writeAsStringSync('${new DateTime.now()} $message\n', mode: f.FileMode.APPEND, flush: true); + file.writeAsStringSync('${new DateTime.now()} $message\n', mode: f.FileMode.append, flush: true); } } diff --git a/packages/flutter_goldens/lib/flutter_goldens.dart b/packages/flutter_goldens/lib/flutter_goldens.dart index 562ade60e3..e5b403618a 100644 --- a/packages/flutter_goldens/lib/flutter_goldens.dart +++ b/packages/flutter_goldens/lib/flutter_goldens.dart @@ -209,8 +209,8 @@ class GoldensClient { Future _obtainLock() async { final File lockFile = flutterRoot.childFile(fs.path.join('bin', 'cache', 'goldens.lockfile')); await lockFile.create(recursive: true); - _lock = await lockFile.open(mode: io.FileMode.WRITE); - await _lock.lock(io.FileLock.BLOCKING_EXCLUSIVE); + _lock = await lockFile.open(mode: io.FileMode.write); + await _lock.lock(io.FileLock.blockingExclusive); } Future _releaseLock() async { diff --git a/packages/flutter_tools/lib/src/asset.dart b/packages/flutter_tools/lib/src/asset.dart index 864b7c807f..0497a6cee0 100644 --- a/packages/flutter_tools/lib/src/asset.dart +++ b/packages/flutter_tools/lib/src/asset.dart @@ -78,7 +78,7 @@ class _ManifestAssetBundle implements AssetBundle { return true; final FileStat stat = fs.file(manifestPath).statSync(); - if (stat.type == FileSystemEntityType.NOT_FOUND) + if (stat.type == FileSystemEntityType.notFound) return true; return stat.modified.isAfter(_lastBuildTimestamp); diff --git a/packages/flutter_tools/lib/src/base/file_system.dart b/packages/flutter_tools/lib/src/base/file_system.dart index 74fa9dc415..a6f8c27846 100644 --- a/packages/flutter_tools/lib/src/base/file_system.dart +++ b/packages/flutter_tools/lib/src/base/file_system.dart @@ -104,15 +104,15 @@ void copyDirectorySync(Directory srcDir, Directory destDir, [void onFileCopied(F Directory getRecordingSink(String dirname, String basename) { final String location = _kLocalFs.path.join(dirname, basename); switch (_kLocalFs.typeSync(location, followLinks: false)) { - case FileSystemEntityType.FILE: - case FileSystemEntityType.LINK: + case FileSystemEntityType.file: + case FileSystemEntityType.link: throwToolExit('Invalid record-to location: $dirname ("$basename" exists as non-directory)'); break; - case FileSystemEntityType.DIRECTORY: + case FileSystemEntityType.directory: if (_kLocalFs.directory(location).listSync(followLinks: false).isNotEmpty) throwToolExit('Invalid record-to location: $dirname ("$basename" is not empty)'); break; - case FileSystemEntityType.NOT_FOUND: + case FileSystemEntityType.notFound: _kLocalFs.directory(location).createSync(recursive: true); } return _kLocalFs.directory(location); diff --git a/packages/flutter_tools/lib/src/base/io.dart b/packages/flutter_tools/lib/src/base/io.dart index 4c166c6889..2ed3b3b207 100644 --- a/packages/flutter_tools/lib/src/base/io.dart +++ b/packages/flutter_tools/lib/src/base/io.dart @@ -41,7 +41,7 @@ export 'dart:io' exitCode, // File NO! Use `file_system.dart` // FileSystemEntity NO! Use `file_system.dart` - GZIP, + gzip, HandshakeException, HttpClient, HttpClientRequest, @@ -71,7 +71,7 @@ export 'dart:io' // stdout, NO! Use `io.dart` Socket, SocketException, - SYSTEM_ENCODING, + systemEncoding, WebSocket, WebSocketException, WebSocketTransformer; @@ -116,11 +116,12 @@ class ProcessSignal implements io.ProcessSignal { @visibleForTesting const ProcessSignal(this._delegate); - static const ProcessSignal SIGWINCH = const _PosixProcessSignal._(io.ProcessSignal.SIGWINCH); - static const ProcessSignal SIGTERM = const _PosixProcessSignal._(io.ProcessSignal.SIGTERM); - static const ProcessSignal SIGUSR1 = const _PosixProcessSignal._(io.ProcessSignal.SIGUSR1); - static const ProcessSignal SIGUSR2 = const _PosixProcessSignal._(io.ProcessSignal.SIGUSR2); - static const ProcessSignal SIGINT = const ProcessSignal(io.ProcessSignal.SIGINT); + // TODO(yjbanov): make these names consistent with dart:io ones + static const ProcessSignal SIGWINCH = const _PosixProcessSignal._(io.ProcessSignal.sigwinch); + static const ProcessSignal SIGTERM = const _PosixProcessSignal._(io.ProcessSignal.sigterm); + static const ProcessSignal SIGUSR1 = const _PosixProcessSignal._(io.ProcessSignal.sigusr1); + static const ProcessSignal SIGUSR2 = const _PosixProcessSignal._(io.ProcessSignal.sigusr2); + static const ProcessSignal SIGINT = const ProcessSignal(io.ProcessSignal.sigint); final io.ProcessSignal _delegate; diff --git a/packages/flutter_tools/lib/src/base/port_scanner.dart b/packages/flutter_tools/lib/src/base/port_scanner.dart index a3e7167c89..e18c597de2 100644 --- a/packages/flutter_tools/lib/src/base/port_scanner.dart +++ b/packages/flutter_tools/lib/src/base/port_scanner.dart @@ -46,7 +46,7 @@ class HostPortScanner extends PortScanner { Future isPortAvailable(int port) async { try { // TODO(ianh): This is super racy. - final ServerSocket socket = await ServerSocket.bind(InternetAddress.LOOPBACK_IP_V4, port); + final ServerSocket socket = await ServerSocket.bind(InternetAddress.loopbackIPv4, port); await socket.close(); return true; } catch (error) { @@ -58,9 +58,9 @@ class HostPortScanner extends PortScanner { Future findAvailablePort() async { ServerSocket socket; try { - socket = await ServerSocket.bind(InternetAddress.LOOPBACK_IP_V4, 0); + socket = await ServerSocket.bind(InternetAddress.loopbackIPv4, 0); } on SocketException { - socket = await ServerSocket.bind(InternetAddress.LOOPBACK_IP_V6, 0, v6Only: true); + socket = await ServerSocket.bind(InternetAddress.loopbackIPv6, 0, v6Only: true); } final int port = socket.port; await socket.close(); diff --git a/packages/flutter_tools/lib/src/base/process.dart b/packages/flutter_tools/lib/src/base/process.dart index 1d7a6858fd..7c0650ac7c 100644 --- a/packages/flutter_tools/lib/src/base/process.dart +++ b/packages/flutter_tools/lib/src/base/process.dart @@ -213,7 +213,7 @@ Future runDetached(List cmd) { _traceCommand(cmd); final Future proc = processManager.start( cmd, - mode: ProcessStartMode.DETACHED, + mode: ProcessStartMode.detached, ); return proc; } diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart index 88beeab0be..f37a6c3b11 100644 --- a/packages/flutter_tools/lib/src/cache.dart +++ b/packages/flutter_tools/lib/src/cache.dart @@ -74,7 +74,7 @@ class Cache { if (!_lockEnabled) return null; assert(_lock == null); - _lock = await fs.file(fs.path.join(flutterRoot, 'bin', 'cache', 'lockfile')).open(mode: FileMode.WRITE); + _lock = await fs.file(fs.path.join(flutterRoot, 'bin', 'cache', 'lockfile')).open(mode: FileMode.write); bool locked = false; bool printed = false; while (!locked) { diff --git a/packages/flutter_tools/lib/src/commands/analyze_base.dart b/packages/flutter_tools/lib/src/commands/analyze_base.dart index 0aeb29eb09..9464d3b593 100644 --- a/packages/flutter_tools/lib/src/commands/analyze_base.dart +++ b/packages/flutter_tools/lib/src/commands/analyze_base.dart @@ -26,7 +26,7 @@ abstract class AnalyzeBase { void dumpErrors(Iterable errors) { if (argResults['write'] != null) { try { - final RandomAccessFile resultsFile = fs.file(argResults['write']).openSync(mode: FileMode.WRITE); + final RandomAccessFile resultsFile = fs.file(argResults['write']).openSync(mode: FileMode.write); try { resultsFile.lockSync(); resultsFile.writeStringSync(errors.join('\n')); diff --git a/packages/flutter_tools/lib/src/commands/create.dart b/packages/flutter_tools/lib/src/commands/create.dart index f543111fa3..3444313c80 100644 --- a/packages/flutter_tools/lib/src/commands/create.dart +++ b/packages/flutter_tools/lib/src/commands/create.dart @@ -408,12 +408,12 @@ String _validateProjectDir(String dirPath, { String flutterRoot }) { final FileSystemEntityType type = fs.typeSync(dirPath); - if (type != FileSystemEntityType.NOT_FOUND) { + if (type != FileSystemEntityType.notFound) { switch (type) { - case FileSystemEntityType.FILE: + case FileSystemEntityType.file: // Do not overwrite files. return "Invalid project name: '$dirPath' - file exists."; - case FileSystemEntityType.LINK: + case FileSystemEntityType.link: // Do not overwrite links. return "Invalid project name: '$dirPath' - refers to a link."; } diff --git a/packages/flutter_tools/lib/src/commands/drive.dart b/packages/flutter_tools/lib/src/commands/drive.dart index 9713b19282..79a5b1504d 100644 --- a/packages/flutter_tools/lib/src/commands/drive.dart +++ b/packages/flutter_tools/lib/src/commands/drive.dart @@ -94,7 +94,7 @@ class DriveCommand extends RunCommandBase { if (device == null) throwToolExit(null); - if (await fs.type(testFile) != FileSystemEntityType.FILE) + if (await fs.type(testFile) != FileSystemEntityType.file) throwToolExit('Test file not found: $testFile'); String observatoryUri; @@ -225,7 +225,7 @@ void restoreAppStarter() { Future _startApp(DriveCommand command) async { final String mainPath = findMainDartFile(command.targetFile); - if (await fs.type(mainPath) != FileSystemEntityType.FILE) { + if (await fs.type(mainPath) != FileSystemEntityType.file) { printError('Tried to run $mainPath, but that file does not exist.'); return null; } diff --git a/packages/flutter_tools/lib/src/commands/fuchsia_reload.dart b/packages/flutter_tools/lib/src/commands/fuchsia_reload.dart index 2551ce6f07..1d3a28f908 100644 --- a/packages/flutter_tools/lib/src/commands/fuchsia_reload.dart +++ b/packages/flutter_tools/lib/src/commands/fuchsia_reload.dart @@ -27,7 +27,7 @@ import '../vmservice.dart'; // $ flutter fuchsia_reload -f ~/fuchsia -a 192.168.1.39 \ // -g //lib/flutter/examples/flutter_gallery:flutter_gallery -final String ipv4Loopback = InternetAddress.LOOPBACK_IP_V4.address; +final String ipv4Loopback = InternetAddress.loopbackIPv4.address; class FuchsiaReloadCommand extends FlutterCommand { FuchsiaReloadCommand() { diff --git a/packages/flutter_tools/lib/src/commands/ide_config.dart b/packages/flutter_tools/lib/src/commands/ide_config.dart index 269674ebe0..b125d327da 100644 --- a/packages/flutter_tools/lib/src/commands/ide_config.dart +++ b/packages/flutter_tools/lib/src/commands/ide_config.dart @@ -261,9 +261,9 @@ class IdeConfigCommand extends FlutterCommand { String _validateFlutterDir(String dirPath, {String flutterRoot}) { final FileSystemEntityType type = fs.typeSync(dirPath); - if (type != FileSystemEntityType.NOT_FOUND) { + if (type != FileSystemEntityType.notFound) { switch (type) { - case FileSystemEntityType.LINK: + case FileSystemEntityType.link: // Do not overwrite links. return "Invalid project root dir: '$dirPath' - refers to a link."; } diff --git a/packages/flutter_tools/lib/src/dependency_checker.dart b/packages/flutter_tools/lib/src/dependency_checker.dart index 9f5b560508..1ff6eaa4e8 100644 --- a/packages/flutter_tools/lib/src/dependency_checker.dart +++ b/packages/flutter_tools/lib/src/dependency_checker.dart @@ -30,7 +30,7 @@ class DependencyChecker { for (String path in _dependencies) { final File file = fs.file(path); final FileStat stat = file.statSync(); - if (stat.type == FileSystemEntityType.NOT_FOUND) { + if (stat.type == FileSystemEntityType.notFound) { printTrace('DependencyChecker: Error stating $path.'); return true; } diff --git a/packages/flutter_tools/lib/src/devfs.dart b/packages/flutter_tools/lib/src/devfs.dart index ce9e6e8036..46fcf61c11 100644 --- a/packages/flutter_tools/lib/src/devfs.dart +++ b/packages/flutter_tools/lib/src/devfs.dart @@ -46,7 +46,7 @@ abstract class DevFSContent { Stream> contentsAsStream(); Stream> contentsAsCompressedStream() { - return contentsAsStream().transform(GZIP.encoder); + return contentsAsStream().transform(gzip.encoder); } /// Return the list of files this content depends on. @@ -86,7 +86,7 @@ class DevFSFileContent extends DevFSContent { return; } _fileStat = file.statSync(); - if (_fileStat.type == FileSystemEntityType.LINK) { + if (_fileStat.type == FileSystemEntityType.link) { // Resolve, stat, and maybe cache the symlink target. final String resolved = file.resolveSymbolicLinksSync(); final FileSystemEntity linkTarget = fs.file(resolved); @@ -661,7 +661,7 @@ class DevFS { try { final FileSystemEntityType linkType = fs.statSync(file.resolveSymbolicLinksSync()).type; - if (linkType == FileSystemEntityType.DIRECTORY) + if (linkType == FileSystemEntityType.directory) continue; } on FileSystemException catch (e) { _printScanDirectoryError(file.path, e); diff --git a/packages/flutter_tools/lib/src/ios/mac.dart b/packages/flutter_tools/lib/src/ios/mac.dart index 7d1c8ba253..dc1320ae3b 100644 --- a/packages/flutter_tools/lib/src/ios/mac.dart +++ b/packages/flutter_tools/lib/src/ios/mac.dart @@ -623,7 +623,7 @@ void _copyServiceDefinitionsManifest(List> services, File ma 'framework': fs.path.basenameWithoutExtension(service['ios-framework']) }).toList(); final Map jsonObject = { 'services' : jsonServices }; - manifest.writeAsStringSync(json.encode(jsonObject), mode: FileMode.WRITE, flush: true); + manifest.writeAsStringSync(json.encode(jsonObject), mode: FileMode.write, flush: true); } Future upgradePbxProjWithFlutterAssets(String app) async { diff --git a/packages/flutter_tools/lib/src/ios/simulators.dart b/packages/flutter_tools/lib/src/ios/simulators.dart index 7897c97b53..5835ad805c 100644 --- a/packages/flutter_tools/lib/src/ios/simulators.dart +++ b/packages/flutter_tools/lib/src/ios/simulators.dart @@ -454,7 +454,7 @@ class IOSSimulator extends Device { void clearLogs() { final File logFile = fs.file(logFilePath); if (logFile.existsSync()) { - final RandomAccessFile randomFile = logFile.openSync(mode: FileMode.WRITE); + final RandomAccessFile randomFile = logFile.openSync(mode: FileMode.write); randomFile.truncateSync(0); randomFile.closeSync(); } diff --git a/packages/flutter_tools/lib/src/protocol_discovery.dart b/packages/flutter_tools/lib/src/protocol_discovery.dart index 4cd0509910..511ceaaa9f 100644 --- a/packages/flutter_tools/lib/src/protocol_discovery.dart +++ b/packages/flutter_tools/lib/src/protocol_discovery.dart @@ -97,7 +97,7 @@ class ProtocolDiscovery { assert(new InternetAddress(hostUri.host).isLoopback); if (ipv6) { - hostUri = hostUri.replace(host: InternetAddress.LOOPBACK_IP_V6.host); + hostUri = hostUri.replace(host: InternetAddress.loopbackIPv6.host); } return hostUri; diff --git a/packages/flutter_tools/lib/src/resident_runner.dart b/packages/flutter_tools/lib/src/resident_runner.dart index 4e86d38b6a..a8ba029421 100644 --- a/packages/flutter_tools/lib/src/resident_runner.dart +++ b/packages/flutter_tools/lib/src/resident_runner.dart @@ -808,7 +808,7 @@ abstract class ResidentRunner { if (path == null) return true; final FileStat stat = fs.file(path).statSync(); - if (stat.type != FileSystemEntityType.FILE) + if (stat.type != FileSystemEntityType.file) return true; if (!fs.file(path).existsSync()) return true; diff --git a/packages/flutter_tools/lib/src/services.dart b/packages/flutter_tools/lib/src/services.dart index fbd142ed62..5668efc602 100644 --- a/packages/flutter_tools/lib/src/services.dart +++ b/packages/flutter_tools/lib/src/services.dart @@ -105,6 +105,6 @@ File generateServiceDefinitions( final Map jsonObject = { 'services': services }; final File servicesFile = fs.file(fs.path.join(dir, 'services.json')); - servicesFile.writeAsStringSync(json.encode(jsonObject), mode: FileMode.WRITE, flush: true); + servicesFile.writeAsStringSync(json.encode(jsonObject), mode: FileMode.write, flush: true); return servicesFile; } diff --git a/packages/flutter_tools/lib/src/test/flutter_platform.dart b/packages/flutter_tools/lib/src/test/flutter_platform.dart index a933a9b068..2423964ded 100644 --- a/packages/flutter_tools/lib/src/test/flutter_platform.dart +++ b/packages/flutter_tools/lib/src/test/flutter_platform.dart @@ -52,8 +52,8 @@ const String _kProjectRootSentinel = 'pubspec.yaml'; /// The address at which our WebSocket server resides and at which the sky_shell /// processes will host the Observatory server. final Map _kHosts = { - InternetAddressType.IP_V4: InternetAddress.LOOPBACK_IP_V4, - InternetAddressType.IP_V6: InternetAddress.LOOPBACK_IP_V6, + InternetAddressType.IPv4: InternetAddress.loopbackIPv4, + InternetAddressType.IPv6: InternetAddress.loopbackIPv6, }; /// Configure the `test` package to work with Flutter. @@ -73,7 +73,7 @@ void installHook({ bool trackWidgetCreation: false, bool updateGoldens: false, int observatoryPort, - InternetAddressType serverType: InternetAddressType.IP_V4, + InternetAddressType serverType: InternetAddressType.IPv4, }) { assert(!enableObservatory || (!startPaused && observatoryPort == null)); hack.registerPlatformPlugin( @@ -622,7 +622,7 @@ class _FlutterPlatform extends PlatformPlugin { } String _getWebSocketUrl() { - return host.type == InternetAddressType.IP_V4 + return host.type == InternetAddressType.IPv4 ? 'ws://${host.address}' : 'ws://[${host.address}]'; } @@ -766,7 +766,7 @@ void main() { } else { command.add('--disable-observatory'); } - if (host.type == InternetAddressType.IP_V6) + if (host.type == InternetAddressType.IPv6) command.add('--ipv6'); if (bundlePath != null) { command.add('--flutter-assets-dir=$bundlePath'); @@ -838,13 +838,13 @@ void main() { return 'Shell subprocess cleanly reported an error $when. Check the logs above for an error message.'; case 0: return 'Shell subprocess ended cleanly $when. Did main() call exit()?'; - case -0x0f: // ProcessSignal.SIGTERM + case -0x0f: // ProcessSignal.sigterm return 'Shell subprocess crashed with SIGTERM ($exitCode) $when.'; - case -0x0b: // ProcessSignal.SIGSEGV + case -0x0b: // ProcessSignal.sigsegv return 'Shell subprocess crashed with segmentation fault $when.'; - case -0x06: // ProcessSignal.SIGABRT + case -0x06: // ProcessSignal.sigabrt return 'Shell subprocess crashed with SIGABRT ($exitCode) $when.'; - case -0x02: // ProcessSignal.SIGINT + case -0x02: // ProcessSignal.sigint return 'Shell subprocess terminated by ^C (SIGINT, $exitCode) $when.'; default: return 'Shell subprocess crashed with unexpected exit code $exitCode $when.'; diff --git a/packages/flutter_tools/lib/src/test/runner.dart b/packages/flutter_tools/lib/src/test/runner.dart index ea6f9c8c4e..570e13faec 100644 --- a/packages/flutter_tools/lib/src/test/runner.dart +++ b/packages/flutter_tools/lib/src/test/runner.dart @@ -77,7 +77,7 @@ Future runTests( throwToolExit('Cannot find Flutter shell at $shellPath'); final InternetAddressType serverType = - ipv6 ? InternetAddressType.IP_V6 : InternetAddressType.IP_V4; + ipv6 ? InternetAddressType.IPv6 : InternetAddressType.IPv4; loader.installHook( shellPath: shellPath, diff --git a/packages/flutter_tools/test/base/io_test.dart b/packages/flutter_tools/test/base/io_test.dart index 506be74ba4..8a173a9d11 100644 --- a/packages/flutter_tools/test/base/io_test.dart +++ b/packages/flutter_tools/test/base/io_test.dart @@ -26,7 +26,7 @@ void main() { }); testUsingContext('toString() works', () async { - expect(io.ProcessSignal.SIGINT.toString(), ProcessSignal.SIGINT.toString()); + expect(io.ProcessSignal.sigint.toString(), ProcessSignal.SIGINT.toString()); }); }); } diff --git a/packages/flutter_tools/test/cache_test.dart b/packages/flutter_tools/test/cache_test.dart index 83cd7932fb..ed4ad61fc5 100644 --- a/packages/flutter_tools/test/cache_test.dart +++ b/packages/flutter_tools/test/cache_test.dart @@ -124,7 +124,7 @@ class MockFileSystem extends ForwardingFileSystem { class MockFile extends Mock implements File { @override - Future open({FileMode mode: FileMode.READ}) async { + Future open({FileMode mode: FileMode.read}) async { return new MockRandomAccessFile(); } } diff --git a/packages/flutter_tools/test/commands/create_test.dart b/packages/flutter_tools/test/commands/create_test.dart index dfa49b0513..62b2d2569d 100644 --- a/packages/flutter_tools/test/commands/create_test.dart +++ b/packages/flutter_tools/test/commands/create_test.dart @@ -508,7 +508,7 @@ class LoggingProcessManager extends LocalProcessManager { Map environment, bool includeParentEnvironment: true, bool runInShell: false, - ProcessStartMode mode: ProcessStartMode.NORMAL, + ProcessStartMode mode: ProcessStartMode.normal, }) { commands.add(command); return super.start( diff --git a/packages/flutter_tools/test/commands/devices_test.dart b/packages/flutter_tools/test/commands/devices_test.dart index 262c4730b5..ddae18412e 100644 --- a/packages/flutter_tools/test/commands/devices_test.dart +++ b/packages/flutter_tools/test/commands/devices_test.dart @@ -48,8 +48,8 @@ class MockProcessManager extends Mock implements ProcessManager { Map environment, bool includeParentEnvironment: true, bool runInShell: false, - Encoding stdoutEncoding: SYSTEM_ENCODING, - Encoding stderrEncoding: SYSTEM_ENCODING, + Encoding stdoutEncoding: systemEncoding, + Encoding stderrEncoding: systemEncoding, }) async { return new ProcessResult(0, 0, '', ''); } @@ -61,8 +61,8 @@ class MockProcessManager extends Mock implements ProcessManager { Map environment, bool includeParentEnvironment: true, bool runInShell: false, - Encoding stdoutEncoding: SYSTEM_ENCODING, - Encoding stderrEncoding: SYSTEM_ENCODING, + Encoding stdoutEncoding: systemEncoding, + Encoding stderrEncoding: systemEncoding, }) { return new ProcessResult(0, 0, '', ''); } diff --git a/packages/flutter_tools/test/commands/fuchsia_reload_test.dart b/packages/flutter_tools/test/commands/fuchsia_reload_test.dart index 2d0eef8e94..6fbd38f4f5 100644 --- a/packages/flutter_tools/test/commands/fuchsia_reload_test.dart +++ b/packages/flutter_tools/test/commands/fuchsia_reload_test.dart @@ -38,8 +38,8 @@ class MockProcessManager extends Mock implements ProcessManager { Map environment, bool includeParentEnvironment: true, bool runInShell: false, - Encoding stdoutEncoding: SYSTEM_ENCODING, - Encoding stderrEncoding: SYSTEM_ENCODING, + Encoding stdoutEncoding: systemEncoding, + Encoding stderrEncoding: systemEncoding, }) async { return new ProcessResult(0, 0, '1234\n5678\n5', ''); } diff --git a/packages/flutter_tools/test/dart/pub_get_test.dart b/packages/flutter_tools/test/dart/pub_get_test.dart index 8393d7f5ff..b8b2ff78d8 100644 --- a/packages/flutter_tools/test/dart/pub_get_test.dart +++ b/packages/flutter_tools/test/dart/pub_get_test.dart @@ -164,7 +164,7 @@ class MockProcessManager implements ProcessManager { Map environment, bool includeParentEnvironment: true, bool runInShell: false, - ProcessStartMode mode: ProcessStartMode.NORMAL, + ProcessStartMode mode: ProcessStartMode.normal, }) { lastPubEnvironment = environment['PUB_ENVIRONMENT']; lastPubCache = environment['PUB_CACHE']; @@ -237,7 +237,7 @@ class MockFileSystem extends ForwardingFileSystem { class MockFile implements File { @override - Future open({FileMode mode: FileMode.READ}) async { + Future open({FileMode mode: FileMode.read}) async { return new MockRandomAccessFile(); } diff --git a/packages/flutter_tools/test/devfs_test.dart b/packages/flutter_tools/test/devfs_test.dart index cccb9b43f0..6955bfe86e 100644 --- a/packages/flutter_tools/test/devfs_test.dart +++ b/packages/flutter_tools/test/devfs_test.dart @@ -388,11 +388,11 @@ class MockVMService extends BasicMock implements VMService { Future setUp() async { try { - _server = await HttpServer.bind(InternetAddress.LOOPBACK_IP_V6, 0); + _server = await HttpServer.bind(InternetAddress.loopbackIPv6, 0); _httpAddress = Uri.parse('http://[::1]:${_server.port}'); } on SocketException { // Fall back to IPv4 if the host doesn't support binding to IPv6 localhost - _server = await HttpServer.bind(InternetAddress.LOOPBACK_IP_V4, 0); + _server = await HttpServer.bind(InternetAddress.loopbackIPv4, 0); _httpAddress = Uri.parse('http://127.0.0.1:${_server.port}'); } _server.listen((HttpRequest request) { diff --git a/packages/flutter_tools/test/src/mocks.dart b/packages/flutter_tools/test/src/mocks.dart index d7e4a1c49b..3b7347c2d0 100644 --- a/packages/flutter_tools/test/src/mocks.dart +++ b/packages/flutter_tools/test/src/mocks.dart @@ -122,7 +122,7 @@ class MockProcessManager implements ProcessManager { Map environment, bool includeParentEnvironment: true, bool runInShell: false, - ProcessStartMode mode: ProcessStartMode.NORMAL, + ProcessStartMode mode: ProcessStartMode.normal, }) { if (!succeed) { final String executable = command[0]; diff --git a/packages/fuchsia_remote_debug_protocol/lib/src/fuchsia_remote_connection.dart b/packages/fuchsia_remote_debug_protocol/lib/src/fuchsia_remote_connection.dart index 65da2f3a20..2507050ae0 100644 --- a/packages/fuchsia_remote_debug_protocol/lib/src/fuchsia_remote_connection.dart +++ b/packages/fuchsia_remote_debug_protocol/lib/src/fuchsia_remote_connection.dart @@ -13,9 +13,9 @@ import 'common/network.dart'; import 'dart/dart_vm.dart'; import 'runners/ssh_command_runner.dart'; -final String _ipv4Loopback = InternetAddress.LOOPBACK_IP_V4.address; +final String _ipv4Loopback = InternetAddress.loopbackIPv4.address; -final String _ipv6Loopback = InternetAddress.LOOPBACK_IP_V6.address; +final String _ipv6Loopback = InternetAddress.loopbackIPv6.address; const ProcessManager _processManager = const LocalProcessManager();