Support the latest pubspec_parse and checked_yaml (dart-lang#3021)

yfer · Mar 2, 2021 · 2725a96 · 2725a96
1 parent dc743b0
commit 2725a96
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 14 deletions.
diff --git a/_test_common/pubspec.yaml b/_test_common/pubspec.yaml
@@ -15,7 +15,7 @@ dependencies:
   package_config: '>=1.9.0 <3.0.0'
   path: ^1.6.0
   test: '>=0.12.42 <2.0.0'
-  test_descriptor: ^1.0.0
+  test_descriptor: ^2.0.0
   watcher: '>=0.9.7 <2.0.0'
 
 dependency_overrides:

diff --git a/build_config/CHANGELOG.md b/build_config/CHANGELOG.md
@@ -1,3 +1,5 @@
+## 0.4.7-dev
+
 ## 0.4.6
 
 - Comment out dev dependency temporarily to break source_gen/json_serializable

diff --git a/build_config/pubspec.yaml b/build_config/pubspec.yaml
@@ -1,17 +1,17 @@
 name: build_config
-version: 0.4.6
+version: 0.4.7-dev
 description: Support for parsing `build.yaml` configuration.
 repository: https://github.com/dart-lang/build/tree/master/build_config
 
 environment:
-  sdk: '>=2.9.0 <3.0.0'
+  sdk: '>=2.11.99 <3.0.0'
 
 dependencies:
-  checked_yaml: ^1.0.0
+  checked_yaml: '>=1.0.0 <3.0.0'
   json_annotation: '>=1.0.0 <5.0.0'
   meta: ^1.1.0
   path: ^1.4.0
-  pubspec_parse: ^0.1.5
+  pubspec_parse: '>=0.1.5 <2.0.0'
   yaml: '>=2.1.11 <4.0.0'
 
 dev_dependencies:
@@ -31,4 +31,4 @@ dependency_overrides:
   build:
     path: ../build
   build_resolvers:
-    path: ../build_resolvers
+    path: ../build_resolvers
diff --git a/build_modules/pubspec.yaml b/build_modules/pubspec.yaml
@@ -37,6 +37,8 @@ dependency_overrides:
   # Remove these when they're published
   build:
     path: ../build
+  build_config:
+    path: ../build_config
   build_resolvers:
     path: ../build_resolvers
   build_test:

diff --git a/build_runner/pubspec.yaml b/build_runner/pubspec.yaml
@@ -21,7 +21,7 @@ dependencies:
   glob: ^2.0.0
   graphs: ^1.0.0
   http_multi_server: ^2.1.0
-  io: ^0.3.0
+  io: '>=0.3.0 <2.0.0'
   js: ^0.6.1+1
   logging: ">=0.11.2 <2.0.0"
   meta: ^1.1.0
@@ -30,7 +30,7 @@ dependencies:
   pedantic: ^1.0.0
   pool: ^1.0.0
   pub_semver: ">=1.4.0 <3.0.0"
-  pubspec_parse: ^0.1.0
+  pubspec_parse: ^1.0.0
   shelf: ">=0.6.5 <2.0.0"
   shelf_web_socket: ^0.2.2+4
   stack_trace: ^1.9.0
@@ -43,19 +43,21 @@ dependencies:
 dev_dependencies:
   build_test: ^1.0.0
   build_web_compilers: ^2.0.0
-  mockito: ^4.0.0
+  mockito: ^5.0.0
   package_config: '>=1.9.0 <3.0.0'
   stream_channel: ">=1.6.0 <3.0.0"
   test: ^1.3.3
-  test_descriptor: ^1.0.0
-  test_process: ^1.0.0
+  test_descriptor: ^2.0.0
+  test_process: ^2.0.0
   _test_common:
     path: ../_test_common
 
 dependency_overrides:
   # Temporarily required until build version 2.0.0 is released
   build:
     path: ../build
+  build_config:
+    path: ../build_config
   build_modules:
     path: ../build_modules
   build_resolvers:

diff --git a/build_runner/test/generate/run_script_test.dart b/build_runner/test/generate/run_script_test.dart
@@ -58,6 +58,7 @@ main(List<String> args) async {
       await d.dir('a', [
         await pubspec('a', currentIsolateDependencies: [
           'build',
+          'build_config',
           'build_daemon',
           'build_resolvers',
           'build_runner',

diff --git a/build_runner_core/pubspec.yaml b/build_runner_core/pubspec.yaml
@@ -29,8 +29,8 @@ dependencies:
 dev_dependencies:
   build_test: ^1.0.0
   test: ^1.0.0
-  test_descriptor: ^1.0.0
-  test_process: ^1.0.0
+  test_descriptor: ^2.0.0
+  test_process: ^2.0.0
   _test_common:
     path: ../_test_common
 

diff --git a/build_vm_compilers/pubspec.yaml b/build_vm_compilers/pubspec.yaml
@@ -17,6 +17,6 @@ dependencies:
 dev_dependencies:
   build_runner: ^1.0.0
   test: ^1.0.0
-  test_descriptor: ^1.1.0
+  test_descriptor: ^2.0.0
   _test_common:
     path: ../_test_common
diff --git a/scratch_space/pubspec.yaml b/scratch_space/pubspec.yaml
@@ -22,6 +22,8 @@ dependency_overrides:
   # Temporarily required until build version 2.0.0 is released
   build:
     path: ../build
+  build_config:
+    path: ../build_config
   build_resolvers:
     path: ../build_resolvers
   build_test: