Bump to latest analyzer (#3774)

* Bump to latest analyzer * fix analyzer * nit * fixes * review nit * Update build_runner/lib/src/build_script_generate/build_script_generate.dart Co-authored-by: Simon Binder <[email protected]> * better, I think * clean up strings * Bump mind SDK to 3.6.0 stable * update changelogs and pubspecs * update build_modules pubspec version --------- Co-authored-by: Simon Binder <[email protected]> Co-authored-by: Jake Macdonald <[email protected]>
dart-lang · Dec 16, 2024 · 0c1e9db · 0c1e9db
1 parent c88abe1
commit 0c1e9db
Show file tree

Hide file tree

Showing 22 changed files with 73 additions and 45 deletions.
diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml
diff --git a/_test/pkgs/provides_builder/pubspec.yaml b/_test/pkgs/provides_builder/pubspec.yaml
@@ -1,7 +1,7 @@
 name: provides_builder
 resolution: workspace
 environment:
-  sdk: ^3.6.0-165.0.dev
+  sdk: ^3.6.0
 publish_to: none
 
 dependencies:

diff --git a/_test/pubspec.yaml b/_test/pubspec.yaml
@@ -6,7 +6,7 @@ publish_to: none
 #resolution: workspace
 
 environment:
-  sdk: ^3.6.0-228.0.dev
+  sdk: ^3.6.0
 
 dependencies:
   web: ^1.0.0

diff --git a/_test/test/goldens/generated_build_script.dart b/_test/test/goldens/generated_build_script.dart
@@ -1,3 +1,4 @@
+// @dart=3.6
 // ignore_for_file: directives_ordering
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'package:build_runner_core/build_runner_core.dart' as _i1;

diff --git a/build/CHANGELOG.md b/build/CHANGELOG.md
@@ -3,7 +3,7 @@
 - Bump the min sdk to 3.6.0-228.0.dev.
 - Remove some unnecessary casts and non-null assertions now that we have private
   field promotion.
-- Require analyzer ^6.9.0.
+- Require analyzer ^6.9.0, allow <8.0.0.
 - Fix analyzer deprecations.
 
 ## 2.4.1

diff --git a/build/pubspec.yaml b/build/pubspec.yaml
@@ -11,7 +11,7 @@ environment:
   sdk: ^3.6.0-228.0.dev
 
 dependencies:
-  analyzer: ^6.9.0
+  analyzer: '>=6.9.0 <8.0.0'
   async: ^2.5.0
   convert: ^3.0.0
   crypto: ^3.0.0
@@ -27,6 +27,10 @@ dev_dependencies:
   dart_flutter_team_lints: ^3.1.0
   test: ^1.16.0
 
+dependency_overrides:
+  build_resolvers:
+    path: ../build_resolvers
+
 topics:
  - build-runner
  - codegen

diff --git a/build_daemon/pubspec.yaml b/build_daemon/pubspec.yaml
@@ -22,7 +22,7 @@ dependencies:
   web_socket_channel: ">=2.0.0 <4.0.0"
 
 dev_dependencies:
-  analyzer: '>=3.4.0 <7.0.0'
+  analyzer: '>=3.4.0 <8.0.0'
   build_runner: ^2.0.0
   # TODO: untangle analyzer dependency
   built_value_generator: ^8.1.0

diff --git a/build_modules/CHANGELOG.md b/build_modules/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 5.0.10-wip
+
+- Support analyzer version 7.x.
+
 ## 5.0.10-beta.0
 
 - Bump the min sdk to 3.5.0.

diff --git a/build_modules/pubspec.yaml b/build_modules/pubspec.yaml
@@ -1,5 +1,5 @@
 name: build_modules
-version: 5.0.10-beta.0
+version: 5.0.10-wip
 description: >-
   Builders to analyze and split Dart code into individually compilable modules
   based on imports.
@@ -10,7 +10,7 @@ environment:
   sdk: '>=3.5.0 <3.7.0-z'
 
 dependencies:
-  analyzer: '>=5.1.0 <7.0.0'
+  analyzer: '>=5.1.0 <8.0.0'
   async: ^2.5.0
   bazel_worker: ^1.0.0
   build: ^2.0.0

diff --git a/build_resolvers/CHANGELOG.md b/build_resolvers/CHANGELOG.md
@@ -2,10 +2,11 @@
 
 - Require the latest analyzer, and stop passing the `withNullability`
   parameter which was previously required and is now deprecated.
-- Bump the min sdk to 3.6.0-228.0.dev.
+- Bump the min sdk to 3.6.0.
 - Fix SDK summary reads when multiple isolates are using build resolvers (not
   recommended).
 - Fix analyzer deprecations.
+- Support analyzer version 7.x.
 
 ## 2.4.2
 

diff --git a/build_resolvers/pubspec.yaml b/build_resolvers/pubspec.yaml
@@ -8,10 +8,10 @@ repository: https://github.com/dart-lang/build/tree/master/build_resolvers
 #resolution: workspace
 
 environment:
-  sdk: ^3.6.0-228.0.dev
+  sdk: ^3.6.0
 
 dependencies:
-  analyzer: ^6.9.0
+  analyzer: '>=6.9.0 <8.0.0'
   async: ^2.5.0
   build: ^2.0.0
   collection: ^1.17.0

diff --git a/build_runner/CHANGELOG.md b/build_runner/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 - Write generated assets at the end of a build to avoid invalidating other
   tools with a file watcher multiple times.
+- Bump the min sdk to 3.6.0.
+- Allow analyzer version 7.x.
+- Hard code the generated build script to language version 3.6.
+- Allow dart_style version 4.0.0, require at least 2.3.7.
 
 ## 2.4.13
 

diff --git a/build_runner/lib/src/build_script_generate/build_script_generate.dart b/build_runner/lib/src/build_script_generate/build_script_generate.dart
@@ -12,6 +12,7 @@ import 'package:dart_style/dart_style.dart';
 import 'package:graphs/graphs.dart';
 import 'package:logging/logging.dart';
 import 'package:path/path.dart' as p;
+import 'package:pub_semver/pub_semver.dart';
 
 import '../package_graph/build_config_overrides.dart';
 import 'builder_ordering.dart';
@@ -25,6 +26,8 @@ const scriptKernelCachedSuffix = '.cached';
 
 final _log = Logger('Entrypoint');
 
+final _lastShortFormatDartVersion = Version(3, 6, 0);
+
 Future<String> generateBuildScript() =>
     logTimedAsync(_log, 'Generating build script', _generateBuildScript);
 
@@ -43,11 +46,12 @@ Future<String> _generateBuildScript() async {
   final emitter = DartEmitter(
       allocator: Allocator.simplePrefixing(), useNullSafetySyntax: true);
   try {
-    final content = StringBuffer()
-      ..writeln('// ignore_for_file: directives_ordering')
-      ..writeln(library.accept(emitter));
-
-    return DartFormatter().format(content.toString());
+    return DartFormatter(languageVersion: _lastShortFormatDartVersion)
+        .format('''
+// @dart=${_lastShortFormatDartVersion.major}.${_lastShortFormatDartVersion.minor}
+// ignore_for_file: directives_ordering
+${library.accept(emitter)}
+''');
   } on FormatterException {
     _log.severe('Generated build script could not be parsed.\n'
         'This is likely caused by a misconfigured builder definition.');

diff --git a/build_runner/pubspec.yaml b/build_runner/pubspec.yaml
@@ -5,15 +5,15 @@ repository: https://github.com/dart-lang/build/tree/master/build_runner
 #resolution: workspace
 
 environment:
-  sdk: ^3.5.0
+  sdk: ^3.6.0
 
 platforms:
   linux:
   windows:
   macos:
 
 dependencies:
-  analyzer: '>=4.4.0 <7.0.0'
+  analyzer: '>=4.4.0 <8.0.0'
   args: ^2.0.0
   async: ^2.5.0
   build: ">=2.1.0 <2.5.0"
@@ -24,7 +24,7 @@ dependencies:
   code_builder: ^4.2.0
   collection: ^1.15.0
   crypto: ^3.0.0
-  dart_style: ^2.0.0
+  dart_style: '>=2.3.7 <4.0.0'
   frontend_server_client: ">=3.0.0 <5.0.0"
   glob: ^2.0.0
   graphs: ^2.2.0
@@ -60,8 +60,16 @@ dev_dependencies:
   test_process: ^2.0.0
 
 dependency_overrides:
+  build:
+    path: ../build
+  build_modules:
+    path: ../build_modules
+  build_resolvers:
+    path: ../build_resolvers
   build_runner_core:
     path: ../build_runner_core
+  build_web_compilers:
+    path: ../build_web_compilers
 
 topics:
  - build-runner
diff --git a/build_runner_core/CHANGELOG.md b/build_runner_core/CHANGELOG.md
@@ -5,7 +5,7 @@
 - Add `wrapInBatch` to obtain a reader/writer pair that will batch writes
   before flushing them at the end of a build.
 - Bump the min sdk to 3.6.0-dev.228.
-- Require analyzer ^6.9.0.
+- Require analyzer ^6.9.0, allow version 7.x.
 - Fix analyzer deprecations.
 
 ## 7.3.2

diff --git a/build_runner_core/pubspec.yaml b/build_runner_core/pubspec.yaml
@@ -8,7 +8,7 @@ repository: https://github.com/dart-lang/build/tree/master/build_runner_core
 #resolution: workspace
 
 environment:
-  sdk: ^3.6.0-228.0.dev
+  sdk: ^3.6.0
 
 platforms:
   linux:
@@ -38,7 +38,7 @@ dependencies:
 dev_dependencies:
   _test_common:
     path: ../_test_common
-  analyzer: ^6.9.0
+  analyzer: '>=6.9.0 <8.0.0'
   build_runner: ^2.0.0
   build_test: ^2.0.0
   dart_flutter_team_lints: ^3.1.0

diff --git a/build_test/CHANGELOG.md b/build_test/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## 2.2.3-wip
 
 - Bump the min sdk to 3.5.0.
+- Allow analyzer version 7.x.
 
 ## 2.2.2
 

diff --git a/build_test/pubspec.yaml b/build_test/pubspec.yaml
@@ -25,7 +25,7 @@ dependencies:
   watcher: ^1.0.0
 
 dev_dependencies:
-  analyzer: '>=5.2.0 <7.0.0'
+  analyzer: '>=5.2.0 <8.0.0'
   collection: ^1.15.0
 
 topics:

diff --git a/build_web_compilers/CHANGELOG.md b/build_web_compilers/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## 4.1.0-wip
 
 - Support package:archive version 4.x.
+- Allow analyzer version 7.x.
 
 ## 4.1.0-beta.3
 

diff --git a/build_web_compilers/pubspec.yaml b/build_web_compilers/pubspec.yaml
@@ -7,10 +7,10 @@ repository: https://github.com/dart-lang/build/tree/master/build_web_compilers
 #resolution: workspace
 
 environment:
-  sdk: '>=3.6.0-165.0.dev <3.7.0-z'
+  sdk: '>=3.6.0 <3.7.0-z'
 
 dependencies:
-  analyzer: '>=5.1.0 <7.0.0'
+  analyzer: '>=5.1.0 <8.0.0'
   archive: '>=3.0.0 <5.0.0'
   bazel_worker: ^1.0.0
   build: ^2.0.0

diff --git a/build_web_compilers/test/fixtures/c/pubspec.yaml b/build_web_compilers/test/fixtures/c/pubspec.yaml
@@ -2,7 +2,7 @@ name: c
 resolution: workspace
 
 environment:
-  sdk: ^3.6.0-165.0.dev
+  sdk: ^3.6.0
 
 dependencies:
   d: