Commit 4cd1fb17 authored by Adam Barth's avatar Adam Barth

Fix analyzer warnings in updater package

This class was renamed to MojoEventSubscription.
parent ffb95f05
...@@ -96,6 +96,7 @@ class AnalyzeCommand extends FlutterCommand { ...@@ -96,6 +96,7 @@ class AnalyzeCommand extends FlutterCommand {
pubSpecDirectories.add(flutterDir.path); pubSpecDirectories.add(flutterDir.path);
// .../packages/*/bin/*.dart // .../packages/*/bin/*.dart
// .../packages/*/lib/main.dart
Directory packages = new Directory(path.join(ArtifactStore.flutterRoot, 'packages')); Directory packages = new Directory(path.join(ArtifactStore.flutterRoot, 'packages'));
for (FileSystemEntity entry in packages.listSync()) { for (FileSystemEntity entry in packages.listSync()) {
if (entry is Directory) { if (entry is Directory) {
...@@ -109,6 +110,11 @@ class AnalyzeCommand extends FlutterCommand { ...@@ -109,6 +110,11 @@ class AnalyzeCommand extends FlutterCommand {
} }
} }
} }
String mainPath = path.join(entry.path, 'lib', 'main.dart');
if (FileSystemEntity.isFileSync(mainPath)) {
dartFiles.add(mainPath);
foundOne = true;
}
if (foundOne) if (foundOne)
pubSpecDirectories.add(entry.path); pubSpecDirectories.add(entry.path);
} }
...@@ -298,4 +304,4 @@ class AnalyzeCommand extends FlutterCommand { ...@@ -298,4 +304,4 @@ class AnalyzeCommand extends FlutterCommand {
print('No analyzer warnings!'); print('No analyzer warnings!');
return 0; return 0;
} }
} }
\ No newline at end of file
...@@ -83,7 +83,7 @@ class UpdateTask { ...@@ -83,7 +83,7 @@ class UpdateTask {
Future<yaml.YamlMap> _fetchManifest() async { Future<yaml.YamlMap> _fetchManifest() async {
String manifestUrl = _currentManifest['update-url'] + '/' + kManifestFile; String manifestUrl = _currentManifest['update-url'] + '/' + kManifestFile;
String manifestData = await http.get(manifestUrl); String manifestData = (await http.get(manifestUrl)).body;
return yaml.loadYaml(manifestData, sourceUrl: manifestUrl); return yaml.loadYaml(manifestData, sourceUrl: manifestUrl);
} }
......
...@@ -11,11 +11,11 @@ import 'package:mojo/core.dart'; ...@@ -11,11 +11,11 @@ import 'package:mojo/core.dart';
// Helper class to drain the contents of a mojo data pipe to a file. // Helper class to drain the contents of a mojo data pipe to a file.
class PipeToFile { class PipeToFile {
MojoDataPipeConsumer _consumer; MojoDataPipeConsumer _consumer;
MojoEventStream _eventStream; MojoEventSubscription _eventStream;
IOSink _outputStream; IOSink _outputStream;
PipeToFile(this._consumer, String outputPath) { PipeToFile(this._consumer, String outputPath) {
_eventStream = new MojoEventStream(_consumer.handle); _eventStream = new MojoEventSubscription(_consumer.handle);
_outputStream = new File(outputPath).openWrite(); _outputStream = new File(outputPath).openWrite();
} }
...@@ -33,7 +33,7 @@ class PipeToFile { ...@@ -33,7 +33,7 @@ class PipeToFile {
Future drain() async { Future drain() async {
Completer completer = new Completer(); Completer completer = new Completer();
// TODO(mpcomplete): Is it legit to pass an async callback to listen? // TODO(mpcomplete): Is it legit to pass an async callback to listen?
_eventStream.listen((List<int> event) async { _eventStream.subscribe((List<int> event) async {
MojoHandleSignals mojoSignals = new MojoHandleSignals(event[1]); MojoHandleSignals mojoSignals = new MojoHandleSignals(event[1]);
if (mojoSignals.isReadable) { if (mojoSignals.isReadable) {
MojoResult result = await _doRead(); MojoResult result = await _doRead();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment