From 32f94443cc3fc2e19f5b36ea09e486aac57a9328 Mon Sep 17 00:00:00 2001 From: Leaf Petersen Date: Fri, 20 Jul 2018 15:07:24 -0700 Subject: [PATCH] Remove uses of deprecated constants and change int.parse to int.tryParse (#19575) * Remove uses of deprecated constants * Change int.parse to int.tryParse where appropriate --- dev/automated_tests/test_smoke_test/crash1_test.dart | 2 +- dev/automated_tests/test_smoke_test/crash2_test.dart | 2 +- dev/bots/analyze-sample-code.dart | 8 ++++---- dev/devicelab/bin/tasks/gradle_plugin_test.dart | 8 ++++---- dev/devicelab/lib/framework/ios.dart | 2 +- dev/devicelab/lib/framework/runner.dart | 4 ++-- dev/devicelab/lib/tasks/microbenchmarks.dart | 4 ++-- packages/flutter_driver/lib/src/driver/driver.dart | 2 +- packages/flutter_goldens/lib/flutter_goldens.dart | 4 ++-- .../flutter_tools/lib/src/android/android_device.dart | 8 ++++---- packages/flutter_tools/lib/src/asset.dart | 2 +- packages/flutter_tools/lib/src/base/file_system.dart | 8 ++++---- packages/flutter_tools/lib/src/base/io.dart | 4 ++-- packages/flutter_tools/lib/src/base/process.dart | 2 +- packages/flutter_tools/lib/src/cache.dart | 2 +- .../flutter_tools/lib/src/commands/analyze_base.dart | 2 +- .../flutter_tools/lib/src/commands/analyze_once.dart | 4 ++-- packages/flutter_tools/lib/src/commands/create.dart | 6 +++--- packages/flutter_tools/lib/src/commands/drive.dart | 4 ++-- .../flutter_tools/lib/src/commands/fuchsia_reload.dart | 6 +++--- .../flutter_tools/lib/src/commands/ide_config.dart | 4 ++-- .../lib/src/commands/update_packages.dart | 4 ++-- packages/flutter_tools/lib/src/dependency_checker.dart | 2 +- packages/flutter_tools/lib/src/devfs.dart | 6 +++--- packages/flutter_tools/lib/src/ios/mac.dart | 2 +- packages/flutter_tools/lib/src/ios/simulators.dart | 2 +- packages/flutter_tools/lib/src/services.dart | 2 +- .../flutter_tools/lib/src/test/flutter_platform.dart | 10 +++++----- packages/flutter_tools/lib/src/test/runner.dart | 2 +- packages/flutter_tools/lib/src/version.dart | 5 +---- packages/flutter_tools/lib/src/vmservice.dart | 2 +- packages/flutter_tools/test/base/io_test.dart | 2 +- packages/flutter_tools/test/cache_test.dart | 2 +- packages/flutter_tools/test/commands/create_test.dart | 2 +- packages/flutter_tools/test/commands/devices_test.dart | 8 ++++---- .../test/commands/fuchsia_reload_test.dart | 4 ++-- packages/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 ++-- 40 files changed, 77 insertions(+), 80 deletions(-) diff --git a/dev/automated_tests/test_smoke_test/crash1_test.dart b/dev/automated_tests/test_smoke_test/crash1_test.dart index 140678e135b..97aa99c68b3 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)) { // ignore: deprecated_member_use + 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 3cf9d7f412b..9ae1089f7a0 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); // ignore: deprecated_member_use + system.Process.killPid(system.pid, system.ProcessSignal.sigsegv); } diff --git a/dev/bots/analyze-sample-code.dart b/dev/bots/analyze-sample-code.dart index ca3ebbaa760..5974d4b019e 100644 --- a/dev/bots/analyze-sample-code.dart +++ b/dev/bots/analyze-sample-code.dart @@ -240,10 +240,10 @@ dependencies: throw 'failed to parse error message: $error'; } final String column = error.substring(colon2 + kColon.length, bullet2); - // ignore: deprecated_member_use - final int lineNumber = int.parse(line, radix: 10, onError: (String source) => throw 'failed to parse error message: $error'); - // ignore: deprecated_member_use - final int columnNumber = int.parse(column, radix: 10, onError: (String source) => throw 'failed to parse error message: $error'); + + final int lineNumber = int.tryParse(line, radix: 10); + + final int columnNumber = int.tryParse(column, radix: 10); if (lineNumber == null) { throw 'failed to parse error message: $error'; } diff --git a/dev/devicelab/bin/tasks/gradle_plugin_test.dart b/dev/devicelab/bin/tasks/gradle_plugin_test.dart index 1ae8200398e..70eacefdb67 100644 --- a/dev/devicelab/bin/tasks/gradle_plugin_test.dart +++ b/dev/devicelab/bin/tasks/gradle_plugin_test.dart @@ -176,8 +176,8 @@ class FlutterProject { final File buildScript = new File( path.join(androidPath, 'app', 'build.gradle'), ); - // ignore: deprecated_member_use - buildScript.openWrite(mode: FileMode.APPEND).write(''' + + buildScript.openWrite(mode: FileMode.append).write(''' android { buildTypes { @@ -193,8 +193,8 @@ android { final File buildScript = new File( path.join(androidPath, 'app', 'build.gradle'), ); - // ignore: deprecated_member_use - 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 ba6bce6bafc..d79ba0f88f3 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); // ignore: deprecated_member_use + 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 aec1c70a7ac..36807b54e7f 100644 --- a/dev/devicelab/lib/framework/runner.dart +++ b/dev/devicelab/lib/framework/runner.dart @@ -73,14 +73,14 @@ Future> runTask(String taskName, { bool silent = false }) a await runner.exitCode.timeout(const Duration(seconds: 1)); return taskResult; } on TimeoutException catch (timeout) { - runner.kill(ProcessSignal.SIGINT); // ignore: deprecated_member_use + runner.kill(ProcessSignal.sigint); return { 'success': false, 'reason': 'Timeout waiting for $waitingFor: ${timeout.message}', }; } finally { if (!runnerFinished) - runner.kill(ProcessSignal.SIGKILL); // ignore: deprecated_member_use + runner.kill(ProcessSignal.sigkill); await stdoutSub.cancel(); await stderrSub.cancel(); } diff --git a/dev/devicelab/lib/tasks/microbenchmarks.dart b/dev/devicelab/lib/tasks/microbenchmarks.dart index 0f774b49a38..29114017118 100644 --- a/dev/devicelab/lib/tasks/microbenchmarks.dart +++ b/dev/devicelab/lib/tasks/microbenchmarks.dart @@ -124,8 +124,8 @@ Future> _readJsonResults(Process process) { jsonStarted = false; processWasKilledIntentionally = true; resultsHaveBeenParsed = true; - // ignore: deprecated_member_use - process.kill(ProcessSignal.SIGINT); // flutter run doesn't quit automatically + + process.kill(ProcessSignal.sigint); // flutter run doesn't quit automatically try { completer.complete(new Map.from(json.decode(jsonOutput))); } catch (ex) { diff --git a/packages/flutter_driver/lib/src/driver/driver.dart b/packages/flutter_driver/lib/src/driver/driver.dart index deb6335b6bc..e7b8273d5c5 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); // ignore: deprecated_member_use + 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 5f960788a1b..b51105a9da6 100644 --- a/packages/flutter_goldens/lib/flutter_goldens.dart +++ b/packages/flutter_goldens/lib/flutter_goldens.dart @@ -236,8 +236,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); // ignore: deprecated_member_use - await _lock.lock(io.FileLock.BLOCKING_EXCLUSIVE); // ignore: deprecated_member_use + _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/android/android_device.dart b/packages/flutter_tools/lib/src/android/android_device.dart index c69d94705df..0d2a4e42ec9 100644 --- a/packages/flutter_tools/lib/src/android/android_device.dart +++ b/packages/flutter_tools/lib/src/android/android_device.dart @@ -210,8 +210,8 @@ class AndroidDevice extends Device { // Sample output: '22' final String sdkVersion = await _getProperty('ro.build.version.sdk'); - // ignore: deprecated_member_use - final int sdkVersionParsed = int.parse(sdkVersion, onError: (String source) => null); + + final int sdkVersionParsed = int.tryParse(sdkVersion); if (sdkVersionParsed == null) { printError('Unexpected response from getprop: "$sdkVersion"'); return false; @@ -822,8 +822,8 @@ class _AndroidDevicePortForwarder extends DevicePortForwarder { final AndroidDevice device; static int _extractPort(String portString) { - // ignore: deprecated_member_use - return int.parse(portString.trim(), onError: (_) => null); + + return int.tryParse(portString.trim()); } @override diff --git a/packages/flutter_tools/lib/src/asset.dart b/packages/flutter_tools/lib/src/asset.dart index 9ee330c4013..26e8fd92e4f 100644 --- a/packages/flutter_tools/lib/src/asset.dart +++ b/packages/flutter_tools/lib/src/asset.dart @@ -80,7 +80,7 @@ class _ManifestAssetBundle implements AssetBundle { return true; final FileStat stat = fs.file(manifestPath).statSync(); - if (stat.type == FileSystemEntityType.NOT_FOUND) // ignore: deprecated_member_use + 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 ea918cd3d15..a6f8c27846a 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: // ignore: deprecated_member_use - case FileSystemEntityType.LINK: // ignore: deprecated_member_use + case FileSystemEntityType.file: + case FileSystemEntityType.link: throwToolExit('Invalid record-to location: $dirname ("$basename" exists as non-directory)'); break; - case FileSystemEntityType.DIRECTORY: // ignore: deprecated_member_use + 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: // ignore: deprecated_member_use + 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 ed1531ffc8a..c09041f81a8 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, // ignore: deprecated_member_use + gzip, HandshakeException, HttpClient, HttpClientRequest, @@ -71,7 +71,7 @@ export 'dart:io' // stdout, NO! Use `io.dart` Socket, SocketException, - SYSTEM_ENCODING, // ignore: deprecated_member_use + systemEncoding, WebSocket, WebSocketException, WebSocketTransformer; diff --git a/packages/flutter_tools/lib/src/base/process.dart b/packages/flutter_tools/lib/src/base/process.dart index 3f7507be2d8..a3dca75a8e5 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, // ignore: deprecated_member_use + mode: ProcessStartMode.detached, ); return proc; } diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart index b004f2067cb..ccfeb15b437 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); // ignore: deprecated_member_use + _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 e4f7c29e147..9464d3b5936 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); // ignore: deprecated_member_use + 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/analyze_once.dart b/packages/flutter_tools/lib/src/commands/analyze_once.dart index b8840a90eed..49a0eb9db69 100644 --- a/packages/flutter_tools/lib/src/commands/analyze_once.dart +++ b/packages/flutter_tools/lib/src/commands/analyze_once.dart @@ -47,9 +47,9 @@ class AnalyzeOnce extends AnalyzeBase { for (String directory in directories) { final FileSystemEntityType type = fs.typeSync(directory); - if (type == FileSystemEntityType.NOT_FOUND) { // ignore: deprecated_member_use + if (type == FileSystemEntityType.notFound) { throwToolExit("'$directory' does not exist"); - } else if (type != FileSystemEntityType.DIRECTORY) { // ignore: deprecated_member_use + } else if (type != FileSystemEntityType.directory) { throwToolExit("'$directory' is not a directory"); } } diff --git a/packages/flutter_tools/lib/src/commands/create.dart b/packages/flutter_tools/lib/src/commands/create.dart index 7c97cf30c0b..7413905b0a4 100644 --- a/packages/flutter_tools/lib/src/commands/create.dart +++ b/packages/flutter_tools/lib/src/commands/create.dart @@ -453,12 +453,12 @@ String _validateProjectDir(String dirPath, { String flutterRoot }) { final FileSystemEntityType type = fs.typeSync(dirPath); - if (type != FileSystemEntityType.NOT_FOUND) { // ignore: deprecated_member_use + if (type != FileSystemEntityType.notFound) { switch (type) { - case FileSystemEntityType.FILE: // ignore: deprecated_member_use + case FileSystemEntityType.file: // Do not overwrite files. return "Invalid project name: '$dirPath' - file exists."; - case FileSystemEntityType.LINK: // ignore: deprecated_member_use + 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 bec0e38530e..79a5b1504dc 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) // ignore: deprecated_member_use + 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) { // ignore: deprecated_member_use + 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 9b52118659b..4650790550f 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; // ignore: deprecated_member_use +final String ipv4Loopback = InternetAddress.loopbackIPv4.address; class FuchsiaReloadCommand extends FlutterCommand { FuchsiaReloadCommand() { @@ -386,8 +386,8 @@ class FuchsiaReloadCommand extends FlutterCommand { final int lastSpace = trimmed.lastIndexOf(' '); final String lastWord = trimmed.substring(lastSpace + 1); if ((lastWord != '.') && (lastWord != '..')) { - // ignore: deprecated_member_use - final int value = int.parse(lastWord, onError: (_) => null); + + final int value = int.tryParse(lastWord); if (value != null) ports.add(value); } diff --git a/packages/flutter_tools/lib/src/commands/ide_config.dart b/packages/flutter_tools/lib/src/commands/ide_config.dart index ffae0016c9f..f392917a480 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) { // ignore: deprecated_member_use + if (type != FileSystemEntityType.notFound) { switch (type) { - case FileSystemEntityType.LINK: // ignore: deprecated_member_use + 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/commands/update_packages.dart b/packages/flutter_tools/lib/src/commands/update_packages.dart index cf14a2af0f9..0babb97edf4 100644 --- a/packages/flutter_tools/lib/src/commands/update_packages.dart +++ b/packages/flutter_tools/lib/src/commands/update_packages.dart @@ -785,8 +785,8 @@ class PubspecChecksum extends PubspecLine { if (twoLines.length != 2) { return new PubspecChecksum(-1, line); } - // ignore: deprecated_member_use - final int value = int.parse(twoLines.last.trim(), radix: 16, onError: (String _) => -1); + + final int value = int.tryParse(twoLines.last.trim(), radix: 16) ?? -1; return new PubspecChecksum(value, line); } } diff --git a/packages/flutter_tools/lib/src/dependency_checker.dart b/packages/flutter_tools/lib/src/dependency_checker.dart index a8c0cc06649..1ff6eaa4e85 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) { // ignore: deprecated_member_use + 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 a4905e90f5d..1ec19a7db64 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); // ignore: deprecated_member_use + 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) { // ignore: deprecated_member_use + if (_fileStat.type == FileSystemEntityType.link) { // Resolve, stat, and maybe cache the symlink target. final String resolved = file.resolveSymbolicLinksSync(); final FileSystemEntity linkTarget = fs.file(resolved); @@ -666,7 +666,7 @@ class DevFS { try { final FileSystemEntityType linkType = fs.statSync(file.resolveSymbolicLinksSync()).type; - if (linkType == FileSystemEntityType.DIRECTORY) // ignore: deprecated_member_use + 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 63c8da9d65b..21058723f96 100644 --- a/packages/flutter_tools/lib/src/ios/mac.dart +++ b/packages/flutter_tools/lib/src/ios/mac.dart @@ -582,7 +582,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); // ignore: deprecated_member_use + manifest.writeAsStringSync(json.encode(jsonObject), mode: FileMode.write, flush: true); } Future upgradePbxProjWithFlutterAssets(String app, String appPath) async { diff --git a/packages/flutter_tools/lib/src/ios/simulators.dart b/packages/flutter_tools/lib/src/ios/simulators.dart index af9d6464d98..16fcbc71de5 100644 --- a/packages/flutter_tools/lib/src/ios/simulators.dart +++ b/packages/flutter_tools/lib/src/ios/simulators.dart @@ -435,7 +435,7 @@ class IOSSimulator extends Device { void clearLogs() { final File logFile = fs.file(logFilePath); if (logFile.existsSync()) { - final RandomAccessFile randomFile = logFile.openSync(mode: FileMode.WRITE); // ignore: deprecated_member_use + final RandomAccessFile randomFile = logFile.openSync(mode: FileMode.write); randomFile.truncateSync(0); randomFile.closeSync(); } diff --git a/packages/flutter_tools/lib/src/services.dart b/packages/flutter_tools/lib/src/services.dart index faf5a57c422..5668efc602e 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); // ignore: deprecated_member_use + 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 81948aeb162..8c69a43167e 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, // ignore: deprecated_member_use - InternetAddressType.IP_V6: InternetAddress.LOOPBACK_IP_V6, // ignore: deprecated_member_use + 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, // ignore: deprecated_member_use + InternetAddressType serverType = InternetAddressType.IPv4, }) { assert(!enableObservatory || (!startPaused && observatoryPort == null)); hack.registerPlatformPlugin( @@ -120,7 +120,7 @@ String generateTestBootstrap({ assert(host != null); assert(updateGoldens != null); - final String websocketUrl = host.type == InternetAddressType.IP_V4 // ignore: deprecated_member_use + final String websocketUrl = host.type == InternetAddressType.IPv4 ? 'ws://${host.address}' : 'ws://[${host.address}]'; final String encodedWebsocketUrl = Uri.encodeComponent(websocketUrl); @@ -796,7 +796,7 @@ class _FlutterPlatform extends PlatformPlugin { } else { command.add('--disable-observatory'); } - if (host.type == InternetAddressType.IP_V6) // ignore: deprecated_member_use + if (host.type == InternetAddressType.IPv6) command.add('--ipv6'); if (bundlePath != null) { command.add('--flutter-assets-dir=$bundlePath'); diff --git a/packages/flutter_tools/lib/src/test/runner.dart b/packages/flutter_tools/lib/src/test/runner.dart index 384d64c3d13..e447e2f69b6 100644 --- a/packages/flutter_tools/lib/src/test/runner.dart +++ b/packages/flutter_tools/lib/src/test/runner.dart @@ -78,7 +78,7 @@ Future runTests( throwToolExit('Cannot find Flutter shell at $shellPath'); final InternetAddressType serverType = - ipv6 ? InternetAddressType.IP_V6 : InternetAddressType.IP_V4; // ignore: deprecated_member_use + ipv6 ? InternetAddressType.IPv6 : InternetAddressType.IPv4; loader.installHook( shellPath: shellPath, diff --git a/packages/flutter_tools/lib/src/version.dart b/packages/flutter_tools/lib/src/version.dart index 6947a27199f..28e1328eb6f 100644 --- a/packages/flutter_tools/lib/src/version.dart +++ b/packages/flutter_tools/lib/src/version.dart @@ -534,10 +534,7 @@ class GitTagVersion { printTrace('Could not interpret results of "git describe": $version'); return const GitTagVersion.unknown(); } - final List parsedParts = parts.take(4).map( - // ignore: deprecated_member_use - (String value) => int.parse(value, onError: (String value) => null), - ).toList(); + final List parsedParts = parts.take(4).map(int.tryParse).toList(); return new GitTagVersion(parsedParts[0], parsedParts[1], parsedParts[2], parsedParts[3], parts[4]); } diff --git a/packages/flutter_tools/lib/src/vmservice.dart b/packages/flutter_tools/lib/src/vmservice.dart index cc2767c5c43..c010e76aed4 100644 --- a/packages/flutter_tools/lib/src/vmservice.dart +++ b/packages/flutter_tools/lib/src/vmservice.dart @@ -1402,7 +1402,7 @@ class ServiceMap extends ServiceObject implements Map { Iterable> get entries => _map.entries; @override void updateAll(dynamic update(String key, dynamic value)) => _map.updateAll(update); - Map retype() => _map.cast(); // ignore: deprecated_member_use,annotate_overrides + Map retype() => _map.cast(); // ignore: annotate_overrides @override dynamic update(String key, dynamic update(dynamic value), {dynamic ifAbsent()}) => _map.update(key, update, ifAbsent: ifAbsent); } diff --git a/packages/flutter_tools/test/base/io_test.dart b/packages/flutter_tools/test/base/io_test.dart index ce6045e4697..8a173a9d11d 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()); // ignore: deprecated_member_use + 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 a1f8044c478..e46c539fa35 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 { // ignore: deprecated_member_use + 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 ad274911973..27ce133e56d 100644 --- a/packages/flutter_tools/test/commands/create_test.dart +++ b/packages/flutter_tools/test/commands/create_test.dart @@ -563,7 +563,7 @@ class LoggingProcessManager extends LocalProcessManager { Map environment, bool includeParentEnvironment = true, bool runInShell = false, - ProcessStartMode mode = ProcessStartMode.NORMAL, // ignore: deprecated_member_use + 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 395d3101ac5..cc0a134b335 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, // ignore: deprecated_member_use - Encoding stderrEncoding = SYSTEM_ENCODING, // ignore: deprecated_member_use + 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, // ignore: deprecated_member_use - Encoding stderrEncoding = SYSTEM_ENCODING, // ignore: deprecated_member_use + 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 7fdcb603c82..c0d3bf5866c 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, // ignore: deprecated_member_use - Encoding stderrEncoding = SYSTEM_ENCODING, // ignore: deprecated_member_use + 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 f9c2b7a349f..b30b2385953 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, // ignore: deprecated_member_use + 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 { // ignore: deprecated_member_use + 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 2f165a3ddc1..b4ef653ea3f 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); // ignore: deprecated_member_use + _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); // ignore: deprecated_member_use + _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 e89fb67bbcc..886f8eb1daa 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, // ignore: deprecated_member_use + 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 2b03e9b3c7b..be2b15a95cd 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 @@ -477,8 +477,8 @@ class FuchsiaRemoteConnection { final int lastSpace = trimmed.lastIndexOf(' '); final String lastWord = trimmed.substring(lastSpace + 1); if ((lastWord != '.') && (lastWord != '..')) { - // ignore: deprecated_member_use - final int value = int.parse(lastWord, onError: (_) => null); + + final int value = int.tryParse(lastWord); if (value != null) { ports.add(value); }