Skip to content

Commit acfb246

Browse files
authored
Remove some builder cache directories as part of clean and rebuild. (#3353)
1 parent fd6256c commit acfb246

File tree

4 files changed

+13
-7
lines changed

4 files changed

+13
-7
lines changed

lib/resources/docs.dart.js

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/resources/docs.dart.js.map

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/src/generator/templates.runtime_renderers.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15628,6 +15628,7 @@ const _invisibleGetters = {
1562815628
'hashCode',
1562915629
'isAbstract',
1563015630
'isBase',
15631+
'isConstructable',
1563115632
'isDartCoreEnum',
1563215633
'isDartCoreObject',
1563315634
'isExhaustive',

tool/grind.dart

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1014,7 +1014,7 @@ String _getPackageVersion() {
10141014
}
10151015

10161016
@Task('Rebuild generated files')
1017-
@Depends(buildWeb)
1017+
@Depends(clean, buildWeb)
10181018
Future<void> build() async {
10191019
var launcher = SubprocessLauncher('build');
10201020
await launcher.runStreamed(Platform.resolvedExecutable,
@@ -1059,6 +1059,7 @@ final _generatedFilesList = <String>[
10591059
].map((s) => p.joinAll(p.posix.split(s)));
10601060

10611061
@Task('Verify generated files are up to date')
1062+
@Depends(clean)
10621063
Future<void> checkBuild() async {
10631064
var originalFileContents = <String, String>{};
10641065
var differentFiles = <String>[];
@@ -1134,9 +1135,9 @@ Future<void> test() async {
11341135
await testFutures.tasksComplete;
11351136
}
11361137

1137-
@Task('Clean up pub data from test directories')
1138+
@Task('Clean up test directories and delete build cache')
11381139
Future<void> clean() async {
1139-
var toDelete = nonRootPubData;
1140+
var toDelete = [...nonRootPubData, ...buildCacheDirectories];
11401141
for (var e in toDelete) {
11411142
e.deleteSync(recursive: true);
11421143
}
@@ -1154,6 +1155,11 @@ Iterable<FileSystemEntity> get nonRootPubData {
11541155
.contains(p.basename(e.path)));
11551156
}
11561157

1158+
Iterable<Directory> get buildCacheDirectories => Directory('.dart_tool')
1159+
.listSync(recursive: false)
1160+
.whereType<Directory>()
1161+
.where((e) => ['build', 'build_resolvers'].contains(p.basename(e.path)));
1162+
11571163
List<File> get smokeTestFiles => Directory('test')
11581164
.listSync(recursive: true)
11591165
.whereType<File>()

0 commit comments

Comments
 (0)