From 05e9e8bf9f190decf67b6858c1d5dfe4e4f0205a Mon Sep 17 00:00:00 2001 From: Jake Macdonald Date: Mon, 25 Jul 2022 07:02:14 -0700 Subject: [PATCH 01/11] migrate off of library.parts --- build_runner_core/test/generate/resolution_test.dart | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/build_runner_core/test/generate/resolution_test.dart b/build_runner_core/test/generate/resolution_test.dart index 1cc5a70da..a2591c0d6 100644 --- a/build_runner_core/test/generate/resolution_test.dart +++ b/build_runner_core/test/generate/resolution_test.dart @@ -43,10 +43,7 @@ class ListClassesAndHierarchyBuilder implements Builder { } // Process both the main and part files of a given library. final library = await buildStep.inputLibrary; - final types = [ - library.definingCompilationUnit.classes, - library.parts.map((p) => p.classes).expand((t) => t), - ].expand((t) => t); + final types = library.units.expand((element) => element.classes); final output = StringBuffer(); final outputId = buildStep.inputId.changeExtension('.txt'); for (final type in types) { From 7e9d2bdc7a2d88a48edf24c6f595c507a548339b Mon Sep 17 00:00:00 2001 From: Jake Macdonald Date: Mon, 25 Jul 2022 07:22:30 -0700 Subject: [PATCH 02/11] allow the markdown linter step to fail --- .github/workflows/markdown_linter.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/markdown_linter.yml b/.github/workflows/markdown_linter.yml index 0b7d05976..3dcdf6265 100644 --- a/.github/workflows/markdown_linter.yml +++ b/.github/workflows/markdown_linter.yml @@ -13,3 +13,4 @@ jobs: steps: - uses: actions/checkout@master - uses: gaurav-nelson/github-action-markdown-link-check@1.0.13 + continue-on-error: true From 99e6d45fa9c105e3f20853a30b61617544ce14e7 Mon Sep 17 00:00:00 2001 From: Jake Macdonald Date: Mon, 25 Jul 2022 07:25:56 -0700 Subject: [PATCH 03/11] Revert "allow the markdown linter step to fail" This reverts commit 7e9d2bdc7a2d88a48edf24c6f595c507a548339b. --- .github/workflows/markdown_linter.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/markdown_linter.yml b/.github/workflows/markdown_linter.yml index 3dcdf6265..0b7d05976 100644 --- a/.github/workflows/markdown_linter.yml +++ b/.github/workflows/markdown_linter.yml @@ -13,4 +13,3 @@ jobs: steps: - uses: actions/checkout@master - uses: gaurav-nelson/github-action-markdown-link-check@1.0.13 - continue-on-error: true From 4e3abbd9869391b96694ff9c23f8f1222a589e53 Mon Sep 17 00:00:00 2001 From: Jake Macdonald Date: Mon, 25 Jul 2022 07:29:53 -0700 Subject: [PATCH 04/11] update build_resolvers as well --- build_resolvers/CHANGELOG.md | 4 ++++ build_resolvers/lib/src/resolver.dart | 2 +- build_resolvers/pubspec.yaml | 4 ++-- build_resolvers/test/resolver_test.dart | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/build_resolvers/CHANGELOG.md b/build_resolvers/CHANGELOG.md index 21761af19..ef25af7ef 100644 --- a/build_resolvers/CHANGELOG.md +++ b/build_resolvers/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.0.10-dev + +- Migrate from `LibraryElement#parts` to `LibraryElement#parts2`. + ## 2.0.9 - Fix a new case of `InconsistentAnalysisException` errors that can occur with diff --git a/build_resolvers/lib/src/resolver.dart b/build_resolvers/lib/src/resolver.dart index f392ae7b6..466505654 100644 --- a/build_resolvers/lib/src/resolver.dart +++ b/build_resolvers/lib/src/resolver.dart @@ -256,7 +256,7 @@ class AnalyzerResolver implements ReleasableResolver { Future> _syntacticErrorsFor(LibraryElement element) async { final existingElements = [ element, - for (final part in element.parts) + for (final part in element.parts2) // The source may be null if the part doesn't exist. That's not // important for us since we only care about syntax if (part.source.exists()) part, diff --git a/build_resolvers/pubspec.yaml b/build_resolvers/pubspec.yaml index 4404c18e2..892a4fba9 100644 --- a/build_resolvers/pubspec.yaml +++ b/build_resolvers/pubspec.yaml @@ -1,5 +1,5 @@ name: build_resolvers -version: 2.0.9 +version: 2.0.10-dev description: Resolve Dart code in a Builder repository: https://github.com/dart-lang/build/tree/master/build_resolvers @@ -7,7 +7,7 @@ environment: sdk: ">=2.14.0 <3.0.0" dependencies: - analyzer: ">=3.4.1 <5.0.0" + analyzer: ">=4.3.0 <5.0.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 344457970..bc1d8580f 100644 --- a/build_resolvers/test/resolver_test.dart +++ b/build_resolvers/test/resolver_test.dart @@ -238,7 +238,7 @@ void main() { } ''', }, (resolver) async { var lib = await resolver.libraryFor(entryPoint); - expect(lib.imports.length, 2); + expect(lib.libraryImports.length, 2); // TODO(scheglov) Use `parts2` when it is available. //expect(lib.parts2, isEmpty); }, resolvers: AnalyzerResolvers()); From ff7564f5f4da5df597d44baa1df1e170aa14b20c Mon Sep 17 00:00:00 2001 From: Jake Macdonald Date: Mon, 25 Jul 2022 07:34:36 -0700 Subject: [PATCH 05/11] update min sdk for build_resolvers to match package:analyzer --- build_resolvers/CHANGELOG.md | 2 ++ build_resolvers/mono_pkg.yaml | 2 +- build_resolvers/pubspec.yaml | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build_resolvers/CHANGELOG.md b/build_resolvers/CHANGELOG.md index ef25af7ef..6b83cf26e 100644 --- a/build_resolvers/CHANGELOG.md +++ b/build_resolvers/CHANGELOG.md @@ -1,6 +1,8 @@ ## 2.0.10-dev - Migrate from `LibraryElement#parts` to `LibraryElement#parts2`. +- Update min sdk constraint to `2.15.0` since this is the minimum selectable + (and testable) sdk. ## 2.0.9 diff --git a/build_resolvers/mono_pkg.yaml b/build_resolvers/mono_pkg.yaml index da8441a65..a50b1cbc9 100644 --- a/build_resolvers/mono_pkg.yaml +++ b/build_resolvers/mono_pkg.yaml @@ -1,5 +1,5 @@ sdk: -- 2.14.0 +- 2.15.0 - dev stages: diff --git a/build_resolvers/pubspec.yaml b/build_resolvers/pubspec.yaml index 892a4fba9..ec2b5160e 100644 --- a/build_resolvers/pubspec.yaml +++ b/build_resolvers/pubspec.yaml @@ -4,7 +4,7 @@ description: Resolve Dart code in a Builder repository: https://github.com/dart-lang/build/tree/master/build_resolvers environment: - sdk: ">=2.14.0 <3.0.0" + sdk: ">=2.15.0 <3.0.0" dependencies: analyzer: ">=4.3.0 <5.0.0" From 7189a597b17a7334b3eec67450cd09bc58224901 Mon Sep 17 00:00:00 2001 From: Jake Macdonald Date: Mon, 25 Jul 2022 07:35:39 -0700 Subject: [PATCH 06/11] re-run mono_repo generate --- .github/workflows/dart.yml | 308 ++++++++++++++++++++++--------------- 1 file changed, 188 insertions(+), 120 deletions(-) diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index d42b4881f..21452bfd2 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_resolvers, 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: build_test, 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_resolvers-build_test-example-scratch_space;commands:format-analyze_0" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.14.0;packages:build_test-example-scratch_space;commands:format-analyze_0" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:2.14.0;packages:build_resolvers-build_test-example-scratch_space + 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 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_resolvers_pub_upgrade - name: build_resolvers; dart pub upgrade - if: "always() && steps.checkout.conclusion == 'success'" - working-directory: build_resolvers - run: dart pub upgrade - - name: "build_resolvers; dart format --output=none --set-exit-if-changed ." - if: "always() && steps.build_resolvers_pub_upgrade.conclusion == 'success'" - working-directory: build_resolvers - run: "dart format --output=none --set-exit-if-changed ." - - name: "build_resolvers; dart analyze --fatal-infos ." - 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'" @@ -137,6 +124,38 @@ jobs: working-directory: scratch_space run: dart analyze --fatal-infos . job_004: + name: "analyze_and_format; linux; Dart 2.15.0; PKG: build_resolvers; `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.15.0;packages:build_resolvers;commands:format-analyze_0" + restore-keys: | + os:ubuntu-latest;pub-cache-hosted;sdk:2.15.0;packages:build_resolvers + os:ubuntu-latest;pub-cache-hosted;sdk:2.15.0 + os:ubuntu-latest;pub-cache-hosted + os:ubuntu-latest + - uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d + with: + sdk: "2.15.0" + - id: checkout + uses: actions/checkout@d0651293c4a5a52e711f25b41b05b2212f385d28 + - id: build_resolvers_pub_upgrade + name: build_resolvers; dart pub upgrade + if: "always() && steps.checkout.conclusion == 'success'" + working-directory: build_resolvers + run: dart pub upgrade + - name: "build_resolvers; dart format --output=none --set-exit-if-changed ." + if: "always() && steps.build_resolvers_pub_upgrade.conclusion == 'success'" + working-directory: build_resolvers + run: "dart format --output=none --set-exit-if-changed ." + - name: "build_resolvers; dart analyze --fatal-infos ." + if: "always() && steps.build_resolvers_pub_upgrade.conclusion == 'success'" + working-directory: build_resolvers + 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 steps: @@ -182,7 +201,7 @@ jobs: if: "always() && steps.build_pub_upgrade.conclusion == 'success'" working-directory: build run: dart analyze --fatal-infos . - job_005: + job_006: name: "analyze_and_format; linux; Dart dev; PKG: _test_null_safety; `dart analyze --fatal-infos`" runs-on: ubuntu-latest steps: @@ -210,7 +229,7 @@ jobs: if: "always() && steps._test_null_safety_pub_upgrade.conclusion == 'success'" working-directory: _test_null_safety run: dart analyze --fatal-infos - job_006: + job_007: name: "analyze_and_format; linux; Dart dev; PKG: build; `dart format --output=none --set-exit-if-changed .`" runs-on: ubuntu-latest steps: @@ -238,7 +257,7 @@ jobs: if: "always() && steps.build_pub_upgrade.conclusion == 'success'" working-directory: build run: "dart format --output=none --set-exit-if-changed ." - job_007: + job_008: name: "analyze_and_format; linux; Dart dev; PKGS: build_config, build_daemon, build_modules, build_resolvers, build_runner, build_runner_core, build_test, build_vm_compilers, build_web_compilers, example, scratch_space; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos .`" runs-on: ubuntu-latest steps: @@ -400,7 +419,7 @@ jobs: if: "always() && steps.scratch_space_pub_upgrade.conclusion == 'success'" working-directory: scratch_space run: dart analyze --fatal-infos . - job_008: + job_009: name: "analyze_and_format; windows; Dart dev; PKG: _test_null_safety; `dart analyze --fatal-infos`" runs-on: windows-latest steps: @@ -418,7 +437,7 @@ jobs: if: "always() && steps._test_null_safety_pub_upgrade.conclusion == 'success'" working-directory: _test_null_safety run: dart analyze --fatal-infos - job_009: + job_010: name: "unit_test; linux; Dart 2.14.0; PKG: build; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: @@ -455,17 +474,18 @@ jobs: - job_006 - job_007 - job_008 - job_010: - name: "unit_test; linux; Dart 2.14.0; PKG: build_resolvers; `dart test --test-randomize-ordering-seed=random`" + - job_009 + job_011: + name: "unit_test; linux; Dart 2.14.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.14.0;packages:build_resolvers;commands:test_04" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.14.0;packages:build_test;commands:test_04" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:2.14.0;packages:build_resolvers + os:ubuntu-latest;pub-cache-hosted;sdk:2.14.0;packages:build_test os:ubuntu-latest;pub-cache-hosted;sdk:2.14.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest @@ -474,14 +494,14 @@ jobs: sdk: "2.14.0" - id: checkout uses: actions/checkout@d0651293c4a5a52e711f25b41b05b2212f385d28 - - id: build_resolvers_pub_upgrade - name: build_resolvers; dart pub upgrade + - id: build_test_pub_upgrade + name: build_test; dart pub upgrade if: "always() && steps.checkout.conclusion == 'success'" - working-directory: build_resolvers + working-directory: build_test 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_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 @@ -492,17 +512,18 @@ jobs: - job_006 - job_007 - job_008 - job_011: - name: "unit_test; linux; Dart 2.14.0; PKG: build_test; `dart test --test-randomize-ordering-seed=random`" + - job_009 + job_012: + 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 @@ -511,14 +532,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 @@ -529,33 +550,34 @@ jobs: - job_006 - job_007 - job_008 - job_012: - name: "unit_test; linux; Dart 2.14.0; PKG: scratch_space; `dart test --test-randomize-ordering-seed=random`" + - job_009 + job_013: + name: "unit_test; linux; Dart 2.15.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.15.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.15.0;packages:build_resolvers + os:ubuntu-latest;pub-cache-hosted;sdk:2.15.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d with: - sdk: "2.14.0" + sdk: "2.15.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 @@ -566,7 +588,8 @@ jobs: - job_006 - job_007 - job_008 - job_013: + - job_009 + job_014: 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: @@ -607,7 +630,8 @@ jobs: - job_006 - job_007 - job_008 - job_014: + - job_009 + job_015: name: "unit_test; linux; Dart dev; PKG: build; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: @@ -644,7 +668,8 @@ jobs: - job_006 - job_007 - job_008 - job_015: + - job_009 + job_016: name: "unit_test; linux; Dart dev; PKG: build_config; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: @@ -681,7 +706,8 @@ jobs: - job_006 - job_007 - job_008 - job_016: + - job_009 + job_017: name: "unit_test; linux; Dart dev; PKG: build_daemon; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: @@ -718,7 +744,8 @@ jobs: - job_006 - job_007 - job_008 - job_017: + - job_009 + job_018: name: "unit_test; linux; Dart dev; PKG: build_resolvers; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: @@ -755,7 +782,8 @@ jobs: - job_006 - job_007 - job_008 - job_018: + - job_009 + job_019: name: "unit_test; linux; Dart dev; PKG: build_runner_core; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: @@ -792,7 +820,8 @@ jobs: - job_006 - job_007 - job_008 - job_019: + - job_009 + job_020: name: "unit_test; linux; Dart dev; PKG: build_test; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: @@ -829,7 +858,8 @@ jobs: - job_006 - job_007 - job_008 - job_020: + - job_009 + job_021: name: "unit_test; linux; Dart dev; PKG: build_web_compilers; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: @@ -866,7 +896,8 @@ jobs: - job_006 - job_007 - job_008 - job_021: + - job_009 + job_022: name: "unit_test; linux; Dart dev; PKG: scratch_space; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: @@ -903,7 +934,8 @@ jobs: - job_006 - job_007 - job_008 - job_022: + - job_009 + job_023: name: "unit_test; linux; Dart dev; PKG: build_modules; `dart test -P presubmit --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: @@ -940,7 +972,8 @@ jobs: - job_006 - job_007 - job_008 - job_023: + - job_009 + job_024: name: "unit_test; linux; Dart dev; PKG: build_runner; `dart test -x integration --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: @@ -977,7 +1010,8 @@ jobs: - job_006 - job_007 - job_008 - job_024: + - job_009 + job_025: name: "unit_test; linux; Dart dev; PKG: build_vm_compilers; `dart test`" runs-on: ubuntu-latest steps: @@ -1014,7 +1048,8 @@ jobs: - job_006 - job_007 - job_008 - job_025: + - job_009 + job_026: name: "unit_test; windows; Dart 2.14.0; PKG: build; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: @@ -1041,8 +1076,9 @@ jobs: - job_006 - job_007 - job_008 - job_026: - name: "unit_test; windows; Dart 2.14.0; PKG: build_resolvers; `dart test --test-randomize-ordering-seed=random`" + - job_009 + job_027: + name: "unit_test; windows; Dart 2.14.0; PKG: build_test; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: - uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d @@ -1050,14 +1086,14 @@ jobs: sdk: "2.14.0" - id: checkout uses: actions/checkout@d0651293c4a5a52e711f25b41b05b2212f385d28 - - id: build_resolvers_pub_upgrade - name: build_resolvers; dart pub upgrade + - id: build_test_pub_upgrade + name: build_test; dart pub upgrade if: "always() && steps.checkout.conclusion == 'success'" - working-directory: build_resolvers + working-directory: build_test 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_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 @@ -1068,8 +1104,9 @@ jobs: - job_006 - job_007 - job_008 - job_027: - name: "unit_test; windows; Dart 2.14.0; PKG: build_test; `dart test --test-randomize-ordering-seed=random`" + - job_009 + job_028: + 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 @@ -1077,14 +1114,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 @@ -1095,23 +1132,24 @@ jobs: - job_006 - job_007 - job_008 - job_028: - name: "unit_test; windows; Dart 2.14.0; PKG: scratch_space; `dart test --test-randomize-ordering-seed=random`" + - job_009 + job_029: + name: "unit_test; windows; Dart 2.15.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.15.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 @@ -1122,7 +1160,8 @@ jobs: - job_006 - job_007 - job_008 - job_029: + - job_009 + job_030: 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: @@ -1153,7 +1192,8 @@ jobs: - job_006 - job_007 - job_008 - job_030: + - job_009 + job_031: name: "unit_test; windows; Dart dev; PKG: build; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: @@ -1180,7 +1220,8 @@ jobs: - job_006 - job_007 - job_008 - job_031: + - job_009 + job_032: name: "unit_test; windows; Dart dev; PKG: build_config; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: @@ -1207,7 +1248,8 @@ jobs: - job_006 - job_007 - job_008 - job_032: + - job_009 + job_033: name: "unit_test; windows; Dart dev; PKG: build_daemon; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: @@ -1234,7 +1276,8 @@ jobs: - job_006 - job_007 - job_008 - job_033: + - job_009 + job_034: name: "unit_test; windows; Dart dev; PKG: build_resolvers; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: @@ -1261,7 +1304,8 @@ jobs: - job_006 - job_007 - job_008 - job_034: + - job_009 + job_035: name: "unit_test; windows; Dart dev; PKG: build_runner_core; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: @@ -1288,7 +1332,8 @@ jobs: - job_006 - job_007 - job_008 - job_035: + - job_009 + job_036: name: "unit_test; windows; Dart dev; PKG: build_test; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: @@ -1315,7 +1360,8 @@ jobs: - job_006 - job_007 - job_008 - job_036: + - job_009 + job_037: name: "unit_test; windows; Dart dev; PKG: build_web_compilers; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: @@ -1342,7 +1388,8 @@ jobs: - job_006 - job_007 - job_008 - job_037: + - job_009 + job_038: name: "unit_test; windows; Dart dev; PKG: scratch_space; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: @@ -1369,7 +1416,8 @@ jobs: - job_006 - job_007 - job_008 - job_038: + - job_009 + job_039: name: "unit_test; windows; Dart dev; PKG: build_modules; `dart test -P presubmit --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: @@ -1396,7 +1444,8 @@ jobs: - job_006 - job_007 - job_008 - job_039: + - job_009 + job_040: name: "unit_test; windows; Dart dev; PKG: build_vm_compilers; `dart test`" runs-on: windows-latest steps: @@ -1423,7 +1472,8 @@ jobs: - job_006 - job_007 - job_008 - job_040: + - job_009 + job_041: 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: @@ -1491,7 +1541,8 @@ jobs: - job_037 - job_038 - job_039 - job_041: + - job_040 + job_042: 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: @@ -1559,7 +1610,8 @@ jobs: - job_037 - job_038 - job_039 - job_042: + - job_040 + job_043: 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: @@ -1627,7 +1679,8 @@ jobs: - job_037 - job_038 - job_039 - job_043: + - job_040 + job_044: 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: @@ -1699,7 +1752,8 @@ jobs: - job_037 - job_038 - job_039 - job_044: + - job_040 + job_045: 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: @@ -1767,7 +1821,8 @@ jobs: - job_037 - job_038 - job_039 - job_045: + - job_040 + job_046: 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: @@ -1835,7 +1890,8 @@ jobs: - job_037 - job_038 - job_039 - job_046: + - job_040 + job_047: 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: @@ -1903,7 +1959,8 @@ jobs: - job_037 - job_038 - job_039 - job_047: + - job_040 + job_048: 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: @@ -1971,7 +2028,8 @@ jobs: - job_037 - job_038 - job_039 - job_048: + - job_040 + job_049: 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: @@ -2039,7 +2097,8 @@ jobs: - job_037 - job_038 - job_039 - job_049: + - job_040 + job_050: 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: @@ -2097,7 +2156,8 @@ jobs: - job_037 - job_038 - job_039 - job_050: + - job_040 + job_051: 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: @@ -2155,7 +2215,8 @@ jobs: - job_037 - job_038 - job_039 - job_051: + - job_040 + job_052: 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: @@ -2213,7 +2274,8 @@ jobs: - job_037 - job_038 - job_039 - job_052: + - job_040 + job_053: 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: @@ -2275,7 +2337,8 @@ jobs: - job_037 - job_038 - job_039 - job_053: + - job_040 + job_054: name: "e2e_test_cron; linux; Dart main; PKG: _test; `dart test`" runs-on: ubuntu-latest steps: @@ -2357,7 +2420,8 @@ jobs: - job_050 - job_051 - job_052 - job_054: + - job_053 + job_055: 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: @@ -2443,7 +2507,8 @@ jobs: - job_050 - job_051 - job_052 - job_055: + - job_053 + job_056: name: "e2e_test_cron; windows; Dart main; PKG: _test; `dart test`" runs-on: windows-latest steps: @@ -2515,7 +2580,8 @@ jobs: - job_050 - job_051 - job_052 - job_056: + - job_053 + job_057: 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: @@ -2591,7 +2657,8 @@ jobs: - job_050 - job_051 - job_052 - job_057: + - job_053 + job_058: name: Notify failure runs-on: ubuntu-latest if: "(github.event_name == 'push' || github.event_name == 'schedule') && failure()" @@ -2659,3 +2726,4 @@ jobs: - job_054 - job_055 - job_056 + - job_057 From 70c8cf31a5b39275e60ab1580d5360bd99046e9a Mon Sep 17 00:00:00 2001 From: Jake Macdonald Date: Mon, 25 Jul 2022 07:39:19 -0700 Subject: [PATCH 07/11] up sdk constraint to 2.17.0 and rerun mono_repo generate --- .github/workflows/dart.yml | 24 ++++++++++++------------ build_resolvers/CHANGELOG.md | 2 +- build_resolvers/mono_pkg.yaml | 2 +- build_resolvers/pubspec.yaml | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index 21452bfd2..72cb99df1 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -124,22 +124,22 @@ jobs: working-directory: scratch_space run: dart analyze --fatal-infos . job_004: - name: "analyze_and_format; linux; Dart 2.15.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; PKG: build_resolvers; `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.15.0;packages:build_resolvers;commands:format-analyze_0" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:build_resolvers;commands:format-analyze_0" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:2.15.0;packages:build_resolvers - os:ubuntu-latest;pub-cache-hosted;sdk:2.15.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.15.0" + sdk: "2.17.0" - id: checkout uses: actions/checkout@d0651293c4a5a52e711f25b41b05b2212f385d28 - id: build_resolvers_pub_upgrade @@ -552,22 +552,22 @@ jobs: - job_008 - job_009 job_013: - name: "unit_test; linux; Dart 2.15.0; PKG: build_resolvers; `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.15.0;packages:build_resolvers;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.15.0;packages:build_resolvers - os:ubuntu-latest;pub-cache-hosted;sdk:2.15.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.15.0" + sdk: "2.17.0" - id: checkout uses: actions/checkout@d0651293c4a5a52e711f25b41b05b2212f385d28 - id: build_resolvers_pub_upgrade @@ -1134,12 +1134,12 @@ jobs: - job_008 - job_009 job_029: - name: "unit_test; windows; Dart 2.15.0; PKG: build_resolvers; `dart test --test-randomize-ordering-seed=random`" + 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.15.0" + sdk: "2.17.0" - id: checkout uses: actions/checkout@d0651293c4a5a52e711f25b41b05b2212f385d28 - id: build_resolvers_pub_upgrade diff --git a/build_resolvers/CHANGELOG.md b/build_resolvers/CHANGELOG.md index 6b83cf26e..3df418cf9 100644 --- a/build_resolvers/CHANGELOG.md +++ b/build_resolvers/CHANGELOG.md @@ -1,7 +1,7 @@ ## 2.0.10-dev - Migrate from `LibraryElement#parts` to `LibraryElement#parts2`. -- Update min sdk constraint to `2.15.0` since this is the minimum selectable +- Update min sdk constraint to `2.17.0` since this is the minimum selectable (and testable) sdk. ## 2.0.9 diff --git a/build_resolvers/mono_pkg.yaml b/build_resolvers/mono_pkg.yaml index a50b1cbc9..a72dcd6b6 100644 --- a/build_resolvers/mono_pkg.yaml +++ b/build_resolvers/mono_pkg.yaml @@ -1,5 +1,5 @@ sdk: -- 2.15.0 +- 2.17.0 - dev stages: diff --git a/build_resolvers/pubspec.yaml b/build_resolvers/pubspec.yaml index ec2b5160e..0e388a912 100644 --- a/build_resolvers/pubspec.yaml +++ b/build_resolvers/pubspec.yaml @@ -4,7 +4,7 @@ description: Resolve Dart code in a Builder repository: https://github.com/dart-lang/build/tree/master/build_resolvers environment: - sdk: ">=2.15.0 <3.0.0" + sdk: ">=2.17.0 <3.0.0" dependencies: analyzer: ">=4.3.0 <5.0.0" From 266446e228285891a2979b3f69c2c209f089c4e0 Mon Sep 17 00:00:00 2001 From: Jake Macdonald Date: Mon, 25 Jul 2022 07:45:00 -0700 Subject: [PATCH 08/11] use constructor tearoff --- build_resolvers/CHANGELOG.md | 1 + build_resolvers/lib/src/build_asset_uri_resolver.dart | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/build_resolvers/CHANGELOG.md b/build_resolvers/CHANGELOG.md index 3df418cf9..5c3f41daa 100644 --- a/build_resolvers/CHANGELOG.md +++ b/build_resolvers/CHANGELOG.md @@ -3,6 +3,7 @@ - Migrate from `LibraryElement#parts` to `LibraryElement#parts2`. - Update min sdk constraint to `2.17.0` since this is the minimum selectable (and testable) sdk. +- Use a constructor tearoff since our min sdk now supports them. ## 2.0.9 diff --git a/build_resolvers/lib/src/build_asset_uri_resolver.dart b/build_resolvers/lib/src/build_asset_uri_resolver.dart index c210e4f5e..b351a0c28 100644 --- a/build_resolvers/lib/src/build_asset_uri_resolver.dart +++ b/build_resolvers/lib/src/build_asset_uri_resolver.dart @@ -63,7 +63,7 @@ class BuildAssetUriResolver extends UriResolver { withDriverResource, {required bool transitive}) async { final transitivelyResolved = _buildStepTransitivelyResolvedAssets - .putIfAbsent(buildStep, () => HashSet()); + .putIfAbsent(buildStep, HashSet.new); bool notCrawled(AssetId asset) => !transitivelyResolved.contains(asset); final uncrawledIds = entryPoints.where(notCrawled); From 8b6782ea111ac2c1694c53c10dc61b46f1c5a5f1 Mon Sep 17 00:00:00 2001 From: Jake Macdonald Date: Mon, 25 Jul 2022 08:20:18 -0700 Subject: [PATCH 09/11] check for DirectiveUriWithSource and navigate to part contents using that --- build_resolvers/lib/src/resolver.dart | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/build_resolvers/lib/src/resolver.dart b/build_resolvers/lib/src/resolver.dart index 466505654..fabcf72c0 100644 --- a/build_resolvers/lib/src/resolver.dart +++ b/build_resolvers/lib/src/resolver.dart @@ -254,17 +254,19 @@ class AnalyzerResolver implements ReleasableResolver { /// /// This includes the main library and existing part files. Future> _syntacticErrorsFor(LibraryElement element) async { - final existingElements = [ - element, - for (final part in element.parts2) - // The source may be null if the part doesn't exist. That's not - // important for us since we only care about syntax - if (part.source.exists()) part, - ]; + final existingSources = [element.source]; + + for (final part in element.parts2) { + var uri = part.uri; + // The source may be null if the part doesn't exist. That's not + // important for us since we only care about syntax + if (uri is! DirectiveUriWithSource) continue; + existingSources.add(uri.source); + } // Map from elements to absolute paths - final paths = existingElements - .map((part) => _uriResolver.lookupCachedAsset(part.source.uri)) + final paths = existingSources + .map((source) => _uriResolver.lookupCachedAsset(source.uri)) .whereType() // filter out nulls .map(assetPath); From 7cff6150e52304e1a3f450d177d79343b4d64198 Mon Sep 17 00:00:00 2001 From: Jake Macdonald Date: Mon, 25 Jul 2022 09:02:53 -0700 Subject: [PATCH 10/11] update comment --- build_resolvers/lib/src/resolver.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build_resolvers/lib/src/resolver.dart b/build_resolvers/lib/src/resolver.dart index fabcf72c0..d9ed8462d 100644 --- a/build_resolvers/lib/src/resolver.dart +++ b/build_resolvers/lib/src/resolver.dart @@ -258,8 +258,8 @@ class AnalyzerResolver implements ReleasableResolver { for (final part in element.parts2) { var uri = part.uri; - // The source may be null if the part doesn't exist. That's not - // important for us since we only care about syntax + // There may be no source if the part doesn't exist. That's not important + // for us since we only care about existing file syntax. if (uri is! DirectiveUriWithSource) continue; existingSources.add(uri.source); } From 949f7f61231233d3f1b2c346c3c5e667bb80db11 Mon Sep 17 00:00:00 2001 From: Jake Macdonald Date: Mon, 25 Jul 2022 09:06:08 -0700 Subject: [PATCH 11/11] update test for missing parts to use parts2 --- build_resolvers/test/resolver_test.dart | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/build_resolvers/test/resolver_test.dart b/build_resolvers/test/resolver_test.dart index bc1d8580f..1f5510c06 100644 --- a/build_resolvers/test/resolver_test.dart +++ b/build_resolvers/test/resolver_test.dart @@ -238,9 +238,8 @@ void main() { } ''', }, (resolver) async { var lib = await resolver.libraryFor(entryPoint); - expect(lib.libraryImports.length, 2); - // TODO(scheglov) Use `parts2` when it is available. - //expect(lib.parts2, isEmpty); + expect(lib.parts2.length, 1); + expect(lib.parts2.whereType(), isEmpty); }, resolvers: AnalyzerResolvers()); });