Skip to content

Commit 82666be

Browse files
committed
address comments
1 parent 3f79866 commit 82666be

File tree

2 files changed

+10
-18
lines changed

2 files changed

+10
-18
lines changed

pkgs/native_assets_builder/lib/src/build_runner/build_runner.dart

+3-17
Original file line numberDiff line numberDiff line change
@@ -682,10 +682,6 @@ ${e.message}
682682
Uri workingDirectory,
683683
bool includeParentEnvironment,
684684
) async {
685-
final dartPathFile = File.fromUri(
686-
outputDirectory.resolve('../hook.dill.dart_path.txt'),
687-
);
688-
689685
final kernelFile = File.fromUri(
690686
outputDirectory.resolve('../hook.dill'),
691687
);
@@ -698,18 +694,9 @@ ${e.message}
698694
final dependenciesHashes = DependenciesHashFile(file: dependenciesHashFile);
699695
final lastModifiedCutoffTime = DateTime.now();
700696
var mustCompile = false;
701-
if (!await dependenciesHashFile.exists() || !await dartPathFile.exists()) {
697+
if (!await dependenciesHashFile.exists()) {
702698
mustCompile = true;
703699
} else {
704-
final previousDartExecutable =
705-
Uri.file(await dartPathFile.readAsString());
706-
if (previousDartExecutable != dartExecutable) {
707-
mustCompile = true;
708-
logger.info(
709-
'Recompiling ${scriptUri.toFilePath()}, Dart executable changed.',
710-
);
711-
}
712-
713700
final outdatedFile =
714701
await dependenciesHashes.findOutdatedFileSystemEntity();
715702
if (outdatedFile != null) {
@@ -744,12 +731,11 @@ ${e.message}
744731
await dependenciesHashes.hashFilesAndDirectories(
745732
[
746733
...dartSources,
747-
// If the Dart executable is replaced in-place, recompile.
748-
dartExecutable,
734+
// If the Dart version changed, recompile.
735+
dartExecutable.resolve('../version'),
749736
],
750737
validBeforeLastModified: lastModifiedCutoffTime,
751738
);
752-
await dartPathFile.writeAsString(dartExecutable.toFilePath());
753739
if (modifiedDuringBuild != null) {
754740
logger.severe('File modified during build. Build must be rerun.');
755741
}

pkgs/native_assets_builder/test/build_runner/build_runner_caching_test.dart

+7-1
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,12 @@ void main() async {
6161
buildValidator: validateCodeAssetBuildOutput,
6262
applicationAssetValidator: validateCodeAssetInApplication,
6363
))!;
64+
final hookUri = packageUri.resolve('hook/build.dart');
65+
print(logMessages.join('\n'));
66+
expect(
67+
logMessages.join('\n'),
68+
isNot(contains('Recompiling ${hookUri.toFilePath()}')),
69+
);
6470
expect(
6571
logMessages.join('\n'),
6672
contains('Skipping build for native_add'),
@@ -199,7 +205,7 @@ void main() async {
199205
applicationAssetValidator: validateCodeAssetInApplication,
200206
))!;
201207

202-
final hookUri = packageUri.resolve('hook/').resolve('build.dart');
208+
final hookUri = packageUri.resolve('hook/build.dart');
203209
expect(
204210
logMessages.join('\n'),
205211
contains('Recompiling ${hookUri.toFilePath()}'),

0 commit comments

Comments
 (0)