Use Dart 2 camel case constants (#15360)
diff --git a/packages/flutter_tools/lib/src/android/android_device.dart b/packages/flutter_tools/lib/src/android/android_device.dart
index f2779f3..87f28db 100644
--- a/packages/flutter_tools/lib/src/android/android_device.dart
+++ b/packages/flutter_tools/lib/src/android/android_device.dart
@@ -80,12 +80,12 @@
printTrace(propCommand.join(' '));
try {
- // We pass an encoding of LATIN1 so that we don't try and interpret the
+ // We pass an encoding of latin1 so that we don't try and interpret the
// `adb shell getprop` result as UTF8.
final ProcessResult result = await processManager.run(
propCommand,
- stdoutEncoding: LATIN1,
- stderrEncoding: LATIN1,
+ stdoutEncoding: latin1,
+ stderrEncoding: latin1,
).timeout(const Duration(seconds: 5));
if (result.exitCode == 0) {
_properties = parseAdbDeviceProperties(result.stdout);
@@ -522,7 +522,7 @@
final StreamSubscription<String> logs = getLogReader().logLines.listen((String line) {
final Match match = discoverExp.firstMatch(line);
if (match != null) {
- final Map<String, dynamic> app = JSON.decode(match.group(1));
+ final Map<String, dynamic> app = json.decode(match.group(1));
result.add(new DiscoveredApp(app['id'], app['observatoryPort']));
}
});
diff --git a/packages/flutter_tools/lib/src/asset.dart b/packages/flutter_tools/lib/src/asset.dart
index 454a49f..0915d17 100644
--- a/packages/flutter_tools/lib/src/asset.dart
+++ b/packages/flutter_tools/lib/src/asset.dart
@@ -206,7 +206,7 @@
if (fonts.isNotEmpty)
- entries[_kFontManifestJson] = new DevFSStringContent(JSON.encode(fonts));
+ entries[_kFontManifestJson] = new DevFSStringContent(json.encode(fonts));
// TODO(ianh): Only do the following line if we've changed packages or if our LICENSE file changed
entries[_kLICENSE] = await _obtainLicenses(packageMap, assetBasePath, reportPackages: reportLicensedPackages);
@@ -368,14 +368,14 @@
}
DevFSContent _createAssetManifest(Map<_Asset, List<_Asset>> assetVariants) {
- final Map<String, List<String>> json = <String, List<String>>{};
+ final Map<String, List<String>> jsonObject = <String, List<String>>{};
for (_Asset main in assetVariants.keys) {
final List<String> variants = <String>[];
for (_Asset variant in assetVariants[main])
variants.add(variant.entryUri.path);
- json[main.entryUri.path] = variants;
+ jsonObject[main.entryUri.path] = variants;
}
- return new DevFSStringContent(JSON.encode(json));
+ return new DevFSStringContent(json.encode(jsonObject));
}
List<Map<String, dynamic>> _parseFonts(
diff --git a/packages/flutter_tools/lib/src/base/build.dart b/packages/flutter_tools/lib/src/base/build.dart
index 0f92167..2f70774 100644
--- a/packages/flutter_tools/lib/src/base/build.dart
+++ b/packages/flutter_tools/lib/src/base/build.dart
@@ -3,7 +3,7 @@
// found in the LICENSE file.
import 'dart:async';
-import 'dart:convert' show JSON;
+import 'dart:convert' show json;
import 'package:crypto/crypto.dart' show md5;
import 'package:meta/meta.dart';
@@ -79,8 +79,8 @@
///
/// Throws [ArgumentError], if there is a version mismatch between the
/// serializing framework and this framework.
- Fingerprint.fromJson(String json) {
- final Map<String, dynamic> content = JSON.decode(json);
+ Fingerprint.fromJson(String jsonData) {
+ final Map<String, dynamic> content = json.decode(jsonData);
final String version = content['version'];
if (version != FlutterVersion.instance.frameworkRevision)
@@ -92,7 +92,7 @@
Map<String, String> _checksums;
Map<String, String> _properties;
- String toJson() => JSON.encode(<String, dynamic>{
+ String toJson() => json.encode(<String, dynamic>{
'version': FlutterVersion.instance.frameworkRevision,
'properties': _properties,
'files': _checksums,
diff --git a/packages/flutter_tools/lib/src/base/config.dart b/packages/flutter_tools/lib/src/base/config.dart
index 373173f..7703326 100644
--- a/packages/flutter_tools/lib/src/base/config.dart
+++ b/packages/flutter_tools/lib/src/base/config.dart
@@ -12,7 +12,7 @@
Config([File configFile]) {
_configFile = configFile ?? fs.file(fs.path.join(_userHomeDir(), '.flutter_settings'));
if (_configFile.existsSync())
- _values = JSON.decode(_configFile.readAsStringSync());
+ _values = json.decode(_configFile.readAsStringSync());
}
static Config get instance => context[Config];
diff --git a/packages/flutter_tools/lib/src/base/process.dart b/packages/flutter_tools/lib/src/base/process.dart
index 2c573e0..31b7071 100644
--- a/packages/flutter_tools/lib/src/base/process.dart
+++ b/packages/flutter_tools/lib/src/base/process.dart
@@ -137,7 +137,7 @@
environment: environment
);
final StreamSubscription<String> stdoutSubscription = process.stdout
- .transform(UTF8.decoder)
+ .transform(utf8.decoder)
.transform(const LineSplitter())
.where((String line) => filter == null ? true : filter.hasMatch(line))
.listen((String line) {
@@ -152,7 +152,7 @@
}
});
final StreamSubscription<String> stderrSubscription = process.stderr
- .transform(UTF8.decoder)
+ .transform(utf8.decoder)
.transform(const LineSplitter())
.where((String line) => filter == null ? true : filter.hasMatch(line))
.listen((String line) {
diff --git a/packages/flutter_tools/lib/src/base/terminal.dart b/packages/flutter_tools/lib/src/base/terminal.dart
index f777c90..7990436 100644
--- a/packages/flutter_tools/lib/src/base/terminal.dart
+++ b/packages/flutter_tools/lib/src/base/terminal.dart
@@ -3,7 +3,7 @@
// found in the LICENSE file.
import 'dart:async';
-import 'dart:convert' show ASCII;
+import 'dart:convert' show ascii;
import 'package:quiver/strings.dart';
@@ -87,7 +87,7 @@
///
/// Useful when the console is in [singleCharMode].
Stream<String> get onCharInput {
- _broadcastStdInString ??= io.stdin.transform(ASCII.decoder).asBroadcastStream();
+ _broadcastStdInString ??= io.stdin.transform(ascii.decoder).asBroadcastStream();
return _broadcastStdInString;
}
diff --git a/packages/flutter_tools/lib/src/base/utils.dart b/packages/flutter_tools/lib/src/base/utils.dart
index cbbc5dd..f980e19 100644
--- a/packages/flutter_tools/lib/src/base/utils.dart
+++ b/packages/flutter_tools/lib/src/base/utils.dart
@@ -114,7 +114,7 @@
final NumberFormat kMillisecondsFormat = new NumberFormat.decimalPattern();
String getElapsedAsSeconds(Duration duration) {
- final double seconds = duration.inMilliseconds / Duration.MILLISECONDS_PER_SECOND;
+ final double seconds = duration.inMilliseconds / Duration.millisecondsPerSecond;
return '${kSecondsFormat.format(seconds)}s';
}
@@ -239,7 +239,7 @@
/// - has a different initial value for the first callback delay
/// - waits for a callback to be complete before it starts the next timer
class Poller {
- Poller(this.callback, this.pollingInterval, { this.initialDelay: Duration.ZERO }) {
+ Poller(this.callback, this.pollingInterval, { this.initialDelay: Duration.zero }) {
new Future<Null>.delayed(initialDelay, _handleCallback);
}
diff --git a/packages/flutter_tools/lib/src/commands/analyze_continuously.dart b/packages/flutter_tools/lib/src/commands/analyze_continuously.dart
index 1982ceb..55e5818 100644
--- a/packages/flutter_tools/lib/src/commands/analyze_continuously.dart
+++ b/packages/flutter_tools/lib/src/commands/analyze_continuously.dart
@@ -181,10 +181,10 @@
// This callback hookup can't throw.
_process.exitCode.whenComplete(() => _process = null); // ignore: unawaited_futures
- final Stream<String> errorStream = _process.stderr.transform(UTF8.decoder).transform(const LineSplitter());
+ final Stream<String> errorStream = _process.stderr.transform(utf8.decoder).transform(const LineSplitter());
errorStream.listen(printError);
- final Stream<String> inStream = _process.stdout.transform(UTF8.decoder).transform(const LineSplitter());
+ final Stream<String> inStream = _process.stdout.transform(utf8.decoder).transform(const LineSplitter());
inStream.listen(_handleServerResponse);
// Available options (many of these are obsolete):
@@ -212,7 +212,7 @@
Future<int> get onExit => _process.exitCode;
void _sendCommand(String method, Map<String, dynamic> params) {
- final String message = JSON.encode(<String, dynamic> {
+ final String message = json.encode(<String, dynamic> {
'id': (++_id).toString(),
'method': method,
'params': params
@@ -224,7 +224,7 @@
void _handleServerResponse(String line) {
printTrace('<== $line');
- final dynamic response = JSON.decode(line);
+ final dynamic response = json.decode(line);
if (response is Map<dynamic, dynamic>) {
if (response['event'] != null) {
diff --git a/packages/flutter_tools/lib/src/commands/daemon.dart b/packages/flutter_tools/lib/src/commands/daemon.dart
index 46c1373..cad13b3 100644
--- a/packages/flutter_tools/lib/src/commands/daemon.dart
+++ b/packages/flutter_tools/lib/src/commands/daemon.dart
@@ -693,12 +693,12 @@
}
Stream<Map<String, dynamic>> get stdinCommandStream => stdin
- .transform(UTF8.decoder)
+ .transform(utf8.decoder)
.transform(const LineSplitter())
.where((String line) => line.startsWith('[{') && line.endsWith('}]'))
.map((String line) {
line = line.substring(1, line.length - 1);
- return JSON.decode(line);
+ return json.decode(line);
});
void stdoutCommandResponse(Map<String, dynamic> command) {
@@ -706,7 +706,7 @@
}
String jsonEncodeObject(dynamic object) {
- return JSON.encode(object, toEncodable: _toEncodable);
+ return json.encode(object, toEncodable: _toEncodable);
}
dynamic _toEncodable(dynamic object) {
diff --git a/packages/flutter_tools/lib/src/commands/screenshot.dart b/packages/flutter_tools/lib/src/commands/screenshot.dart
index 51554fb..7ee2dd4 100644
--- a/packages/flutter_tools/lib/src/commands/screenshot.dart
+++ b/packages/flutter_tools/lib/src/commands/screenshot.dart
@@ -85,7 +85,7 @@
outputFile ??= getUniqueFile(fs.currentDirectory, 'flutter', 'skp');
final IOSink sink = outputFile.openWrite();
- sink.add(BASE64.decode(skp['skp']));
+ sink.add(base64.decode(skp['skp']));
await sink.close();
await showOutputFileInfo(outputFile);
if (await outputFile.length() < 1000) {
diff --git a/packages/flutter_tools/lib/src/commands/trace.dart b/packages/flutter_tools/lib/src/commands/trace.dart
index 045200d..eb67025 100644
--- a/packages/flutter_tools/lib/src/commands/trace.dart
+++ b/packages/flutter_tools/lib/src/commands/trace.dart
@@ -82,7 +82,7 @@
localFile = getUniqueFile(fs.currentDirectory, 'trace', 'json');
}
- await localFile.writeAsString(JSON.encode(timeline));
+ await localFile.writeAsString(json.encode(timeline));
printStatus('Trace file saved to ${localFile.path}');
}
diff --git a/packages/flutter_tools/lib/src/compile.dart b/packages/flutter_tools/lib/src/compile.dart
index 24e6f91..70a3304 100644
--- a/packages/flutter_tools/lib/src/compile.dart
+++ b/packages/flutter_tools/lib/src/compile.dart
@@ -107,10 +107,10 @@
final _StdoutHandler stdoutHandler = new _StdoutHandler();
server.stderr
- .transform(UTF8.decoder)
+ .transform(utf8.decoder)
.listen((String s) { printError('compiler message: $s'); });
server.stdout
- .transform(UTF8.decoder)
+ .transform(utf8.decoder)
.transform(const LineSplitter())
.listen(stdoutHandler.handler);
final int exitCode = await server.exitCode;
@@ -190,7 +190,7 @@
}
_server = await processManager.start(args);
_server.stdout
- .transform(UTF8.decoder)
+ .transform(utf8.decoder)
.transform(const LineSplitter())
.listen(
stdoutHandler.handler,
@@ -203,7 +203,7 @@
});
_server.stderr
- .transform(UTF8.decoder)
+ .transform(utf8.decoder)
.transform(const LineSplitter())
.listen((String s) { printError('compiler message: $s'); });
diff --git a/packages/flutter_tools/lib/src/devfs.dart b/packages/flutter_tools/lib/src/devfs.dart
index 01ef565..4af38ac 100644
--- a/packages/flutter_tools/lib/src/devfs.dart
+++ b/packages/flutter_tools/lib/src/devfs.dart
@@ -3,7 +3,7 @@
// found in the LICENSE file.
import 'dart:async';
-import 'dart:convert' show BASE64, UTF8;
+import 'dart:convert' show base64, utf8;
import 'package:json_rpc_2/json_rpc_2.dart' as rpc;
@@ -172,7 +172,7 @@
/// String content to be copied to the device.
class DevFSStringContent extends DevFSByteContent {
- DevFSStringContent(String string) : _string = string, super(UTF8.encode(string));
+ DevFSStringContent(String string) : _string = string, super(utf8.encode(string));
String _string;
@@ -180,12 +180,12 @@
set string(String value) {
_string = value;
- super.bytes = UTF8.encode(_string);
+ super.bytes = utf8.encode(_string);
}
@override
set bytes(List<int> value) {
- string = UTF8.decode(value);
+ string = utf8.decode(value);
}
}
@@ -223,7 +223,7 @@
} catch (e) {
return e;
}
- final String fileContents = BASE64.encode(bytes);
+ final String fileContents = base64.encode(bytes);
try {
return await vmService.vm.invokeRpcRaw(
'_writeDevFSFile',
@@ -299,7 +299,7 @@
request.headers.removeAll(HttpHeaders.ACCEPT_ENCODING);
request.headers.add('dev_fs_name', fsName);
request.headers.add('dev_fs_uri_b64',
- BASE64.encode(UTF8.encode(deviceUri.toString())));
+ base64.encode(utf8.encode(deviceUri.toString())));
final Stream<List<int>> contents = content.contentsAsCompressedStream();
await request.addStream(contents);
final HttpClientResponse response = await request.close();
diff --git a/packages/flutter_tools/lib/src/doctor.dart b/packages/flutter_tools/lib/src/doctor.dart
index dde9437..2e1ca55 100644
--- a/packages/flutter_tools/lib/src/doctor.dart
+++ b/packages/flutter_tools/lib/src/doctor.dart
@@ -3,7 +3,7 @@
// found in the LICENSE file.
import 'dart:async';
-import 'dart:convert' show UTF8;
+import 'dart:convert' show utf8;
import 'package:archive/archive.dart';
@@ -409,7 +409,7 @@
try {
final Archive archive = new ZipDecoder().decodeBytes(fs.file(jarPath).readAsBytesSync());
final ArchiveFile file = archive.findFile('META-INF/plugin.xml');
- final String content = UTF8.decode(file.content);
+ final String content = utf8.decode(file.content);
const String versionStartTag = '<version>';
final int start = content.indexOf(versionStartTag);
final int end = content.indexOf('</version>', start);
diff --git a/packages/flutter_tools/lib/src/ios/code_signing.dart b/packages/flutter_tools/lib/src/ios/code_signing.dart
index b891e29..54f2289 100644
--- a/packages/flutter_tools/lib/src/ios/code_signing.dart
+++ b/packages/flutter_tools/lib/src/ios/code_signing.dart
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
import 'dart:async';
-import 'dart:convert' show UTF8;
+import 'dart:convert' show utf8;
import 'package:quiver/strings.dart';
@@ -146,7 +146,7 @@
..write(signingCertificate)
..close();
- final String opensslOutput = await UTF8.decodeStream(opensslProcess.stdout);
+ final String opensslOutput = await utf8.decodeStream(opensslProcess.stdout);
// Fire and forget discard of the stderr stream so we don't hold onto resources.
// Don't care about the result.
opensslProcess.stderr.drain<String>(); // ignore: unawaited_futures
diff --git a/packages/flutter_tools/lib/src/ios/devices.dart b/packages/flutter_tools/lib/src/ios/devices.dart
index 9fd3505..d663bcd 100644
--- a/packages/flutter_tools/lib/src/ios/devices.dart
+++ b/packages/flutter_tools/lib/src/ios/devices.dart
@@ -383,7 +383,7 @@
int decodeOctal(int x, int y, int z) => (x & 0x3) << 6 | (y & 0x7) << 3 | z & 0x7;
try {
- final List<int> bytes = UTF8.encode(line);
+ final List<int> bytes = utf8.encode(line);
final List<int> out = <int>[];
for (int i = 0; i < bytes.length; ) {
if (bytes[i] != kBackslash || i > bytes.length - 4) {
@@ -407,7 +407,7 @@
i += 4;
}
}
- return UTF8.decode(out);
+ return utf8.decode(out);
} catch (_) {
// Unable to decode line: return as-is.
return line;
@@ -445,8 +445,8 @@
void _start() {
iMobileDevice.startLogger().then<Null>((Process process) {
_process = process;
- _process.stdout.transform(UTF8.decoder).transform(const LineSplitter()).listen(_onLine);
- _process.stderr.transform(UTF8.decoder).transform(const LineSplitter()).listen(_onLine);
+ _process.stdout.transform(utf8.decoder).transform(const LineSplitter()).listen(_onLine);
+ _process.stderr.transform(utf8.decoder).transform(const LineSplitter()).listen(_onLine);
_process.exitCode.whenComplete(() {
if (_linesController.hasListener)
_linesController.close();
diff --git a/packages/flutter_tools/lib/src/ios/mac.dart b/packages/flutter_tools/lib/src/ios/mac.dart
index 49eb677..e713871 100644
--- a/packages/flutter_tools/lib/src/ios/mac.dart
+++ b/packages/flutter_tools/lib/src/ios/mac.dart
@@ -3,7 +3,7 @@
// found in the LICENSE file.
import 'dart:async';
-import 'dart:convert' show JSON;
+import 'dart:convert' show json;
import 'package:meta/meta.dart';
@@ -566,8 +566,8 @@
// the directory and basenames.
'framework': fs.path.basenameWithoutExtension(service['ios-framework'])
}).toList();
- final Map<String, dynamic> json = <String, dynamic>{ 'services' : jsonServices };
- manifest.writeAsStringSync(JSON.encode(json), mode: FileMode.WRITE, flush: true);
+ final Map<String, dynamic> jsonObject = <String, dynamic>{ 'services' : jsonServices };
+ manifest.writeAsStringSync(json.encode(jsonObject), mode: FileMode.WRITE, flush: true);
}
Future<bool> 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 c2222df..6b60309 100644
--- a/packages/flutter_tools/lib/src/ios/simulators.dart
+++ b/packages/flutter_tools/lib/src/ios/simulators.dart
@@ -87,7 +87,7 @@
return <String, Map<String, dynamic>>{};
}
- return JSON.decode(results.stdout)[section.name];
+ return json.decode(results.stdout)[section.name];
}
/// Returns a list of all available devices, both potential and connected.
@@ -540,15 +540,15 @@
// Device log.
await device.ensureLogsExists();
_deviceProcess = await launchDeviceLogTool(device);
- _deviceProcess.stdout.transform(UTF8.decoder).transform(const LineSplitter()).listen(_onDeviceLine);
- _deviceProcess.stderr.transform(UTF8.decoder).transform(const LineSplitter()).listen(_onDeviceLine);
+ _deviceProcess.stdout.transform(utf8.decoder).transform(const LineSplitter()).listen(_onDeviceLine);
+ _deviceProcess.stderr.transform(utf8.decoder).transform(const LineSplitter()).listen(_onDeviceLine);
// Track system.log crashes.
// ReportCrash[37965]: Saved crash report for FlutterRunner[37941]...
_systemProcess = await launchSystemLogTool(device);
if (_systemProcess != null) {
- _systemProcess.stdout.transform(UTF8.decoder).transform(const LineSplitter()).listen(_onSystemLine);
- _systemProcess.stderr.transform(UTF8.decoder).transform(const LineSplitter()).listen(_onSystemLine);
+ _systemProcess.stdout.transform(utf8.decoder).transform(const LineSplitter()).listen(_onSystemLine);
+ _systemProcess.stderr.transform(utf8.decoder).transform(const LineSplitter()).listen(_onSystemLine);
}
// We don't want to wait for the process or its callback. Best effort
diff --git a/packages/flutter_tools/lib/src/project.dart b/packages/flutter_tools/lib/src/project.dart
index 6572c36..2d2a169 100644
--- a/packages/flutter_tools/lib/src/project.dart
+++ b/packages/flutter_tools/lib/src/project.dart
@@ -106,7 +106,7 @@
}
return file
.openRead()
- .transform(UTF8.decoder)
+ .transform(utf8.decoder)
.transform(const LineSplitter())
.map(regExp.firstMatch)
.firstWhere((Match match) => match != null, orElse: () => null);
diff --git a/packages/flutter_tools/lib/src/services.dart b/packages/flutter_tools/lib/src/services.dart
index 863b098..fbd142e 100644
--- a/packages/flutter_tools/lib/src/services.dart
+++ b/packages/flutter_tools/lib/src/services.dart
@@ -103,8 +103,8 @@
'class': service['android-class']
}).toList();
- final Map<String, dynamic> json = <String, dynamic>{ 'services': services };
+ final Map<String, dynamic> jsonObject = <String, dynamic>{ 'services': services };
final File servicesFile = fs.file(fs.path.join(dir, 'services.json'));
- servicesFile.writeAsStringSync(JSON.encode(json), 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/event_printer.dart b/packages/flutter_tools/lib/src/test/event_printer.dart
index a9e2c89..af3c34a 100644
--- a/packages/flutter_tools/lib/src/test/event_printer.dart
+++ b/packages/flutter_tools/lib/src/test/event_printer.dart
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-import 'dart:convert' show JSON;
+import 'dart:convert' show json;
import '../base/io.dart' show stdout;
import 'watcher.dart';
@@ -28,7 +28,7 @@
}
void _send(Map<String, dynamic> command) {
- final String encoded = JSON.encode(command, toEncodable: _jsonEncodeObject);
+ final String encoded = json.encode(command, toEncodable: _jsonEncodeObject);
_out.writeln('\n[$encoded]');
}
diff --git a/packages/flutter_tools/lib/src/test/flutter_platform.dart b/packages/flutter_tools/lib/src/test/flutter_platform.dart
index 80de484..b6ebe17 100644
--- a/packages/flutter_tools/lib/src/test/flutter_platform.dart
+++ b/packages/flutter_tools/lib/src/test/flutter_platform.dart
@@ -383,7 +383,7 @@
final Completer<Null> harnessDone = new Completer<Null>();
final StreamSubscription<dynamic> harnessToTest = controller.stream.listen(
- (dynamic event) { testSocket.add(JSON.encode(event)); },
+ (dynamic event) { testSocket.add(json.encode(event)); },
onDone: harnessDone.complete,
onError: (dynamic error, dynamic stack) {
// If you reach here, it's unlikely we're going to be able to really handle this well.
@@ -402,7 +402,7 @@
final StreamSubscription<dynamic> testToHarness = testSocket.listen(
(dynamic encodedEvent) {
assert(encodedEvent is String); // we shouldn't ever get binary messages
- controller.sink.add(JSON.decode(encodedEvent));
+ controller.sink.add(json.decode(encodedEvent));
},
onDone: testDone.complete,
onError: (dynamic error, dynamic stack) {
@@ -584,9 +584,9 @@
WebSocket.connect(server).then((WebSocket socket) {
socket.map((dynamic x) {
assert(x is String);
- return JSON.decode(x);
+ return json.decode(x);
}).pipe(channel.sink);
- socket.addStream(channel.stream.map(JSON.encode));
+ socket.addStream(channel.stream.map(json.encode));
});
}
''';
@@ -673,7 +673,7 @@
for (Stream<List<int>> stream in
<Stream<List<int>>>[process.stderr, process.stdout]) {
- stream.transform(UTF8.decoder)
+ stream.transform(utf8.decoder)
.transform(const LineSplitter())
.listen(
(String line) {
diff --git a/packages/flutter_tools/lib/src/version.dart b/packages/flutter_tools/lib/src/version.dart
index f9c29c9..30b74c0 100644
--- a/packages/flutter_tools/lib/src/version.dart
+++ b/packages/flutter_tools/lib/src/version.dart
@@ -336,11 +336,11 @@
if (versionCheckStamp != null) {
// Attempt to parse stamp JSON.
try {
- final dynamic json = JSON.decode(versionCheckStamp);
- if (json is Map) {
- return fromJson(json);
+ final dynamic jsonObject = json.decode(versionCheckStamp);
+ if (jsonObject is Map) {
+ return fromJson(jsonObject);
} else {
- printTrace('Warning: expected version stamp to be a Map but found: $json');
+ printTrace('Warning: expected version stamp to be a Map but found: $jsonObject');
}
} catch (error, stackTrace) {
// Do not crash if JSON is malformed.
@@ -352,10 +352,10 @@
return const VersionCheckStamp();
}
- static VersionCheckStamp fromJson(Map<String, String> json) {
+ static VersionCheckStamp fromJson(Map<String, String> jsonObject) {
DateTime readDateTime(String property) {
- return json.containsKey(property)
- ? DateTime.parse(json[property])
+ return jsonObject.containsKey(property)
+ ? DateTime.parse(jsonObject[property])
: null;
}
diff --git a/packages/flutter_tools/lib/src/vmservice.dart b/packages/flutter_tools/lib/src/vmservice.dart
index a97ef68..d2dd708 100644
--- a/packages/flutter_tools/lib/src/vmservice.dart
+++ b/packages/flutter_tools/lib/src/vmservice.dart
@@ -3,7 +3,7 @@
// found in the LICENSE file.
import 'dart:async';
-import 'dart:convert' show BASE64;
+import 'dart:convert' show base64;
import 'dart:math' as math;
import 'package:file/file.dart';
@@ -799,7 +799,7 @@
params: <String, dynamic>{
'fsName': fsName,
'path': path,
- 'fileContents': BASE64.encode(fileContents),
+ 'fileContents': base64.encode(fileContents),
},
);
}
@@ -813,7 +813,7 @@
'path': path,
},
);
- return BASE64.decode(response['fileContents']);
+ return base64.decode(response['fileContents']);
}
/// The complete list of a file system.
@@ -896,14 +896,14 @@
Duration get avgCollectionTime {
final double mcs = _totalCollectionTimeInSeconds *
- Duration.MICROSECONDS_PER_SECOND /
+ Duration.microsecondsPerSecond /
math.max(_collections, 1);
return new Duration(microseconds: mcs.ceil());
}
Duration get avgCollectionPeriod {
final double mcs = _averageCollectionPeriodInMillis *
- Duration.MICROSECONDS_PER_MILLISECOND;
+ Duration.microsecondsPerMillisecond;
return new Duration(microseconds: mcs.ceil());
}
diff --git a/packages/flutter_tools/lib/src/vmservice_record_replay.dart b/packages/flutter_tools/lib/src/vmservice_record_replay.dart
index bfde734..cce1442 100644
--- a/packages/flutter_tools/lib/src/vmservice_record_replay.dart
+++ b/packages/flutter_tools/lib/src/vmservice_record_replay.dart
@@ -94,13 +94,13 @@
/// A VM service JSON-rpc request (sent to the VM).
class _Request extends _Message {
_Request(Map<String, dynamic> data) : super(_kRequest, data);
- _Request.fromString(String data) : this(JSON.decoder.convert(data));
+ _Request.fromString(String data) : this(json.decoder.convert(data));
}
/// A VM service JSON-rpc response (from the VM).
class _Response extends _Message {
_Response(Map<String, dynamic> data) : super(_kResponse, data);
- _Response.fromString(String data) : this(JSON.decoder.convert(data));
+ _Response.fromString(String data) : this(json.decoder.convert(data));
}
/// A matching request/response pair.
@@ -203,8 +203,8 @@
static Map<int, _Transaction> _loadTransactions(Directory location) {
final File file = _getManifest(location);
- final String json = file.readAsStringSync();
- final Iterable<_Message> messages = JSON.decoder.convert(json).map<_Message>(_toMessage);
+ final String jsonData = file.readAsStringSync();
+ final Iterable<_Message> messages = json.decoder.convert(jsonData).map<_Message>(_toMessage);
final Map<int, _Transaction> transactions = <int, _Transaction>{};
for (_Message message in messages) {
final _Transaction transaction =
@@ -236,7 +236,7 @@
printStatus('Exiting due to dangling request');
exit(0);
} else {
- _controller.add(JSON.encoder.convert(transaction.response.data));
+ _controller.add(json.encoder.convert(transaction.response.data));
if (_transactions.isEmpty)
_controller.close();
}
diff --git a/packages/flutter_tools/lib/src/vscode/vscode.dart b/packages/flutter_tools/lib/src/vscode/vscode.dart
index 9671696..7eace4c 100644
--- a/packages/flutter_tools/lib/src/vscode/vscode.dart
+++ b/packages/flutter_tools/lib/src/vscode/vscode.dart
@@ -181,8 +181,8 @@
if (!fs.isFileSync(packageJsonPath))
return null;
final String jsonString = fs.file(packageJsonPath).readAsStringSync();
- final Map<String, String> json = JSON.decode(jsonString);
- return json['version'];
+ final Map<String, String> jsonObject = json.decode(jsonString);
+ return jsonObject['version'];
}
}
