diff --git a/CHANGELOG.md b/CHANGELOG.md index 7a198dbc1075..608c1d57bb03 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## 0.5.16 + +* Split out IO dependency from `util.dart`, so all other utilities can be used + on any platform. + ## 0.5.15 * Add `BasicInfo.resetIds` to free internal cache used for id uniqueness. diff --git a/bin/code_deps.dart b/bin/code_deps.dart index c9b05442d969..27278b66d90c 100644 --- a/bin/code_deps.dart +++ b/bin/code_deps.dart @@ -30,6 +30,7 @@ import 'dart:io'; import 'package:dart2js_info/info.dart'; import 'package:dart2js_info/src/graph.dart'; +import 'package:dart2js_info/src/io.dart'; import 'package:dart2js_info/src/util.dart'; main(args) async { diff --git a/bin/debug_info.dart b/bin/debug_info.dart index 89733eb64be6..c7925ea3f32d 100644 --- a/bin/debug_info.dart +++ b/bin/debug_info.dart @@ -10,6 +10,7 @@ import 'dart:io'; import 'package:dart2js_info/info.dart'; import 'package:dart2js_info/src/graph.dart'; +import 'package:dart2js_info/src/io.dart'; import 'package:dart2js_info/src/util.dart'; main(args) async { diff --git a/bin/deferred_library_check.dart b/bin/deferred_library_check.dart index 19cceefdc300..995c366eb257 100644 --- a/bin/deferred_library_check.dart +++ b/bin/deferred_library_check.dart @@ -39,7 +39,7 @@ import 'dart:async'; import 'dart:io'; import 'package:dart2js_info/deferred_library_check.dart'; -import 'package:dart2js_info/src/util.dart'; +import 'package:dart2js_info/src/io.dart'; import 'package:yaml/yaml.dart'; Future main(List args) async { diff --git a/bin/deferred_library_layout.dart b/bin/deferred_library_layout.dart index 5bcb840d89f5..5a124ad0e8a6 100644 --- a/bin/deferred_library_layout.dart +++ b/bin/deferred_library_layout.dart @@ -8,7 +8,7 @@ library dart2js_info.bin.deferred_library_size; import 'dart:io'; import 'package:dart2js_info/info.dart'; -import 'package:dart2js_info/src/util.dart'; +import 'package:dart2js_info/src/io.dart'; main(args) async { AllInfo info = await infoFromFile(args.first); diff --git a/bin/deferred_library_size.dart b/bin/deferred_library_size.dart index 129e95f98674..9800966f4eaf 100644 --- a/bin/deferred_library_size.dart +++ b/bin/deferred_library_size.dart @@ -8,7 +8,7 @@ library dart2js_info.bin.deferred_library_size; import 'dart:math'; import 'package:dart2js_info/info.dart'; -import 'package:dart2js_info/src/util.dart'; +import 'package:dart2js_info/src/io.dart'; main(args) async { // TODO(het): Would be faster to only parse the 'outputUnits' part diff --git a/bin/diff.dart b/bin/diff.dart index 8be1dd3f7eac..4d2c2290888d 100644 --- a/bin/diff.dart +++ b/bin/diff.dart @@ -4,6 +4,7 @@ import 'package:dart2js_info/info.dart'; import 'package:dart2js_info/src/diff.dart'; +import 'package:dart2js_info/src/io.dart'; import 'package:dart2js_info/src/util.dart'; /// A command-line tool that computes the diff between two info files. diff --git a/bin/function_size_analysis.dart b/bin/function_size_analysis.dart index 4e7ba13e848a..c0f304f01ed5 100644 --- a/bin/function_size_analysis.dart +++ b/bin/function_size_analysis.dart @@ -10,6 +10,7 @@ import 'dart:math' as math; import 'package:dart2js_info/info.dart'; import 'package:dart2js_info/src/graph.dart'; +import 'package:dart2js_info/src/io.dart'; import 'package:dart2js_info/src/util.dart'; main(args) async { diff --git a/bin/info_json_to_proto.dart b/bin/info_json_to_proto.dart index 28aad135ed41..bd964cf76c5e 100644 --- a/bin/info_json_to_proto.dart +++ b/bin/info_json_to_proto.dart @@ -8,7 +8,7 @@ import 'dart:io'; import 'package:dart2js_info/proto_info_codec.dart'; -import 'package:dart2js_info/src/util.dart'; +import 'package:dart2js_info/src/io.dart'; main(args) async { if (args.length != 2) { diff --git a/bin/library_size_split.dart b/bin/library_size_split.dart index 028e5a1e81f5..810f50b235f2 100644 --- a/bin/library_size_split.dart +++ b/bin/library_size_split.dart @@ -63,7 +63,7 @@ import 'dart:io'; import 'dart:math' show max; import 'package:dart2js_info/info.dart'; -import 'package:dart2js_info/src/util.dart'; +import 'package:dart2js_info/src/io.dart'; import 'package:yaml/yaml.dart'; main(args) async { diff --git a/bin/live_code_size_analysis.dart b/bin/live_code_size_analysis.dart index a6eb850e4ffb..c7214096a31b 100644 --- a/bin/live_code_size_analysis.dart +++ b/bin/live_code_size_analysis.dart @@ -38,6 +38,7 @@ import 'dart:convert'; import 'dart:io'; import 'package:dart2js_info/info.dart'; +import 'package:dart2js_info/src/io.dart'; import 'package:dart2js_info/src/util.dart'; import 'function_size_analysis.dart'; diff --git a/lib/src/io.dart b/lib/src/io.dart new file mode 100644 index 000000000000..dde9bee96ed7 --- /dev/null +++ b/lib/src/io.dart @@ -0,0 +1,10 @@ +import 'dart:async'; +import 'dart:convert'; +import 'dart:io'; + +import 'package:dart2js_info/info.dart'; + +Future infoFromFile(String fileName) async { + var file = await new File(fileName).readAsString(); + return new AllInfoJsonCodec().decode(jsonDecode(file)); +} diff --git a/lib/src/util.dart b/lib/src/util.dart index 3ab0a64b7973..575443266afe 100644 --- a/lib/src/util.dart +++ b/lib/src/util.dart @@ -4,10 +4,6 @@ library dart2js_info.src.util; -import 'dart:async'; -import 'dart:convert'; -import 'dart:io'; - import 'package:dart2js_info/info.dart'; import 'graph.dart'; @@ -149,8 +145,3 @@ String recursiveDiagnosticString(Measurements measurements, Metric metric) { helper(metric); return sb.toString(); } - -Future infoFromFile(String fileName) async { - var file = await new File(fileName).readAsString(); - return new AllInfoJsonCodec().decode(jsonDecode(file)); -} diff --git a/pubspec.yaml b/pubspec.yaml index 1677ba81089c..7092c0d737a8 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,5 +1,5 @@ name: dart2js_info -version: 0.5.15 +version: 0.5.16 description: > Libraries and tools to process data produced when running dart2js with