@@ -765,20 +765,8 @@ Future<void> validateBuild() async {
765
765
766
766
await buildAll ();
767
767
768
- const analyzerTarget = '6.5.0' ;
769
- String getAnalyzerInUse () {
770
- var lockfilePath = path.join (Directory .current.path, 'pubspec.lock' );
771
- var lockfile = loadYaml (File (lockfilePath).readAsStringSync ()) as YamlMap ;
772
- var packages = lockfile['packages' ] as YamlMap ;
773
- var analyzer = packages['analyzer' ] as YamlMap ;
774
- return analyzer['version' ] as String ;
775
- }
776
-
777
- var analyzerInUse = getAnalyzerInUse ();
778
-
779
768
for (var relPath in _generatedFilesList) {
780
- if (relPath.contains ('runtime_renderers' ) &&
781
- analyzerTarget != analyzerInUse) {
769
+ if (relPath.contains ('runtime_renderers' ) && ! _analyzerInUseIsTarget) {
782
770
// The content of these files is very specific to the version of the
783
771
// analyzer package in use. So we only validate if we are working on that
784
772
// exact version.
@@ -818,6 +806,16 @@ Rebuild them with "dart tool/task.dart build" and check the results in.
818
806
}
819
807
}
820
808
809
+ bool get _analyzerInUseIsTarget {
810
+ var lockfilePath = path.join (Directory .current.path, 'pubspec.lock' );
811
+ var lockfile = loadYaml (File (lockfilePath).readAsStringSync ()) as YamlMap ;
812
+ var packages = lockfile['packages' ] as YamlMap ;
813
+ var analyzer = packages['analyzer' ] as YamlMap ;
814
+ var analyzerInUse = analyzer['version' ] as String ;
815
+ const analyzerTarget = '6.5.2' ;
816
+ return analyzerInUse == analyzerTarget;
817
+ }
818
+
821
819
/// Paths in this list are relative to lib/.
822
820
final _generatedFilesList = [
823
821
'../dartdoc_options.yaml' ,
0 commit comments