make strong-mode happy

Author: jakemac53

.analysis_options

@@ -1,3 +1,2 @@
 analyzer:
-# disabling strong-mode until all errors and warnings are resolved
-#  strong-mode: true
+ strong-mode: true

lib/src/asset/cache.dart

@@ -62,11 +62,11 @@ class CachedAssetReader extends AssetReader {
   Future<bool> hasInput(AssetId id) {
     try {
       if (_cache.contains(id)) return new Future.value(true);
-
       return _pendingHasInputChecks.putIfAbsent(id, () async {
         try {
-          return await _reader.hasInput(id);
+          return _reader.hasInput(id);
         } finally {
+          // Make sure we always remove the pending check
           _pendingHasInputChecks.remove(id);
         }
       });

lib/src/asset_graph/node.dart

@@ -56,7 +56,7 @@ class GeneratedAssetNode extends AssetNode {
   factory GeneratedAssetNode.deserialize(List serialized) {
     var node = new GeneratedAssetNode(new AssetId.deserialize(serialized[2]),
         false, serialized[3], new AssetId.deserialize(serialized[0]));
-    node.outputs.addAll(serialized[1]
+    node.outputs.addAll((serialized[1] as Iterable)
         .map((serializedOutput) => new AssetId.deserialize(serializedOutput)));
     return node;
   }

lib/src/generate/build_impl.dart

@@ -224,7 +224,9 @@ class BuildImpl {
     /// Collect updates to the graph based on any changed assets.
     var updates = <AssetId, ChangeType>{};
     await Future.wait(_assetGraph.allNodes
-        .where((node) => node is! GeneratedAssetNode || node.wasOutput)
+        .where((node) =>
+            node is! GeneratedAssetNode ||
+            (node as GeneratedAssetNode).wasOutput)
         .map((node) async {
       var exists = await _reader.hasInput(node.id);
       if (!exists) {
@@ -297,7 +299,7 @@ class BuildImpl {
           .where((node) => node is GeneratedAssetNode)
           .map((node) async {
         _inputsByPackage[node.id.package]?.remove(node.id);
-        if (node.needsUpdate) {
+        if ((node as GeneratedAssetNode).needsUpdate) {
           await _writer.delete(node.id);
         }
       }));
@@ -353,7 +355,7 @@ class BuildImpl {
       switch (input.toLowerCase()) {
         case 'y':
           stdout.writeln('Deleting files...');
-          await Future.wait(conflictingOutputs.map((output) {
+          await Future.wait(conflictingOutputs.map/*<Future>*/((output) {
             _inputsByPackage[output.package]?.remove(output);
             return _writer.delete(output);
           }));

test/analyzer/resolver_test.dart

@@ -46,8 +46,8 @@ main() {
       return validateResolver(
           inputs: {'a|web/main.dart': ' main() {}',},
           validator: (resolver) {
-            var source =
-                resolver.resolver.sources[toBarbackAssetId(entryPoint)];
+            var source = (resolver.resolver as dynamic).sources[
+                toBarbackAssetId(entryPoint)];
             expect(source.modificationStamp, 1);
 
             var lib = resolver.getLibrary(entryPoint);
@@ -62,8 +62,8 @@ main() {
                 } ''',
           },
           validator: (resolver) {
-            var source =
-                resolver.resolver.sources[toBarbackAssetId(entryPoint)];
+            var source = (resolver.resolver as dynamic).sources[
+                toBarbackAssetId(entryPoint)];
             expect(source.modificationStamp, 2);
 
             var lib = resolver.getLibrary(entryPoint);
@@ -303,7 +303,7 @@ main() {
               expect(uri.toString(), 'package:a/a.dart');
 
               // Make sure that we haven't leaked any sources.
-              expect(resolver.resolver.sources.length, 2);
+              expect((resolver.resolver as dynamic).sources.length, 2);
             });
       });
     });

test/asset/file_based_test.dart

@@ -57,7 +57,7 @@ main() {
     });
 
     test('can list files based on simple InputSets', () async {
-      var inputSets = [
+      var inputSets = <InputSet>[
         new InputSet('basic_pkg', ['{lib,web}/**']),
         new InputSet('a', ['lib/**']),
       ];
@@ -71,7 +71,7 @@ main() {
     });
 
     test('can list files based on InputSets with globs', () async {
-      var inputSets = [
+      var inputSets = <InputSet>[
         new InputSet('basic_pkg', ['web/*.txt']),
         new InputSet('a', ['lib/*']),
       ];

test/generate/build_test.dart

@@ -172,8 +172,11 @@ main() {
   test('outputs from previous full builds shouldn\'t be inputs to later ones',
       () async {
     final writer = new InMemoryAssetWriter();
-    var inputs = {'a|web/a.txt': 'a', 'a|lib/b.txt': 'b'};
-    var outputs = {'a|web/a.txt.copy': 'a', 'a|lib/b.txt.copy': 'b'};
+    var inputs = <String, String>{'a|web/a.txt': 'a', 'a|lib/b.txt': 'b'};
+    var outputs = <String, String>{
+      'a|web/a.txt.copy': 'a',
+      'a|lib/b.txt.copy': 'b'
+    };
     // First run, nothing special.
     await testPhases(copyAPhaseGroup, inputs, outputs: outputs, writer: writer);
     // Second run, should have no extra outputs.
@@ -182,8 +185,11 @@ main() {
 
   test('can recover from a deleted asset_graph.json cache', () async {
     final writer = new InMemoryAssetWriter();
-    var inputs = {'a|web/a.txt': 'a', 'a|lib/b.txt': 'b'};
-    var outputs = {'a|web/a.txt.copy': 'a', 'a|lib/b.txt.copy': 'b'};
+    var inputs = <String, String>{'a|web/a.txt': 'a', 'a|lib/b.txt': 'b'};
+    var outputs = <String, String>{
+      'a|web/a.txt.copy': 'a',
+      'a|lib/b.txt.copy': 'b'
+    };
     // First run, nothing special.
     await testPhases(copyAPhaseGroup, inputs, outputs: outputs, writer: writer);
 

tool/travis.sh

@@ -7,9 +7,11 @@
 # Fast fail the script on failures.
 set -e
 
-# Verify that the libraries are error free.
-dartanalyzer --fatal-warnings \
-  lib/build.dart
+# Verify that the libraries are error free, requires some strong mode changes
+# that are only in the dev channel right now though.
+if [ "$TRAVIS_DART_VERSION" != "stable" ]; then
+  dartanalyzer --fatal-warnings lib/build.dart
+fi
 
 # Run the tests.
 pub run test