Skip to content

Commit 5d6da09

Browse files
authored
Fix the build (#3512)
* check for InvalidType instead of dynamic * update analyzer dep * fix test to not use IOOverrides until it is fixed
1 parent 23a9201 commit 5d6da09

File tree

3 files changed

+18
-24
lines changed

3 files changed

+18
-24
lines changed

build_resolvers/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ environment:
77
sdk: '>=2.19.0 <3.0.0'
88

99
dependencies:
10-
analyzer: ^5.2.0
10+
analyzer: ^5.12.0
1111
async: ^2.5.0
1212
build: ^2.0.0
1313
collection: ^1.17.0

build_resolvers/test/resolver_test.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import 'dart:isolate';
99
import 'package:analyzer/dart/analysis/results.dart';
1010
import 'package:analyzer/dart/ast/ast.dart';
1111
import 'package:analyzer/dart/element/element.dart';
12+
import 'package:analyzer/dart/element/type.dart';
1213
import 'package:build/build.dart';
1314
import 'package:build/experiments.dart';
1415
import 'package:build_resolvers/src/analysis_driver.dart';
@@ -733,7 +734,7 @@ int? get x => 1;
733734
.toString(),
734735
equals('dart:ui'));
735736
} else {
736-
expect(color.type.element!.name, equals('dynamic'));
737+
expect(color.type, isA<InvalidType>());
737738
}
738739
}, resolvers: AnalyzerResolvers());
739740
});

build_runner/test/build_script_generate/bootstrap_test.dart

Lines changed: 15 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,41 +2,34 @@
22
// for details. All rights reserved. Use of this source code is governed by a
33
// BSD-style license that can be found in the LICENSE file.
44
@Timeout.factor(2)
5-
import 'dart:io';
5+
library;
66

77
import 'package:build_runner/build_script_generate.dart';
88
import 'package:test/test.dart';
99

10-
import '../integration_tests/utils/build_descriptor.dart';
11-
1210
void main() {
1311
test('invokes custom error function', () async {
1412
Object? error;
1513
StackTrace? stackTrace;
1614

17-
final pkgDir = (await package([])).rootPackageDir;
18-
19-
await IOOverrides.runZoned(
20-
() {
21-
return expectLater(
22-
generateAndRun(
23-
[],
24-
generateBuildScript: () async {
25-
return '''
15+
// TODO: https://github.com/dart-lang/sdk/issues/52469 Use IOOverrides to
16+
// run this is a tmp dir, this currently bashes over the actual cache dir.
17+
await expectLater(
18+
generateAndRun(
19+
[],
20+
generateBuildScript: () async {
21+
return '''
2622
void main() {
2723
throw 'expected error';
2824
}
2925
''';
30-
},
31-
handleUncaughtError: (err, trace) {
32-
error = err;
33-
stackTrace = trace;
34-
},
35-
),
36-
completion(1),
37-
);
38-
},
39-
getCurrentDirectory: () => Directory(pkgDir),
26+
},
27+
handleUncaughtError: (err, trace) {
28+
error = err;
29+
stackTrace = trace;
30+
},
31+
),
32+
completion(1),
4033
);
4134

4235
expect(error, 'expected error');

0 commit comments

Comments
 (0)