dart-lang · jcollins-g · Feb 16, 2021 · Feb 9, 2021 · Feb 9, 2021 · Feb 9, 2021
diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml
diff --git a/_test/mono_pkg.yaml b/_test/mono_pkg.yaml
@@ -1,5 +1,5 @@
 dart:
-- beta
+- dev
 
 os:
 - linux

diff --git a/_test/pubspec.yaml b/_test/pubspec.yaml
@@ -5,7 +5,7 @@ environment:
   sdk: ">=2.3.0 <3.0.0"
 
 dev_dependencies:
-  analyzer: ^0.41.0
+  analyzer: ^1.0.0
   path: ^1.4.2
   test: ^1.6.2
   test_process: ^1.0.4

diff --git a/_test_common/mono_pkg.yaml b/_test_common/mono_pkg.yaml
@@ -1,5 +1,5 @@
 dart:
-- beta
+- dev
 
 stages:
 - analyze_and_format:

diff --git a/_test_null_safety/mono_pkg.yaml b/_test_null_safety/mono_pkg.yaml
@@ -1,5 +1,5 @@
 dart:
-- beta
+- dev
 
 os:
 - linux

diff --git a/_test_null_safety/pubspec.yaml b/_test_null_safety/pubspec.yaml
@@ -6,7 +6,7 @@ environment:
 
 dev_dependencies:
   js: ^0.6.3
-  test: ^1.16.0-nullsafety
+  test: ^1.16.0
 
 dependency_overrides:
   build:

diff --git a/build/CHANGELOG.md b/build/CHANGELOG.md
@@ -1,5 +1,6 @@
-## 1.6.3
+## 1.6.3-dev
 
+- Use latest analyzer version `1.x`.
 - Use latest glob version `2.x`.
 
 ## 1.6.2

diff --git a/build/mono_pkg.yaml b/build/mono_pkg.yaml
@@ -1,5 +1,5 @@
 dart:
-- beta
+- dev
 
 stages:
 - analyze_and_format:

diff --git a/build/pubspec.yaml b/build/pubspec.yaml
@@ -7,7 +7,7 @@ environment:
   sdk: ">=2.11.99 <3.0.0"
 
 dependencies:
-  analyzer: '>=0.35.0 <0.42.0'
+  analyzer: ^1.0.0
   async: ">=1.13.3 <3.0.0"
   convert: ">=2.0.0 <4.0.0"
   crypto: ">=0.9.2 <4.0.0"

diff --git a/build_config/CHANGELOG.md b/build_config/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.4.6-dev
+
+- Comment out dev dependency temporarily to break source_gen/json_serializable
+  dependency loop.
+
 ## 0.4.5
 
 - Allow `package:json_annotation` `v4.x`.

