Remove upper case constants (#27)
* Remove usage of upper-case constants.
* update SDK version
* update version number
diff --git a/bin/coverage_log_server.dart b/bin/coverage_log_server.dart
index 9dcd772..42cc32c 100644
--- a/bin/coverage_log_server.dart
+++ b/bin/coverage_log_server.dart
@@ -144,7 +144,7 @@
}
if (request.method == 'POST') {
- _record(JSON.decode(await request.readAsString()));
+ _record(jsonDecode(await request.readAsString()));
return new shelf.Response.ok("Thanks!");
}
}
diff --git a/bin/inference/client.dart b/bin/inference/client.dart
index a871244..281c0bb 100644
--- a/bin/inference/client.dart
+++ b/bin/inference/client.dart
@@ -15,7 +15,7 @@
AllInfo data;
main() async {
data = new AllInfoJsonCodec()
- .decode(JSON.decode(await HttpRequest.getString('/data')));
+ .decode(jsonDecode(await HttpRequest.getString('/data')));
routeByHash();
window.onHashChange.listen((_) => routeByHash());
diff --git a/bin/inference/print_summary.dart b/bin/inference/print_summary.dart
index 8d11559..6ca2119 100644
--- a/bin/inference/print_summary.dart
+++ b/bin/inference/print_summary.dart
@@ -13,7 +13,7 @@
main(args) {
var file = args.length > 0 ? args[0] : 'out.js.info.json';
- var json = JSON.decode(new File(file).readAsStringSync());
+ var json = jsonDecode(new File(file).readAsStringSync());
var results = new AllInfoJsonCodec().decode(json);
print(formatAsTable(results));
}
diff --git a/bin/live_code_size_analysis.dart b/bin/live_code_size_analysis.dart
index 5520ff1..499ef75 100644
--- a/bin/live_code_size_analysis.dart
+++ b/bin/live_code_size_analysis.dart
@@ -50,7 +50,7 @@
}
var info = await infoFromFile(args.first);
- var coverage = JSON.decode(new File(args[1]).readAsStringSync());
+ var coverage = jsonDecode(new File(args[1]).readAsStringSync());
var verbose = args.length > 2 && args[2] == '-v';
int realTotal = info.program.size;
diff --git a/bin/show_inferred_types.dart b/bin/show_inferred_types.dart
index cf23062..1981a6f 100644
--- a/bin/show_inferred_types.dart
+++ b/bin/show_inferred_types.dart
@@ -21,7 +21,7 @@
var showLongName = args.length > 2 && args[2] == '-l';
- var json = JSON.decode(new File(args[0]).readAsStringSync());
+ var json = jsonDecode(new File(args[0]).readAsStringSync());
var info = new AllInfoJsonCodec().decode(json);
var nameRegExp = new RegExp(args[1]);
matches(e) => nameRegExp.hasMatch(longName(e));
diff --git a/lib/src/util.dart b/lib/src/util.dart
index 1e122c2..a14ffbd 100644
--- a/lib/src/util.dart
+++ b/lib/src/util.dart
@@ -134,5 +134,5 @@
Future<AllInfo> infoFromFile(String fileName) async {
var file = await new File(fileName).readAsString();
- return new AllInfoJsonCodec().decode(JSON.decode(file));
+ return new AllInfoJsonCodec().decode(jsonDecode(file));
}
diff --git a/pubspec.yaml b/pubspec.yaml
index c7460a0..ae49cb0 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
name: dart2js_info
-version: 0.5.6
+version: 0.5.6+1
description: >
Libraries and tools to process data produced when running dart2js with
--dump-info.
@@ -7,7 +7,7 @@
homepage: https://github.com/dart-lang/dart2js_info/
environment:
- sdk: '>=1.21.1 <2.0.0'
+ sdk: '>=2.0.0-dev.17.0 <2.0.0'
dependencies:
args: '>=0.13.0 <2.0.0'
charcode: ^1.1.0
diff --git a/test/parse_test.dart b/test/parse_test.dart
index e34b369..a9ba3f4 100644
--- a/test/parse_test.dart
+++ b/test/parse_test.dart
@@ -12,7 +12,7 @@
group('parse', () {
test('hello_world', () {
var helloWorld = new File('test/hello_world/hello_world.js.info.json');
- var json = JSON.decode(helloWorld.readAsStringSync());
+ var json = jsonDecode(helloWorld.readAsStringSync());
var decoded = new AllInfoJsonCodec().decode(json);
var program = decoded.program;
