Skip to content

Commit a086028

Browse files
committed
A bunch of strong mode fixes
1 parent 974d74a commit a086028

File tree

12 files changed

+39
-32
lines changed

12 files changed

+39
-32
lines changed

.analysis_options

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
analyzer:
2+
strong-mode: true

lib/src/generate/build.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Future<BuildResult> build(List<List<Phase>> phaseGroups,
4242
AssetReader reader,
4343
AssetWriter writer,
4444
Level logLevel,
45-
onLog(LogRecord),
45+
onLog(LogRecord record),
4646
Stream terminateEventStream}) async {
4747
var options = new BuildOptions(
4848
packageGraph: packageGraph,
@@ -87,7 +87,7 @@ Stream<BuildResult> watch(List<List<Phase>> phaseGroups,
8787
AssetReader reader,
8888
AssetWriter writer,
8989
Level logLevel,
90-
onLog(LogRecord),
90+
onLog(LogRecord record),
9191
Duration debounceDelay,
9292
DirectoryWatcherFactory directoryWatcherFactory,
9393
Stream terminateEventStream}) {
@@ -124,7 +124,7 @@ Stream<BuildResult> serve(List<List<Phase>> phaseGroups,
124124
AssetReader reader,
125125
AssetWriter writer,
126126
Level logLevel,
127-
onLog(LogRecord),
127+
onLog(LogRecord record),
128128
Duration debounceDelay,
129129
DirectoryWatcherFactory directoryWatcherFactory,
130130
Stream terminateEventStream,

lib/src/generate/options.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class BuildOptions {
3737
{this.debounceDelay,
3838
this.directoryWatcherFactory,
3939
Level logLevel,
40-
onLog(LogRecord),
40+
onLog(LogRecord record),
4141
this.packageGraph,
4242
this.reader,
4343
this.writer,

lib/src/package_graph/package_graph.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,8 @@ PackageDependencyType _dependencyType(source) {
166166
}
167167

168168
/// Gets the deps from a yaml file, taking into account dependency_overrides.
169-
Map<String, YamlMap> _depsFromYaml(YamlMap yaml, {bool isRoot: false}) {
170-
var deps = new Map.from(yaml['dependencies'] ?? {});
169+
Map<String, dynamic> _depsFromYaml(YamlMap yaml, {bool isRoot: false}) {
170+
var deps = new Map<String, dynamic>.from(yaml['dependencies'] ?? {});
171171
if (isRoot) {
172172
deps.addAll(new Map.from(yaml['dev_dependencies'] ?? {}));
173173
yaml['dependency_overrides']?.forEach((dep, source) {

test/analyzer/resolver_test.dart

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ import 'package:build/build.dart';
1010
import 'package:build/src/builder/build_step_impl.dart';
1111
import 'package:build/src/util/barback.dart';
1212

13+
import 'package:logging/logging.dart';
14+
1315
import '../common/common.dart';
1416

1517
// Ported from
@@ -18,7 +20,7 @@ main() {
1820
var entryPoint = makeAssetId('a|web/main.dart');
1921
Future validateResolver(
2022
{Map<String, String> inputs,
21-
validator(Resolver),
23+
validator(Resolver resolver),
2224
List messages: const []}) async {
2325
var writer = new InMemoryAssetWriter();
2426
var reader = new InMemoryAssetReader(writer.assets);
@@ -28,7 +30,7 @@ main() {
2830
var builder = new TestBuilder(validator);
2931
var buildStep =
3032
new BuildStepImpl(assets[entryPoint], [], reader, writer, 'a');
31-
var logs = [];
33+
var logs = <LogRecord>[];
3234
if (messages != null) {
3335
buildStep.logger.onRecord.listen(logs.add);
3436
}

test/asset/cache_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ main() {
110110

111111
test('Multiple readAsString calls wait on the same future', () async {
112112
childReaderAssets[a.id] = new DatedString(a.stringContents);
113-
var futures = [];
113+
var futures = <Future>[];
114114
futures.add(reader.readAsString(a.id));
115115
futures.add(reader.readAsString(a.id));
116116
expect(futures[0], futures[1]);
@@ -122,7 +122,7 @@ main() {
122122

123123
test('Multiple hasInput calls return the same future', () async {
124124
childReaderAssets[a.id] = new DatedString(a.stringContents);
125-
var futures = [];
125+
var futures = <Future>[];
126126
futures.add(reader.hasInput(a.id));
127127
futures.add(reader.hasInput(a.id));
128128
expect(futures[0], futures[1]);

test/builder/build_step_impl_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ main() {
7676
Logger.root.level = Level.ALL;
7777
var logger = buildStep.logger;
7878
expect(logger.fullName, primary.id.toString());
79-
var logs = [];
79+
var logs = <LogRecord>[];
8080
var listener = logger.onRecord.listen(logs.add);
8181
logger.fine('hello');
8282
logger.warning('world');

test/common/common.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ void checkOutputs(Map<String, String> outputs, BuildResult result,
5656
}
5757

5858
Future<BuildResult> nextResult(results) {
59-
var done = new Completer();
59+
var done = new Completer<BuildResult>();
6060
var startingLength = results.length;
6161
() async {
6262
while (results.length == startingLength) {

test/common/copy_builder.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class CopyBuilder implements Builder {
4444
}
4545

4646
List<AssetId> declareOutputs(AssetId input) {
47-
var outputs = [];
47+
var outputs = <AssetId>[];
4848
for (int i = 0; i < numCopies; i++) {
4949
outputs.add(_copiedAssetId(input, numCopies == 1 ? null : i));
5050
}

test/common/matchers.dart

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,13 @@ class _AssetGraphMatcher extends Matcher {
5858
return false;
5959
}
6060
if (item is GeneratedAssetNode) {
61-
if (expectedNode is! GeneratedAssetNode) return false;
62-
if (item.primaryInput != expectedNode.primaryInput) return false;
63-
if (item.needsUpdate != expectedNode.needsUpdate) return false;
64-
if (item.wasOutput != expectedNode.wasOutput) return false;
61+
if (expectedNode is GeneratedAssetNode) {
62+
if (item.primaryInput != expectedNode.primaryInput) return false;
63+
if (item.needsUpdate != expectedNode.needsUpdate) return false;
64+
if (item.wasOutput != expectedNode.wasOutput) return false;
65+
} else {
66+
return false;
67+
}
6568
}
6669
}
6770
return true;

0 commit comments

Comments
 (0)