diff --git a/build_config/lib/src/builder_definition.dart b/build_config/lib/src/builder_definition.dart
@@ -41,24 +41,16 @@ class BuilderDefinition {
   String get key => builderKeyExpando[this];
 
   /// The names of the top-level methods in [import] from args -> Builder.
-  @JsonKey(
-      name: 'builder_factories',
-      nullable: false,
-      required: true,
-      disallowNullValue: true)
+  @JsonKey(name: 'builder_factories', required: true, disallowNullValue: true)
   final List<String> builderFactories;
 
   /// The import to be used to load `clazz`.
-  @JsonKey(nullable: false, required: true, disallowNullValue: true)
+  @JsonKey(required: true, disallowNullValue: true)
   final String import;
 
   /// A map from input extension to the output extensions created for matching
   /// inputs.
-  @JsonKey(
-      name: 'build_extensions',
-      nullable: false,
-      required: true,
-      disallowNullValue: true)
+  @JsonKey(name: 'build_extensions', required: true, disallowNullValue: true)
   final Map<String, List<String>> buildExtensions;
 
   /// The name of the dart_library target that contains `import`.
@@ -176,15 +168,11 @@ class PostProcessBuilderDefinition {
 
   /// The name of the top-level method in [import] from
   /// Map<String, dynamic> -> Builder.
-  @JsonKey(
-      name: 'builder_factory',
-      nullable: false,
-      required: true,
-      disallowNullValue: true)
+  @JsonKey(name: 'builder_factory', required: true, disallowNullValue: true)
   final String builderFactory;
 
   /// The import to be used to load `clazz`.
-  @JsonKey(nullable: false, required: true, disallowNullValue: true)
+  @JsonKey(required: true, disallowNullValue: true)
   final String import;
 
   /// A list of input extensions for this builder.

diff --git a/build_config/mono_pkg.yaml b/build_config/mono_pkg.yaml
@@ -1,5 +1,5 @@
 dart:
-- beta
+- dev
 
 stages:
 - analyze_and_format:

diff --git a/build_config/pubspec.yaml b/build_config/pubspec.yaml
@@ -1,5 +1,5 @@
 name: build_config
-version: 0.4.5
+version: 0.4.6-dev
 description: Support for parsing `build.yaml` configuration.
 repository: https://github.com/dart-lang/build/tree/master/build_config
 
@@ -16,7 +16,8 @@ dependencies:
 
 dev_dependencies:
   build_runner: ^1.0.0
-  json_serializable: ^3.0.0
+  # TODO: Untangle source_gen dependency
+  #json_serializable: ^3.0.0
   term_glyph: ^1.0.0
   test: ^1.6.0
 

diff --git a/build_daemon/mono_pkg.yaml b/build_daemon/mono_pkg.yaml
@@ -1,5 +1,5 @@
 dart:
-- beta
+- dev
 
 stages:
 - analyze_and_format:

diff --git a/build_daemon/pubspec.yaml b/build_daemon/pubspec.yaml
@@ -22,21 +22,19 @@ dependencies:
 
 dev_dependencies:
   build_runner: ^1.0.0
-  built_value_generator: ^7.0.0
+  # TODO: untangle analyzer dependency
+  #built_value_generator: ^7.0.0
   mockito: ^4.0.0
   test: ^1.3.3
   test_descriptor: ^1.1.1
   uuid: ^2.0.0
 
 dependency_overrides:
-  ## Remove these and replace with updated constraints once valid build-wide
-  analyzer: 1.0.0
-  uuid: 3.0.0-nullsafety.0
   ## Remove each of the following as they are published
   build_config:
     path: ../build_config
   build_runner:
     path: ../build_runner
   build_runner_core:
     path: ../build_runner_core
-  ## Remove each of the above as they are published
+  ## Remove each of the above as they are published
diff --git a/build_modules/CHANGELOG.md b/build_modules/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## 3.0.5-dev
 
 - Update to glob `2.x`.
+- Update to analyzer `1.x`.
 
 ## 3.0.4
 

diff --git a/build_modules/mono_pkg.yaml b/build_modules/mono_pkg.yaml
@@ -1,5 +1,5 @@
 dart:
-- beta
+- dev
 
 stages:
 - analyze_and_format:

diff --git a/build_modules/pubspec.yaml b/build_modules/pubspec.yaml
@@ -7,7 +7,7 @@ environment:
   sdk: ">=2.11.99 <3.0.0"
 
 dependencies:
-  analyzer: ">0.36.4 <0.42.0"
+  analyzer: ^1.0.0
   async: ^2.0.0
   bazel_worker: ">=0.1.20 <2.0.0"
   build: ">=1.3.0 <2.0.0"
@@ -51,4 +51,4 @@ dependency_overrides:
     path: ../build_test
   scratch_space:
     path: ../scratch_space
-  ## Remove each of the above as they are published
+  ## Remove each of the above as they are published
diff --git a/build_resolvers/CHANGELOG.md b/build_resolvers/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.5.4-dev
+
+- Allow analyzer 1.0.0.
+
 ## 1.5.3
 
 - Allow the null safe pre-release of `package_config`.

diff --git a/build_resolvers/mono_pkg.yaml b/build_resolvers/mono_pkg.yaml
@@ -1,5 +1,5 @@
 dart:
-- beta
+- dev
 
 stages:
 - analyze_and_format:

diff --git a/build_resolvers/pubspec.yaml b/build_resolvers/pubspec.yaml
@@ -1,13 +1,13 @@
 name: build_resolvers
-version: 1.5.3
+version: 1.5.4-dev
 description: Resolve Dart code in a Builder
 homepage: https://github.com/dart-lang/build/tree/master/build_resolvers
 
 environment:
-  sdk: ">=2.9.0 <3.0.0"
+  sdk: ">=2.11.99 <3.0.0"
 
 dependencies:
-  analyzer: ">=0.40.1 <0.42.0"
+  analyzer: ^1.0.0
   build: ">=1.6.0 <1.7.0"
   crypto: ">=2.0.0 <4.0.0"
   graphs: ^0.2.0
@@ -30,4 +30,4 @@ dependency_overrides:
     path: ../build_config
   build_test:
     path: ../build_test
-  ## Remove each of the above as they are published
+  ## Remove each of the above as they are published
diff --git a/build_runner/mono_pkg.yaml b/build_runner/mono_pkg.yaml
@@ -1,5 +1,5 @@
 dart:
-- beta
+- dev
 
 stages:
 - analyze_and_format:

diff --git a/build_runner/pubspec.yaml b/build_runner/pubspec.yaml
@@ -72,4 +72,4 @@ dependency_overrides:
     path: ../build_web_compilers
   scratch_space:
     path: ../scratch_space
-  ## Remove each of the above as they are published
+  ## Remove each of the above as they are published
diff --git a/build_runner/test/generate/run_script_test.dart b/build_runner/test/generate/run_script_test.dart
@@ -58,12 +58,13 @@ main(List<String> args) async {
       await d.dir('a', [
         await pubspec('a', currentIsolateDependencies: [
           'build',
+          'build_config', // TODO: remove after publishing
           'build_daemon',
           'build_resolvers',
           'build_runner',
           'build_runner_core',
           'build_test',
-          'glob'
+          'glob',
         ]),
         d.dir('bin', [
           d.file('main.dart', executableFileContent),

diff --git a/build_runner_core/mono_pkg.yaml b/build_runner_core/mono_pkg.yaml
@@ -1,5 +1,5 @@
 dart:
-- beta
+- dev
 
 stages:
 - analyze_and_format:

diff --git a/build_test/CHANGELOG.md b/build_test/CHANGELOG.md
@@ -1,5 +1,6 @@
 ## 1.3.7-dev
 
+- Update to analyzer `1.x`.
 - Update to glob `2.x`.
 
 ## 1.3.6

diff --git a/build_test/mono_pkg.yaml b/build_test/mono_pkg.yaml
@@ -1,5 +1,5 @@
 dart:
-- beta
+- dev
 
 stages:
 - analyze_and_format:

diff --git a/build_test/pubspec.yaml b/build_test/pubspec.yaml
@@ -25,7 +25,7 @@ dependencies:
   watcher: '>=0.9.7 <2.0.0'
 
 dev_dependencies:
-  analyzer: ">=0.35.4 <0.42.0"
+  analyzer: ^1.0.0
   collection: ^1.14.0
 
 dependency_overrides:
@@ -36,4 +36,4 @@ dependency_overrides:
     path: ../build_config
   build_resolvers:
     path: ../build_resolvers
-  ## Remove each of the above as they are published
+  ## Remove each of the above as they are published
diff --git a/build_vm_compilers/CHANGELOG.md b/build_vm_compilers/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.7-dev
+
+- Update to latest analyzer version `1.0.0`.
+
 ## 1.0.6
 
 - Allow the latest analyzer verion `0.41.x`.

diff --git a/build_vm_compilers/mono_pkg.yaml b/build_vm_compilers/mono_pkg.yaml
@@ -1,5 +1,5 @@
 dart:
-- beta
+- dev
 
 stages:
 - analyze_and_format:

diff --git a/build_vm_compilers/pubspec.yaml b/build_vm_compilers/pubspec.yaml
@@ -1,13 +1,13 @@
 name: build_vm_compilers
-version: 1.0.6
+version: 1.0.7-dev
 description: Builder implementations wrapping Dart VM compilers.
 homepage: https://github.com/dart-lang/build/tree/master/build_vm_compilers
 
 environment:
-  sdk: ">=2.9.0 <3.0.0"
+  sdk: ">=2.11.99 <3.0.0"
 
 dependencies:
-  analyzer: ">=0.36.4 <0.42.0"
+  analyzer: ^1.0.0
   build: ^1.0.0
   build_config: ">=0.3.0 <0.5.0"
   build_modules: ^2.0.0
@@ -41,4 +41,4 @@ dependency_overrides:
     path: ../build_test
   scratch_space:
     path: ../scratch_space
-  ## Remove each of the above as they are published
+  ## Remove each of the above as they are published
diff --git a/build_vm_compilers/test/vm_kernel_integration_test.dart b/build_vm_compilers/test/vm_kernel_integration_test.dart
@@ -24,6 +24,7 @@ void main() {
           'build_runner',
           'build_runner_core',
           'build_vm_compilers',
+          'scratch_space',
         ], versionDependencies: {
           'glob': 'any',
           'path': 'any',

diff --git a/build_web_compilers/CHANGELOG.md b/build_web_compilers/CHANGELOG.md
@@ -1,5 +1,6 @@
-## 2.16.4
+## 2.16.4-dev
 
+- Update analyzer to `1.x`.
 - Update glob to `2.x`.
 
 ## 2.16.3

diff --git a/build_web_compilers/mono_pkg.yaml b/build_web_compilers/mono_pkg.yaml
@@ -1,5 +1,5 @@
 dart:
-- beta
+- dev
 
 stages:
 - analyze_and_format:

diff --git a/build_web_compilers/pubspec.yaml b/build_web_compilers/pubspec.yaml
@@ -7,7 +7,7 @@ environment:
   sdk: ">=2.11.99 <3.0.0"
 
 dependencies:
-  analyzer: ">=0.36.4 <0.42.0"
+  analyzer: ^1.0.0
   archive: '>=2.0.0 <4.0.0'
   bazel_worker: ">=0.1.18 <2.0.0"
   build: ">=1.5.0 <2.0.0"

diff --git a/example/lib/example.dart b/example/lib/example.dart
@@ -80,7 +80,7 @@ Visible libraries: $visibleLibraries
 
 Iterable<Element> allElements(LibraryElement element) sync* {
   for (var cu in element.units) {
-    yield* cu.functionTypeAliases;
+    yield* cu.typeAliases;
     yield* cu.functions;
     yield* cu.mixins;
     yield* cu.topLevelVariables;

diff --git a/example/mono_pkg.yaml b/example/mono_pkg.yaml
@@ -1,5 +1,5 @@
 dart:
-- beta
+- dev
 
 stages:
 - analyze_and_format:
-Original file line number
+Diff line change
@@ -1,5 +1,5 @@
     dart:
-    - beta
+    - dev
     os:
     - linux
@@ Expand Down @@