From fcff629feab5c5e3210593176aae5a3a50000de9 Mon Sep 17 00:00:00 2001 From: Nate Bosch Date: Fri, 12 Aug 2022 13:40:09 -0700 Subject: [PATCH] Avoid deprecated analyzer APIs (#3351) - Bump dependencies to ^4.6.0. - Bump min SDK to ^2.17.0 and switch mono_repo to test on that. - Use constructor tearoffs now that the language version is newer --- .github/workflows/dart.yml | 445 +++++++++++++----- build_modules/CHANGELOG.md | 2 + build_modules/lib/src/module_library.dart | 2 +- build_modules/pubspec.yaml | 4 +- build_resolvers/pubspec.yaml | 2 +- build_resolvers/test/resolver_test.dart | 29 +- .../lib/src/generate/input_matcher.dart | 4 +- build_runner_core/mono_pkg.yaml | 1 + build_runner_core/pubspec.yaml | 4 +- .../test/generate/resolution_test.dart | 2 +- .../package_graph/apply_builders_test.dart | 27 +- build_test/mono_pkg.yaml | 2 +- build_test/pubspec.yaml | 4 +- build_test/test/resolve_source_test.dart | 18 +- .../lib/src/vm_entrypoint_builder.dart | 2 +- build_vm_compilers/mono_pkg.yaml | 1 + build_vm_compilers/pubspec.yaml | 4 +- build_web_compilers/CHANGELOG.md | 2 + .../lib/src/web_entrypoint_builder.dart | 2 +- build_web_compilers/pubspec.yaml | 4 +- 20 files changed, 388 insertions(+), 173 deletions(-) diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index 72cb99df1..5e450d6b9 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -66,16 +66,16 @@ jobs: working-directory: build run: dart analyze --fatal-infos . job_003: - name: "analyze_and_format; linux; Dart 2.14.0; PKGS: build_test, example, scratch_space; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos .`" + name: "analyze_and_format; linux; Dart 2.14.0; PKGS: example, scratch_space; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos .`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@4504faf7e9bcf8f3ed0bc863c4e1d21499ab8ef8 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.14.0;packages:build_test-example-scratch_space;commands:format-analyze_0" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.14.0;packages:example-scratch_space;commands:format-analyze_0" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:2.14.0;packages:build_test-example-scratch_space + os:ubuntu-latest;pub-cache-hosted;sdk:2.14.0;packages:example-scratch_space os:ubuntu-latest;pub-cache-hosted;sdk:2.14.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest @@ -84,19 +84,6 @@ jobs: sdk: "2.14.0" - id: checkout uses: actions/checkout@d0651293c4a5a52e711f25b41b05b2212f385d28 - - id: build_test_pub_upgrade - name: build_test; dart pub upgrade - if: "always() && steps.checkout.conclusion == 'success'" - working-directory: build_test - run: dart pub upgrade - - name: "build_test; dart format --output=none --set-exit-if-changed ." - if: "always() && steps.build_test_pub_upgrade.conclusion == 'success'" - working-directory: build_test - run: "dart format --output=none --set-exit-if-changed ." - - name: "build_test; dart analyze --fatal-infos ." - if: "always() && steps.build_test_pub_upgrade.conclusion == 'success'" - working-directory: build_test - run: dart analyze --fatal-infos . - id: example_pub_upgrade name: example; dart pub upgrade if: "always() && steps.checkout.conclusion == 'success'" @@ -124,16 +111,16 @@ jobs: working-directory: scratch_space run: dart analyze --fatal-infos . job_004: - name: "analyze_and_format; linux; Dart 2.17.0; PKG: build_resolvers; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos .`" + name: "analyze_and_format; linux; Dart 2.17.0; PKGS: build_resolvers, build_test, build_vm_compilers; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos .`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@4504faf7e9bcf8f3ed0bc863c4e1d21499ab8ef8 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:build_resolvers;commands:format-analyze_0" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:build_resolvers-build_test-build_vm_compilers;commands:format-analyze_0" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:build_resolvers + os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:build_resolvers-build_test-build_vm_compilers os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest @@ -155,6 +142,32 @@ jobs: if: "always() && steps.build_resolvers_pub_upgrade.conclusion == 'success'" working-directory: build_resolvers run: dart analyze --fatal-infos . + - id: build_test_pub_upgrade + name: build_test; dart pub upgrade + if: "always() && steps.checkout.conclusion == 'success'" + working-directory: build_test + run: dart pub upgrade + - name: "build_test; dart format --output=none --set-exit-if-changed ." + if: "always() && steps.build_test_pub_upgrade.conclusion == 'success'" + working-directory: build_test + run: "dart format --output=none --set-exit-if-changed ." + - name: "build_test; dart analyze --fatal-infos ." + if: "always() && steps.build_test_pub_upgrade.conclusion == 'success'" + working-directory: build_test + run: dart analyze --fatal-infos . + - id: build_vm_compilers_pub_upgrade + name: build_vm_compilers; dart pub upgrade + if: "always() && steps.checkout.conclusion == 'success'" + working-directory: build_vm_compilers + run: dart pub upgrade + - name: "build_vm_compilers; dart format --output=none --set-exit-if-changed ." + if: "always() && steps.build_vm_compilers_pub_upgrade.conclusion == 'success'" + working-directory: build_vm_compilers + run: "dart format --output=none --set-exit-if-changed ." + - name: "build_vm_compilers; dart analyze --fatal-infos ." + if: "always() && steps.build_vm_compilers_pub_upgrade.conclusion == 'success'" + working-directory: build_vm_compilers + run: dart analyze --fatal-infos . job_005: name: "analyze_and_format; linux; Dart dev; PKGS: _test, _test_common, build; `dart analyze --fatal-infos .`" runs-on: ubuntu-latest @@ -476,16 +489,16 @@ jobs: - job_008 - job_009 job_011: - name: "unit_test; linux; Dart 2.14.0; PKG: build_test; `dart test --test-randomize-ordering-seed=random`" + name: "unit_test; linux; Dart 2.14.0; PKG: scratch_space; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@4504faf7e9bcf8f3ed0bc863c4e1d21499ab8ef8 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.14.0;packages:build_test;commands:test_04" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.14.0;packages:scratch_space;commands:test_04" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:2.14.0;packages:build_test + os:ubuntu-latest;pub-cache-hosted;sdk:2.14.0;packages:scratch_space os:ubuntu-latest;pub-cache-hosted;sdk:2.14.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest @@ -494,14 +507,14 @@ jobs: sdk: "2.14.0" - id: checkout uses: actions/checkout@d0651293c4a5a52e711f25b41b05b2212f385d28 - - id: build_test_pub_upgrade - name: build_test; dart pub upgrade + - id: scratch_space_pub_upgrade + name: scratch_space; dart pub upgrade if: "always() && steps.checkout.conclusion == 'success'" - working-directory: build_test + working-directory: scratch_space run: dart pub upgrade - - name: "build_test; dart test --test-randomize-ordering-seed=random" - if: "always() && steps.build_test_pub_upgrade.conclusion == 'success'" - working-directory: build_test + - name: "scratch_space; dart test --test-randomize-ordering-seed=random" + if: "always() && steps.scratch_space_pub_upgrade.conclusion == 'success'" + working-directory: scratch_space run: "dart test --test-randomize-ordering-seed=random" needs: - job_001 @@ -514,32 +527,32 @@ jobs: - job_008 - job_009 job_012: - name: "unit_test; linux; Dart 2.14.0; PKG: scratch_space; `dart test --test-randomize-ordering-seed=random`" + name: "unit_test; linux; Dart 2.17.0; PKG: build_resolvers; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@4504faf7e9bcf8f3ed0bc863c4e1d21499ab8ef8 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.14.0;packages:scratch_space;commands:test_04" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:build_resolvers;commands:test_04" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:2.14.0;packages:scratch_space - os:ubuntu-latest;pub-cache-hosted;sdk:2.14.0 + os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:build_resolvers + os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d with: - sdk: "2.14.0" + sdk: "2.17.0" - id: checkout uses: actions/checkout@d0651293c4a5a52e711f25b41b05b2212f385d28 - - id: scratch_space_pub_upgrade - name: scratch_space; dart pub upgrade + - id: build_resolvers_pub_upgrade + name: build_resolvers; dart pub upgrade if: "always() && steps.checkout.conclusion == 'success'" - working-directory: scratch_space + working-directory: build_resolvers run: dart pub upgrade - - name: "scratch_space; dart test --test-randomize-ordering-seed=random" - if: "always() && steps.scratch_space_pub_upgrade.conclusion == 'success'" - working-directory: scratch_space + - name: "build_resolvers; dart test --test-randomize-ordering-seed=random" + if: "always() && steps.build_resolvers_pub_upgrade.conclusion == 'success'" + working-directory: build_resolvers run: "dart test --test-randomize-ordering-seed=random" needs: - job_001 @@ -552,16 +565,16 @@ jobs: - job_008 - job_009 job_013: - name: "unit_test; linux; Dart 2.17.0; PKG: build_resolvers; `dart test --test-randomize-ordering-seed=random`" + name: "unit_test; linux; Dart 2.17.0; PKG: build_runner_core; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@4504faf7e9bcf8f3ed0bc863c4e1d21499ab8ef8 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:build_resolvers;commands:test_04" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:build_runner_core;commands:test_04" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:build_resolvers + os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:build_runner_core os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest @@ -570,14 +583,14 @@ jobs: sdk: "2.17.0" - id: checkout uses: actions/checkout@d0651293c4a5a52e711f25b41b05b2212f385d28 - - id: build_resolvers_pub_upgrade - name: build_resolvers; dart pub upgrade + - id: build_runner_core_pub_upgrade + name: build_runner_core; dart pub upgrade if: "always() && steps.checkout.conclusion == 'success'" - working-directory: build_resolvers + working-directory: build_runner_core run: dart pub upgrade - - name: "build_resolvers; dart test --test-randomize-ordering-seed=random" - if: "always() && steps.build_resolvers_pub_upgrade.conclusion == 'success'" - working-directory: build_resolvers + - name: "build_runner_core; dart test --test-randomize-ordering-seed=random" + if: "always() && steps.build_runner_core_pub_upgrade.conclusion == 'success'" + working-directory: build_runner_core run: "dart test --test-randomize-ordering-seed=random" needs: - job_001 @@ -590,6 +603,82 @@ jobs: - job_008 - job_009 job_014: + name: "unit_test; linux; Dart 2.17.0; PKG: build_test; `dart test --test-randomize-ordering-seed=random`" + runs-on: ubuntu-latest + steps: + - name: Cache Pub hosted dependencies + uses: actions/cache@4504faf7e9bcf8f3ed0bc863c4e1d21499ab8ef8 + with: + path: "~/.pub-cache/hosted" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:build_test;commands:test_04" + restore-keys: | + os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:build_test + os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0 + os:ubuntu-latest;pub-cache-hosted + os:ubuntu-latest + - uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d + with: + sdk: "2.17.0" + - id: checkout + uses: actions/checkout@d0651293c4a5a52e711f25b41b05b2212f385d28 + - id: build_test_pub_upgrade + name: build_test; dart pub upgrade + if: "always() && steps.checkout.conclusion == 'success'" + working-directory: build_test + run: dart pub upgrade + - name: "build_test; dart test --test-randomize-ordering-seed=random" + if: "always() && steps.build_test_pub_upgrade.conclusion == 'success'" + working-directory: build_test + run: "dart test --test-randomize-ordering-seed=random" + needs: + - job_001 + - job_002 + - job_003 + - job_004 + - job_005 + - job_006 + - job_007 + - job_008 + - job_009 + job_015: + name: "unit_test; linux; Dart 2.17.0; PKG: build_vm_compilers; `dart test`" + runs-on: ubuntu-latest + steps: + - name: Cache Pub hosted dependencies + uses: actions/cache@4504faf7e9bcf8f3ed0bc863c4e1d21499ab8ef8 + with: + path: "~/.pub-cache/hosted" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:build_vm_compilers;commands:test_03" + restore-keys: | + os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:build_vm_compilers + os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0 + os:ubuntu-latest;pub-cache-hosted + os:ubuntu-latest + - uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d + with: + sdk: "2.17.0" + - id: checkout + uses: actions/checkout@d0651293c4a5a52e711f25b41b05b2212f385d28 + - id: build_vm_compilers_pub_upgrade + name: build_vm_compilers; dart pub upgrade + if: "always() && steps.checkout.conclusion == 'success'" + working-directory: build_vm_compilers + run: dart pub upgrade + - name: build_vm_compilers; dart test + if: "always() && steps.build_vm_compilers_pub_upgrade.conclusion == 'success'" + working-directory: build_vm_compilers + run: dart test + needs: + - job_001 + - job_002 + - job_003 + - job_004 + - job_005 + - job_006 + - job_007 + - job_008 + - job_009 + job_016: name: "unit_test; linux; Dart dev; PKG: _test; `dart run build_runner test -- -p chrome --test-randomize-ordering-seed=random`, `dart run build_runner test -- -p vm test/configurable_uri_test.dart --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: @@ -631,7 +720,7 @@ jobs: - job_007 - job_008 - job_009 - job_015: + job_017: name: "unit_test; linux; Dart dev; PKG: build; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: @@ -669,7 +758,7 @@ jobs: - job_007 - job_008 - job_009 - job_016: + job_018: name: "unit_test; linux; Dart dev; PKG: build_config; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: @@ -707,7 +796,7 @@ jobs: - job_007 - job_008 - job_009 - job_017: + job_019: name: "unit_test; linux; Dart dev; PKG: build_daemon; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: @@ -745,7 +834,7 @@ jobs: - job_007 - job_008 - job_009 - job_018: + job_020: name: "unit_test; linux; Dart dev; PKG: build_resolvers; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: @@ -783,7 +872,7 @@ jobs: - job_007 - job_008 - job_009 - job_019: + job_021: name: "unit_test; linux; Dart dev; PKG: build_runner_core; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: @@ -821,7 +910,7 @@ jobs: - job_007 - job_008 - job_009 - job_020: + job_022: name: "unit_test; linux; Dart dev; PKG: build_test; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: @@ -859,7 +948,7 @@ jobs: - job_007 - job_008 - job_009 - job_021: + job_023: name: "unit_test; linux; Dart dev; PKG: build_web_compilers; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: @@ -897,7 +986,7 @@ jobs: - job_007 - job_008 - job_009 - job_022: + job_024: name: "unit_test; linux; Dart dev; PKG: scratch_space; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: @@ -935,7 +1024,7 @@ jobs: - job_007 - job_008 - job_009 - job_023: + job_025: name: "unit_test; linux; Dart dev; PKG: build_modules; `dart test -P presubmit --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: @@ -973,7 +1062,7 @@ jobs: - job_007 - job_008 - job_009 - job_024: + job_026: name: "unit_test; linux; Dart dev; PKG: build_runner; `dart test -x integration --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: @@ -1011,7 +1100,7 @@ jobs: - job_007 - job_008 - job_009 - job_025: + job_027: name: "unit_test; linux; Dart dev; PKG: build_vm_compilers; `dart test`" runs-on: ubuntu-latest steps: @@ -1049,7 +1138,7 @@ jobs: - job_007 - job_008 - job_009 - job_026: + job_028: name: "unit_test; windows; Dart 2.14.0; PKG: build; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: @@ -1077,8 +1166,8 @@ jobs: - job_007 - job_008 - job_009 - job_027: - name: "unit_test; windows; Dart 2.14.0; PKG: build_test; `dart test --test-randomize-ordering-seed=random`" + job_029: + name: "unit_test; windows; Dart 2.14.0; PKG: scratch_space; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: - uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d @@ -1086,14 +1175,14 @@ jobs: sdk: "2.14.0" - id: checkout uses: actions/checkout@d0651293c4a5a52e711f25b41b05b2212f385d28 - - id: build_test_pub_upgrade - name: build_test; dart pub upgrade + - id: scratch_space_pub_upgrade + name: scratch_space; dart pub upgrade if: "always() && steps.checkout.conclusion == 'success'" - working-directory: build_test + working-directory: scratch_space run: dart pub upgrade - - name: "build_test; dart test --test-randomize-ordering-seed=random" - if: "always() && steps.build_test_pub_upgrade.conclusion == 'success'" - working-directory: build_test + - name: "scratch_space; dart test --test-randomize-ordering-seed=random" + if: "always() && steps.scratch_space_pub_upgrade.conclusion == 'success'" + working-directory: scratch_space run: "dart test --test-randomize-ordering-seed=random" needs: - job_001 @@ -1105,23 +1194,23 @@ jobs: - job_007 - job_008 - job_009 - job_028: - name: "unit_test; windows; Dart 2.14.0; PKG: scratch_space; `dart test --test-randomize-ordering-seed=random`" + job_030: + name: "unit_test; windows; Dart 2.17.0; PKG: build_resolvers; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: - uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d with: - sdk: "2.14.0" + sdk: "2.17.0" - id: checkout uses: actions/checkout@d0651293c4a5a52e711f25b41b05b2212f385d28 - - id: scratch_space_pub_upgrade - name: scratch_space; dart pub upgrade + - id: build_resolvers_pub_upgrade + name: build_resolvers; dart pub upgrade if: "always() && steps.checkout.conclusion == 'success'" - working-directory: scratch_space + working-directory: build_resolvers run: dart pub upgrade - - name: "scratch_space; dart test --test-randomize-ordering-seed=random" - if: "always() && steps.scratch_space_pub_upgrade.conclusion == 'success'" - working-directory: scratch_space + - name: "build_resolvers; dart test --test-randomize-ordering-seed=random" + if: "always() && steps.build_resolvers_pub_upgrade.conclusion == 'success'" + working-directory: build_resolvers run: "dart test --test-randomize-ordering-seed=random" needs: - job_001 @@ -1133,8 +1222,8 @@ jobs: - job_007 - job_008 - job_009 - job_029: - name: "unit_test; windows; Dart 2.17.0; PKG: build_resolvers; `dart test --test-randomize-ordering-seed=random`" + job_031: + name: "unit_test; windows; Dart 2.17.0; PKG: build_runner_core; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: - uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d @@ -1142,14 +1231,14 @@ jobs: sdk: "2.17.0" - id: checkout uses: actions/checkout@d0651293c4a5a52e711f25b41b05b2212f385d28 - - id: build_resolvers_pub_upgrade - name: build_resolvers; dart pub upgrade + - id: build_runner_core_pub_upgrade + name: build_runner_core; dart pub upgrade if: "always() && steps.checkout.conclusion == 'success'" - working-directory: build_resolvers + working-directory: build_runner_core run: dart pub upgrade - - name: "build_resolvers; dart test --test-randomize-ordering-seed=random" - if: "always() && steps.build_resolvers_pub_upgrade.conclusion == 'success'" - working-directory: build_resolvers + - name: "build_runner_core; dart test --test-randomize-ordering-seed=random" + if: "always() && steps.build_runner_core_pub_upgrade.conclusion == 'success'" + working-directory: build_runner_core run: "dart test --test-randomize-ordering-seed=random" needs: - job_001 @@ -1161,7 +1250,63 @@ jobs: - job_007 - job_008 - job_009 - job_030: + job_032: + name: "unit_test; windows; Dart 2.17.0; PKG: build_test; `dart test --test-randomize-ordering-seed=random`" + runs-on: windows-latest + steps: + - uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d + with: + sdk: "2.17.0" + - id: checkout + uses: actions/checkout@d0651293c4a5a52e711f25b41b05b2212f385d28 + - id: build_test_pub_upgrade + name: build_test; dart pub upgrade + if: "always() && steps.checkout.conclusion == 'success'" + working-directory: build_test + run: dart pub upgrade + - name: "build_test; dart test --test-randomize-ordering-seed=random" + if: "always() && steps.build_test_pub_upgrade.conclusion == 'success'" + working-directory: build_test + run: "dart test --test-randomize-ordering-seed=random" + needs: + - job_001 + - job_002 + - job_003 + - job_004 + - job_005 + - job_006 + - job_007 + - job_008 + - job_009 + job_033: + name: "unit_test; windows; Dart 2.17.0; PKG: build_vm_compilers; `dart test`" + runs-on: windows-latest + steps: + - uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d + with: + sdk: "2.17.0" + - id: checkout + uses: actions/checkout@d0651293c4a5a52e711f25b41b05b2212f385d28 + - id: build_vm_compilers_pub_upgrade + name: build_vm_compilers; dart pub upgrade + if: "always() && steps.checkout.conclusion == 'success'" + working-directory: build_vm_compilers + run: dart pub upgrade + - name: build_vm_compilers; dart test + if: "always() && steps.build_vm_compilers_pub_upgrade.conclusion == 'success'" + working-directory: build_vm_compilers + run: dart test + needs: + - job_001 + - job_002 + - job_003 + - job_004 + - job_005 + - job_006 + - job_007 + - job_008 + - job_009 + job_034: name: "unit_test; windows; Dart dev; PKG: _test; `dart run build_runner test -- -p chrome --test-randomize-ordering-seed=random`, `dart run build_runner test -- -p vm test/configurable_uri_test.dart --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: @@ -1193,7 +1338,7 @@ jobs: - job_007 - job_008 - job_009 - job_031: + job_035: name: "unit_test; windows; Dart dev; PKG: build; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: @@ -1221,7 +1366,7 @@ jobs: - job_007 - job_008 - job_009 - job_032: + job_036: name: "unit_test; windows; Dart dev; PKG: build_config; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: @@ -1249,7 +1394,7 @@ jobs: - job_007 - job_008 - job_009 - job_033: + job_037: name: "unit_test; windows; Dart dev; PKG: build_daemon; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: @@ -1277,7 +1422,7 @@ jobs: - job_007 - job_008 - job_009 - job_034: + job_038: name: "unit_test; windows; Dart dev; PKG: build_resolvers; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: @@ -1305,7 +1450,7 @@ jobs: - job_007 - job_008 - job_009 - job_035: + job_039: name: "unit_test; windows; Dart dev; PKG: build_runner_core; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: @@ -1333,7 +1478,7 @@ jobs: - job_007 - job_008 - job_009 - job_036: + job_040: name: "unit_test; windows; Dart dev; PKG: build_test; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: @@ -1361,7 +1506,7 @@ jobs: - job_007 - job_008 - job_009 - job_037: + job_041: name: "unit_test; windows; Dart dev; PKG: build_web_compilers; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: @@ -1389,7 +1534,7 @@ jobs: - job_007 - job_008 - job_009 - job_038: + job_042: name: "unit_test; windows; Dart dev; PKG: scratch_space; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: @@ -1417,7 +1562,7 @@ jobs: - job_007 - job_008 - job_009 - job_039: + job_043: name: "unit_test; windows; Dart dev; PKG: build_modules; `dart test -P presubmit --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: @@ -1445,7 +1590,7 @@ jobs: - job_007 - job_008 - job_009 - job_040: + job_044: name: "unit_test; windows; Dart dev; PKG: build_vm_compilers; `dart test`" runs-on: windows-latest steps: @@ -1473,7 +1618,7 @@ jobs: - job_007 - job_008 - job_009 - job_041: + job_045: name: "e2e_test; linux; Dart dev; PKG: _test; `dart test --total-shards 3 --shard-index 0 --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: @@ -1542,7 +1687,11 @@ jobs: - job_038 - job_039 - job_040 - job_042: + - job_041 + - job_042 + - job_043 + - job_044 + job_046: name: "e2e_test; linux; Dart dev; PKG: _test; `dart test --total-shards 3 --shard-index 1 --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: @@ -1611,7 +1760,11 @@ jobs: - job_038 - job_039 - job_040 - job_043: + - job_041 + - job_042 + - job_043 + - job_044 + job_047: name: "e2e_test; linux; Dart dev; PKG: _test; `dart test --total-shards 3 --shard-index 2 --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: @@ -1680,7 +1833,11 @@ jobs: - job_038 - job_039 - job_040 - job_044: + - job_041 + - job_042 + - job_043 + - job_044 + job_048: name: "e2e_test; linux; Dart dev; PKG: _test_null_safety; `dart run build_runner test -- -p chrome,vm --test-randomize-ordering-seed=random`, `dart run build_runner test --define=\"build_web_compilers:entrypoint=compiler=dart2js\" -- -p chrome --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: @@ -1753,7 +1910,11 @@ jobs: - job_038 - job_039 - job_040 - job_045: + - job_041 + - job_042 + - job_043 + - job_044 + job_049: name: "e2e_test; linux; Dart dev; PKG: build_runner; `dart test -t integration --total-shards 5 --shard-index 0 --test-randomize-ordering-seed=random --no-chain-stack-traces`" runs-on: ubuntu-latest steps: @@ -1822,7 +1983,11 @@ jobs: - job_038 - job_039 - job_040 - job_046: + - job_041 + - job_042 + - job_043 + - job_044 + job_050: name: "e2e_test; linux; Dart dev; PKG: build_runner; `dart test -t integration --total-shards 5 --shard-index 1 --test-randomize-ordering-seed=random --no-chain-stack-traces`" runs-on: ubuntu-latest steps: @@ -1891,7 +2056,11 @@ jobs: - job_038 - job_039 - job_040 - job_047: + - job_041 + - job_042 + - job_043 + - job_044 + job_051: name: "e2e_test; linux; Dart dev; PKG: build_runner; `dart test -t integration --total-shards 5 --shard-index 2 --test-randomize-ordering-seed=random --no-chain-stack-traces`" runs-on: ubuntu-latest steps: @@ -1960,7 +2129,11 @@ jobs: - job_038 - job_039 - job_040 - job_048: + - job_041 + - job_042 + - job_043 + - job_044 + job_052: name: "e2e_test; linux; Dart dev; PKG: build_runner; `dart test -t integration --total-shards 5 --shard-index 3 --test-randomize-ordering-seed=random --no-chain-stack-traces`" runs-on: ubuntu-latest steps: @@ -2029,7 +2202,11 @@ jobs: - job_038 - job_039 - job_040 - job_049: + - job_041 + - job_042 + - job_043 + - job_044 + job_053: name: "e2e_test; linux; Dart dev; PKG: build_runner; `dart test -t integration --total-shards 5 --shard-index 4 --test-randomize-ordering-seed=random --no-chain-stack-traces`" runs-on: ubuntu-latest steps: @@ -2098,7 +2275,11 @@ jobs: - job_038 - job_039 - job_040 - job_050: + - job_041 + - job_042 + - job_043 + - job_044 + job_054: name: "e2e_test; windows; Dart dev; PKG: _test; `dart test --total-shards 3 --shard-index 0 --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: @@ -2157,7 +2338,11 @@ jobs: - job_038 - job_039 - job_040 - job_051: + - job_041 + - job_042 + - job_043 + - job_044 + job_055: name: "e2e_test; windows; Dart dev; PKG: _test; `dart test --total-shards 3 --shard-index 1 --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: @@ -2216,7 +2401,11 @@ jobs: - job_038 - job_039 - job_040 - job_052: + - job_041 + - job_042 + - job_043 + - job_044 + job_056: name: "e2e_test; windows; Dart dev; PKG: _test; `dart test --total-shards 3 --shard-index 2 --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: @@ -2275,7 +2464,11 @@ jobs: - job_038 - job_039 - job_040 - job_053: + - job_041 + - job_042 + - job_043 + - job_044 + job_057: name: "e2e_test; windows; Dart dev; PKG: _test_null_safety; `dart run build_runner test -- -p chrome,vm --test-randomize-ordering-seed=random`, `dart run build_runner test --define=\"build_web_compilers:entrypoint=compiler=dart2js\" -- -p chrome --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: @@ -2338,7 +2531,11 @@ jobs: - job_038 - job_039 - job_040 - job_054: + - job_041 + - job_042 + - job_043 + - job_044 + job_058: name: "e2e_test_cron; linux; Dart main; PKG: _test; `dart test`" runs-on: ubuntu-latest steps: @@ -2421,7 +2618,11 @@ jobs: - job_051 - job_052 - job_053 - job_055: + - job_054 + - job_055 + - job_056 + - job_057 + job_059: name: "e2e_test_cron; linux; Dart main; PKG: _test_null_safety; `dart run build_runner test -- -p chrome,vm --test-randomize-ordering-seed=random`, `dart run build_runner test --define=\"build_web_compilers:entrypoint=compiler=dart2js\" -- -p chrome --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: @@ -2508,7 +2709,11 @@ jobs: - job_051 - job_052 - job_053 - job_056: + - job_054 + - job_055 + - job_056 + - job_057 + job_060: name: "e2e_test_cron; windows; Dart main; PKG: _test; `dart test`" runs-on: windows-latest steps: @@ -2581,7 +2786,11 @@ jobs: - job_051 - job_052 - job_053 - job_057: + - job_054 + - job_055 + - job_056 + - job_057 + job_061: name: "e2e_test_cron; windows; Dart main; PKG: _test_null_safety; `dart run build_runner test -- -p chrome,vm --test-randomize-ordering-seed=random`, `dart run build_runner test --define=\"build_web_compilers:entrypoint=compiler=dart2js\" -- -p chrome --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: @@ -2658,7 +2867,11 @@ jobs: - job_051 - job_052 - job_053 - job_058: + - job_054 + - job_055 + - job_056 + - job_057 + job_062: name: Notify failure runs-on: ubuntu-latest if: "(github.event_name == 'push' || github.event_name == 'schedule') && failure()" @@ -2727,3 +2940,7 @@ jobs: - job_055 - job_056 - job_057 + - job_058 + - job_059 + - job_060 + - job_061 diff --git a/build_modules/CHANGELOG.md b/build_modules/CHANGELOG.md index 222abdf44..e6a87492c 100644 --- a/build_modules/CHANGELOG.md +++ b/build_modules/CHANGELOG.md @@ -1,3 +1,5 @@ +## 4.0.6-dev + ## 4.0.5 * Allow analyzer verion 4.x. diff --git a/build_modules/lib/src/module_library.dart b/build_modules/lib/src/module_library.dart index 7e6ddef63..a185c7ef9 100644 --- a/build_modules/lib/src/module_library.dart +++ b/build_modules/lib/src/module_library.dart @@ -238,6 +238,6 @@ bool _isPart(CompilationUnit dart) => // but has a part that does, or it exports a `main` from another library. bool _hasMainMethod(CompilationUnit dart) => dart.declarations.any((node) => node is FunctionDeclaration && - node.name.name == 'main' && + node.name2.lexeme == 'main' && node.functionExpression.parameters != null && node.functionExpression.parameters!.parameters.length <= 2); diff --git a/build_modules/pubspec.yaml b/build_modules/pubspec.yaml index a41ba4883..f9c2ed45b 100644 --- a/build_modules/pubspec.yaml +++ b/build_modules/pubspec.yaml @@ -1,5 +1,5 @@ name: build_modules -version: 4.0.5 +version: 4.0.6-dev description: Builders for Dart modules repository: https://github.com/dart-lang/build/tree/master/build_modules @@ -7,7 +7,7 @@ environment: sdk: ">=2.14.0 <3.0.0" dependencies: - analyzer: ">=3.4.1 <5.0.0" + analyzer: ^4.4.0 async: ^2.5.0 bazel_worker: ^1.0.0 build: ^2.0.0 diff --git a/build_resolvers/pubspec.yaml b/build_resolvers/pubspec.yaml index 0e388a912..c587e0f5f 100644 --- a/build_resolvers/pubspec.yaml +++ b/build_resolvers/pubspec.yaml @@ -7,7 +7,7 @@ environment: sdk: ">=2.17.0 <3.0.0" dependencies: - analyzer: ">=4.3.0 <5.0.0" + analyzer: ^4.6.0 async: ^2.5.0 build: ^2.0.0 crypto: ^3.0.0 diff --git a/build_resolvers/test/resolver_test.dart b/build_resolvers/test/resolver_test.dart index 1f5510c06..a358ca13e 100644 --- a/build_resolvers/test/resolver_test.dart +++ b/build_resolvers/test/resolver_test.dart @@ -46,7 +46,7 @@ void main() { var lib = await resolver.libraryFor(entryPoint); expect(lib.importedLibraries.length, 2); var libA = lib.importedLibraries.where((l) => l.name == 'a').single; - expect(libA.getType('Foo'), isNull); + expect(libA.getClass('Foo'), isNull); }, resolvers: AnalyzerResolvers()); }); @@ -64,7 +64,7 @@ void main() { var lib = await resolver.libraryFor(entryPoint); expect(lib.importedLibraries.length, 2); var libB = lib.importedLibraries.where((l) => l.name == 'b').single; - expect(libB.getType('Foo'), isNull); + expect(libB.getClass('Foo'), isNull); }, resolvers: AnalyzerResolvers()); }); @@ -253,7 +253,7 @@ void main() { ''', }, (resolver) async { var lib = await resolver.libraryFor(entryPoint); - var clazz = lib.getType('A'); + var clazz = lib.getClass('A'); expect(clazz, isNotNull); expect(clazz!.interfaces, isEmpty); }, resolvers: resolvers); @@ -270,7 +270,7 @@ void main() { ''', }, (resolver) async { var lib = await resolver.libraryFor(entryPoint); - var clazz = lib.getType('A'); + var clazz = lib.getClass('A'); expect(clazz, isNotNull); expect(clazz!.interfaces, hasLength(1)); expect(clazz.interfaces.first.getDisplayString(withNullability: false), @@ -354,7 +354,7 @@ void main() { class Bar {}''', }, (resolver) async { var main = (await resolver.findLibraryByName('web.main'))!; - var meta = main.getType('Foo')!.supertype!.element.metadata[0]; + var meta = main.getClass('Foo')!.supertype!.element2.metadata[0]; expect(meta, isNotNull); expect(meta.computeConstantValue()?.toIntValue(), 0); }, resolvers: AnalyzerResolvers()); @@ -392,7 +392,7 @@ void main() { }, (resolver) async { var entry = await resolver.libraryFor(AssetId('a', 'lib/a.dart')); var classDefinition = entry.importedLibraries - .map((l) => l.getType('SomeClass')) + .map((l) => l.getClass('SomeClass')) .singleWhere((c) => c != null)!; expect(await resolver.assetIdForElement(classDefinition), AssetId('a', 'lib/b.dart')); @@ -631,18 +631,18 @@ int? get x => 1; } ''', }, (resolver) async { var entry = await resolver.libraryFor(AssetId('a', 'lib/a.dart')); - var classDefinition = entry.getType('MyClass')!; + var classDefinition = entry.getClass('MyClass')!; var color = classDefinition.getField('color')!; if (isFlutter) { - expect(color.type.element!.name, equals('Color')); - expect(color.type.element!.library!.name, equals('dart.ui')); + expect(color.type.element2!.name, equals('Color')); + expect(color.type.element2!.library!.name, equals('dart.ui')); expect( - color.type.element!.library!.definingCompilationUnit.source.uri + color.type.element2!.library!.definingCompilationUnit.source.uri .toString(), equals('dart:ui')); } else { - expect(color.type.element!.name, equals('dynamic')); + expect(color.type.element2!.name, equals('dynamic')); } }, resolvers: AnalyzerResolvers()); }); @@ -733,7 +733,7 @@ int? get x => 1; expect( unit.declarations.first, isA() - .having((d) => d.name.name, 'main', 'main')); + .having((d) => d.name2.lexeme, 'main', 'main')); }, resolvers: AnalyzerResolvers()); }); }); @@ -747,7 +747,7 @@ int? get x => 1; var unit = await resolver.astNodeFor(lib.topLevelElements.first); expect(unit, isA()); expect(unit!.toSource(), 'main() {}'); - expect((unit as FunctionDeclaration).declaredElement, isNull); + expect((unit as FunctionDeclaration).declaredElement2, isNull); }, resolvers: AnalyzerResolvers()); }); @@ -762,7 +762,8 @@ int? get x => 1; unit, isA() .having((fd) => fd.toSource(), 'toSource()', 'main() {}') - .having((fd) => fd.declaredElement, 'declaredElement', isNotNull), + .having( + (fd) => fd.declaredElement2, 'declaredElement', isNotNull), ); }, resolvers: AnalyzerResolvers()); }); diff --git a/build_runner_core/lib/src/generate/input_matcher.dart b/build_runner_core/lib/src/generate/input_matcher.dart index 1235f771d..83e6c4155 100644 --- a/build_runner_core/lib/src/generate/input_matcher.dart +++ b/build_runner_core/lib/src/generate/input_matcher.dart @@ -21,8 +21,8 @@ class InputMatcher { InputMatcher(InputSet inputSet, {List? defaultInclude}) : includeGlobs = - (inputSet.include ?? defaultInclude)?.map((p) => Glob(p)).toList(), - excludeGlobs = inputSet.exclude?.map((p) => Glob(p)).toList(); + (inputSet.include ?? defaultInclude)?.map(Glob.new).toList(), + excludeGlobs = inputSet.exclude?.map(Glob.new).toList(); /// Whether [input] is included in this set of assets. bool matches(AssetId input) => includes(input) && !excludes(input); diff --git a/build_runner_core/mono_pkg.yaml b/build_runner_core/mono_pkg.yaml index 76f32fc75..262d70ddb 100644 --- a/build_runner_core/mono_pkg.yaml +++ b/build_runner_core/mono_pkg.yaml @@ -1,4 +1,5 @@ sdk: +- 2.17.0 - dev stages: diff --git a/build_runner_core/pubspec.yaml b/build_runner_core/pubspec.yaml index 039853570..57f63f136 100644 --- a/build_runner_core/pubspec.yaml +++ b/build_runner_core/pubspec.yaml @@ -4,7 +4,7 @@ description: Core tools to write binaries that run builders. repository: https://github.com/dart-lang/build/tree/master/build_runner_core environment: - sdk: ">=2.14.0 <3.0.0" + sdk: ">=2.17.0 <3.0.0" dependencies: async: ^2.5.0 @@ -27,7 +27,7 @@ dependencies: yaml: ^3.0.0 dev_dependencies: - analyzer: ">=2.0.0 <5.0.0" + analyzer: ^4.6.0 build_runner: ^2.0.0 build_test: ^2.0.0 lints: '>=1.0.0 <3.0.0' diff --git a/build_runner_core/test/generate/resolution_test.dart b/build_runner_core/test/generate/resolution_test.dart index a2591c0d6..fc02e4d07 100644 --- a/build_runner_core/test/generate/resolution_test.dart +++ b/build_runner_core/test/generate/resolution_test.dart @@ -49,7 +49,7 @@ class ListClassesAndHierarchyBuilder implements Builder { for (final type in types) { output ..write('${type.name}: [') - ..writeAll(type.allSupertypes.map((t) => t.element.name), ', ') + ..writeAll(type.allSupertypes.map((t) => t.element2.name), ', ') ..writeln(']'); } await buildStep.writeAsString(outputId, output.toString()); diff --git a/build_runner_core/test/package_graph/apply_builders_test.dart b/build_runner_core/test/package_graph/apply_builders_test.dart index 692c7bc56..6d38ad7cd 100644 --- a/build_runner_core/test/package_graph/apply_builders_test.dart +++ b/build_runner_core/test/package_graph/apply_builders_test.dart @@ -22,8 +22,7 @@ void main() { var targetGraph = await TargetGraph.forPackageGraph(packageGraph, defaultRootPackageSources: const ['**']); var builderApplications = [ - apply('b:cool_builder', [(options) => CoolBuilder(options)], - toAllPackages()) + apply('b:cool_builder', [CoolBuilder.new], toAllPackages()) ]; var phases = await createBuildPhases( targetGraph, @@ -63,8 +62,7 @@ void main() { var targetGraph = await TargetGraph.forPackageGraph(packageGraph, defaultRootPackageSources: ['**'], overrideBuildConfig: overrides); var builderApplications = [ - apply('b:cool_builder', [(options) => CoolBuilder(options)], - toAllPackages()) + apply('b:cool_builder', [CoolBuilder.new], toAllPackages()) ]; var phases = await createBuildPhases( targetGraph, @@ -91,8 +89,7 @@ void main() { var targetGraph = await TargetGraph.forPackageGraph(packageGraph, defaultRootPackageSources: ['**']); var builderApplications = [ - apply('b:cool_builder', [(options) => CoolBuilder(options)], - toDependentsOf('b')), + apply('b:cool_builder', [CoolBuilder.new], toDependentsOf('b')), ]; var phases = await createBuildPhases(targetGraph, builderApplications, {}, false); @@ -108,8 +105,7 @@ void main() { var targetGraph = await TargetGraph.forPackageGraph(packageGraph, defaultRootPackageSources: ['**']); var builderApplications = [ - apply('b:cool_builder', [(options) => CoolBuilder(options)], - toDependentsOf('b'), + apply('b:cool_builder', [CoolBuilder.new], toDependentsOf('b'), appliesBuilders: ['b:not_by_default']), apply('b:not_by_default', [(_) => TestBuilder()], toNoneByDefault()), ]; @@ -131,8 +127,7 @@ void main() { var targetGraph = await TargetGraph.forPackageGraph(packageGraph, defaultRootPackageSources: ['**']); var builderApplications = [ - apply('c:cool_builder', [(options) => CoolBuilder(options)], - toDependentsOf('c'), + apply('c:cool_builder', [CoolBuilder.new], toDependentsOf('c'), hideOutput: false), ]; var phases = @@ -154,8 +149,7 @@ void main() { var targetGraph = await TargetGraph.forPackageGraph(packageGraph, defaultRootPackageSources: ['**']); var builderApplications = [ - apply('c:cool_builder', [(options) => CoolBuilder(options)], - toDependentsOf('c'), + apply('c:cool_builder', [CoolBuilder.new], toDependentsOf('c'), appliesBuilders: ['c:not_by_default']), apply('c:not_by_default', [(_) => TestBuilder()], toNoneByDefault(), hideOutput: false), @@ -186,8 +180,7 @@ void main() { var targetGraph = await TargetGraph.forPackageGraph(packageGraph, defaultRootPackageSources: ['**'], overrideBuildConfig: overrides); var builderApplications = [ - apply('b:cool_builder', [(options) => CoolBuilder(options)], - toAllPackages()), + apply('b:cool_builder', [CoolBuilder.new], toAllPackages()), ]; expect( () => @@ -218,11 +211,9 @@ void main() { 'a', []); var builderApplications = [ - apply('b:cool_builder', [(options) => CoolBuilder(options)], - toDependentsOf('b'), + apply('b:cool_builder', [CoolBuilder.new], toDependentsOf('b'), appliesBuilders: ['b:cool_builder_2']), - apply('b:cool_builder_2', [(options) => CoolBuilder(options)], - toDependentsOf('b')), + apply('b:cool_builder_2', [CoolBuilder.new], toDependentsOf('b')), ]; return await createBuildPhases( targetGraph, builderApplications, {}, false); diff --git a/build_test/mono_pkg.yaml b/build_test/mono_pkg.yaml index 6c42fd66d..631e570de 100644 --- a/build_test/mono_pkg.yaml +++ b/build_test/mono_pkg.yaml @@ -1,5 +1,5 @@ sdk: -- 2.14.0 +- 2.17.0 - dev stages: diff --git a/build_test/pubspec.yaml b/build_test/pubspec.yaml index d3b0ebac7..b112ac5d2 100644 --- a/build_test/pubspec.yaml +++ b/build_test/pubspec.yaml @@ -4,7 +4,7 @@ version: 2.1.6-dev repository: https://github.com/dart-lang/build/tree/master/build_test environment: - sdk: ">=2.14.0 <3.0.0" + sdk: ">=2.17.0 <3.0.0" dependencies: async: ^2.5.0 @@ -24,6 +24,6 @@ dependencies: watcher: ^1.0.0 dev_dependencies: - analyzer: ">=2.1.0 <5.0.0" + analyzer: ^4.6.0 collection: ^1.15.0 lints: '>=1.0.0 <3.0.0' diff --git a/build_test/test/resolve_source_test.dart b/build_test/test/resolve_source_test.dart index 64d093755..65027775e 100644 --- a/build_test/test/resolve_source_test.dart +++ b/build_test/test/resolve_source_test.dart @@ -20,7 +20,7 @@ void main() { class Foo {} ''', (resolver) => resolver.findLibraryNotNull('example')); - expect(libExample.getType('Foo'), isNotNull); + expect(libExample.getClass('Foo'), isNotNull); }); test('a simple dart file with dart: dependencies', () async { @@ -31,7 +31,7 @@ void main() { abstract class Foo implements LinkedHashMap {} ''', (resolver) => resolver.findLibraryNotNull('example')); - var classFoo = libExample.getType('Foo')!; + var classFoo = libExample.getClass('Foo')!; expect( classFoo.allSupertypes.map(_toStringId), contains('dart:collection#LinkedHashMap'), @@ -46,7 +46,7 @@ void main() { abstract class Foo implements Equality {} ''', (resolver) => resolver.findLibraryNotNull('example')); - var classFoo = libExample.getType('Foo')!; + var classFoo = libExample.getClass('Foo')!; expect( classFoo.allSupertypes.map(_toStringId), contains(endsWith(':collection#Equality')), @@ -72,9 +72,9 @@ void main() { (resolver) => resolver.findLibraryNotNull('example'), resolverFor: mock, ); - final type = library.getType('ExamplePrime'); + final type = library.getClass('ExamplePrime'); expect(type, isNotNull); - expect(type!.supertype!.element.name, 'Example'); + expect(type!.supertype!.element2.name, 'Example'); }); test('waits for tearDown', () async { @@ -91,7 +91,7 @@ void main() { true); var libExample = await resolver.findLibraryNotNull('example'); resolverDone.complete(); - var classFoo = libExample.getType('Foo')!; + var classFoo = libExample.getClass('Foo')!; expect( classFoo.allSupertypes.map(_toStringId), contains(endsWith(':collection#Equality')), @@ -107,7 +107,7 @@ void main() { abstract class Foo implements Equality {} ''', (resolver) async { var libExample = await resolver.findLibraryNotNull('example'); - var classFoo = libExample.getType('Foo')!; + var classFoo = libExample.getClass('Foo')!; expect(classFoo.allSupertypes.map(_toStringId), contains(endsWith(':collection#Equality'))); }); @@ -140,7 +140,7 @@ void main() { var asset = AssetId('build_test', 'test/_files/example_lib.dart'); var libExample = await resolveAsset( asset, (resolver) => resolver.findLibraryNotNull('example_lib')); - expect(libExample.getType('Example'), isNotNull); + expect(libExample.getClass('Example'), isNotNull); }); }); @@ -158,7 +158,7 @@ void main() { } String _toStringId(InterfaceType t) => - '${t.element.source.uri.toString().split('/').first}#${t.element.name}'; + '${t.element2.source.uri.toString().split('/').first}#${t.element2.name}'; extension on Resolver { Future findLibraryNotNull(String name) async { diff --git a/build_vm_compilers/lib/src/vm_entrypoint_builder.dart b/build_vm_compilers/lib/src/vm_entrypoint_builder.dart index 6e29d64ff..65d201fb5 100644 --- a/build_vm_compilers/lib/src/vm_entrypoint_builder.dart +++ b/build_vm_compilers/lib/src/vm_entrypoint_builder.dart @@ -94,7 +94,7 @@ Future _isAppEntryPoint(AssetId dartId, AssetReader reader) async { // but has a part that does, or it exports a `main` from another library. return parsed.declarations.any((node) { return node is FunctionDeclaration && - node.name.name == 'main' && + node.name2.lexeme == 'main' && node.functionExpression.parameters != null && node.functionExpression.parameters!.parameters.length <= 2; }); diff --git a/build_vm_compilers/mono_pkg.yaml b/build_vm_compilers/mono_pkg.yaml index 4a0253882..fc0b4d960 100644 --- a/build_vm_compilers/mono_pkg.yaml +++ b/build_vm_compilers/mono_pkg.yaml @@ -1,4 +1,5 @@ sdk: +- 2.17.0 - dev stages: diff --git a/build_vm_compilers/pubspec.yaml b/build_vm_compilers/pubspec.yaml index 3967f7cb2..b1913c559 100644 --- a/build_vm_compilers/pubspec.yaml +++ b/build_vm_compilers/pubspec.yaml @@ -4,10 +4,10 @@ description: Builder implementations wrapping Dart VM compilers. repository: https://github.com/dart-lang/build/tree/master/build_vm_compilers environment: - sdk: ">=2.12.0 <3.0.0" + sdk: ">=2.17.0 <3.0.0" dependencies: - analyzer: ">=1.0.0 <5.0.0" + analyzer: ^4.4.0 build: ^2.0.0 build_config: ^1.0.0 build_modules: ^4.0.0 diff --git a/build_web_compilers/CHANGELOG.md b/build_web_compilers/CHANGELOG.md index 2b22c21ad..7c1de74cb 100644 --- a/build_web_compilers/CHANGELOG.md +++ b/build_web_compilers/CHANGELOG.md @@ -1,3 +1,5 @@ +## 3.2.6-dev + ## 3.2.5 - Use a standalone process to compile the ddc sdk.js file. diff --git a/build_web_compilers/lib/src/web_entrypoint_builder.dart b/build_web_compilers/lib/src/web_entrypoint_builder.dart index 690bded7b..e72e08ea6 100644 --- a/build_web_compilers/lib/src/web_entrypoint_builder.dart +++ b/build_web_compilers/lib/src/web_entrypoint_builder.dart @@ -181,7 +181,7 @@ Future _isAppEntryPoint(AssetId dartId, AssetReader reader) async { // but has a part that does, or it exports a `main` from another library. return parsed.declarations.any((node) { return node is FunctionDeclaration && - node.name.name == 'main' && + node.name2.lexeme == 'main' && node.functionExpression.parameters != null && node.functionExpression.parameters!.parameters.length <= 2; }); diff --git a/build_web_compilers/pubspec.yaml b/build_web_compilers/pubspec.yaml index 356716ac5..90bc0057d 100644 --- a/build_web_compilers/pubspec.yaml +++ b/build_web_compilers/pubspec.yaml @@ -1,5 +1,5 @@ name: build_web_compilers -version: 3.2.5 +version: 3.2.6-dev description: Builder implementations wrapping Dart compilers. repository: https://github.com/dart-lang/build/tree/master/build_web_compilers @@ -7,7 +7,7 @@ environment: sdk: ">=2.17.0 <3.0.0" dependencies: - analyzer: ">=1.0.0 <5.0.0" + analyzer: ^4.4.0 archive: ^3.0.0 bazel_worker: ^1.0.0 build: ^2.0.0