From a685794654c35e9c244707fade614ee57b69b303 Mon Sep 17 00:00:00 2001 From: Jake Macdonald Date: Tue, 8 Oct 2024 18:30:47 +0000 Subject: [PATCH 01/17] fix analyzer deprecations --- build_resolvers/lib/src/resolver.dart | 10 ++++--- build_resolvers/test/resolver_test.dart | 27 +++++++++++++------ .../test/generate/resolver_reuse_test.dart | 7 ++--- 3 files changed, 29 insertions(+), 15 deletions(-) diff --git a/build_resolvers/lib/src/resolver.dart b/build_resolvers/lib/src/resolver.dart index bc170e86d..d0d379cfd 100644 --- a/build_resolvers/lib/src/resolver.dart +++ b/build_resolvers/lib/src/resolver.dart @@ -64,9 +64,11 @@ class PerActionResolver implements ReleasableResolver { // `BuildStep.canRead`. They'd still be reachable by crawling the element // model manually. yield current; - final toCrawl = current.importedLibraries - .followedBy(current.exportedLibraries) - .where((l) => !seen.contains(l)) + final toCrawl = current.definingCompilationUnit.libraryImports + .map((import) => import.library) + .followedBy(current.definingCompilationUnit.libraryExports + .map((export) => export.library)) + .where((library) => !seen.contains(library)) .toSet(); toVisit.addAll(toCrawl); seen.addAll(toCrawl); @@ -279,7 +281,7 @@ class AnalyzerResolver implements ReleasableResolver { Future> _syntacticErrorsFor(LibraryElement element) async { final existingSources = [element.source]; - for (final part in element.parts) { + for (final part in element.definingCompilationUnit.parts) { var uri = part.uri; // 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. diff --git a/build_resolvers/test/resolver_test.dart b/build_resolvers/test/resolver_test.dart index df278ea47..04c0308e5 100644 --- a/build_resolvers/test/resolver_test.dart +++ b/build_resolvers/test/resolver_test.dart @@ -46,8 +46,12 @@ void main() { ''', }, (resolver) async { var lib = await resolver.libraryFor(entryPoint); - expect(lib.importedLibraries.length, 2); - var libA = lib.importedLibraries.where((l) => l.name == 'a').single; + expect(lib.definingCompilationUnit.libraryImports.length, 2); + var libA = lib + ..definingCompilationUnit + .libraryImports + .where((l) => l.library.name == 'a') + .single; expect(libA.getClass('Foo'), isNull); }, resolvers: AnalyzerResolvers()); }); @@ -64,8 +68,12 @@ void main() { ''', }, (resolver) async { var lib = await resolver.libraryFor(entryPoint); - expect(lib.importedLibraries.length, 2); - var libB = lib.importedLibraries.where((l) => l.name == 'b').single; + expect(lib.definingCompilationUnit.libraryImports.length, 2); + var libB = lib + ..definingCompilationUnit + .libraryImports + .where((l) => l.library.name == 'b') + .single; expect(libB.getClass('Foo'), isNull); }, resolvers: AnalyzerResolvers()); }); @@ -257,8 +265,11 @@ void main() { } ''', }, (resolver) async { var lib = await resolver.libraryFor(entryPoint); - expect(lib.parts.length, 1); - expect(lib.parts.whereType(), isEmpty); + expect(lib.definingCompilationUnit.parts.length, 1); + expect( + lib.definingCompilationUnit.parts + .whereType(), + isEmpty); }, resolvers: AnalyzerResolvers()); }); @@ -454,8 +465,8 @@ void main() { ''', }, (resolver) async { var entry = await resolver.libraryFor(AssetId('a', 'lib/a.dart')); - var classDefinition = entry.importedLibraries - .map((l) => l.getClass('SomeClass')) + var classDefinition = entry.definingCompilationUnit.libraryImports + .map((l) => l.library.getClass('SomeClass')) .singleWhere((c) => c != null)!; expect(await resolver.assetIdForElement(classDefinition), AssetId('a', 'lib/b.dart')); diff --git a/build_runner_core/test/generate/resolver_reuse_test.dart b/build_runner_core/test/generate/resolver_reuse_test.dart index 62a298624..6dcc88a93 100644 --- a/build_runner_core/test/generate/resolver_reuse_test.dart +++ b/build_runner_core/test/generate/resolver_reuse_test.dart @@ -40,9 +40,10 @@ void main() { await buildStep.canRead(buildStep.inputId.addExtension('.foo')); // Check that the `.imported.dart` library is still reachable // through the resolver. - var importedLibrary = inputLibrary.importedLibraries.firstWhere( - (l) => l.source.uri.path.endsWith('.imported.dart')); - var classNames = importedLibrary.definingCompilationUnit.classes + var importedLibrary = + inputLibrary.definingCompilationUnit.libraryImports.firstWhere( + (l) => l.librarySource.uri.path.endsWith('.imported.dart')); + var classNames = importedLibrary.enclosingElement3.classes .map((c) => c.name) .toList(); return buildStep.writeAsString( From 3daf7061da877ac5d324212650e74fcea6088622 Mon Sep 17 00:00:00 2001 From: Jake Macdonald Date: Tue, 8 Oct 2024 18:33:30 +0000 Subject: [PATCH 02/17] update changelog for build_resolvers --- build_resolvers/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/build_resolvers/CHANGELOG.md b/build_resolvers/CHANGELOG.md index b09f8e584..ccda8e908 100644 --- a/build_resolvers/CHANGELOG.md +++ b/build_resolvers/CHANGELOG.md @@ -5,6 +5,7 @@ - Bump the min sdk to 3.5.0. - Fix SDK summary reads when multiple isolates are using build resolvers (not recommended). +- Fix analyzer deprecations. ## 2.4.2 From b4d91eeeef5112694500010b2f9e80697134eafb Mon Sep 17 00:00:00 2001 From: Jake Macdonald Date: Tue, 8 Oct 2024 19:13:29 +0000 Subject: [PATCH 03/17] update analyzer dep --- build_resolvers/pubspec.yaml | 2 +- build_runner_core/pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build_resolvers/pubspec.yaml b/build_resolvers/pubspec.yaml index cf47c7896..f1ac17f3b 100644 --- a/build_resolvers/pubspec.yaml +++ b/build_resolvers/pubspec.yaml @@ -8,7 +8,7 @@ environment: sdk: ^3.5.0 dependencies: - analyzer: '>=6.7.0 <7.0.0' + analyzer: ^6.9.0 async: ^2.5.0 build: ^2.0.0 collection: ^1.17.0 diff --git a/build_runner_core/pubspec.yaml b/build_runner_core/pubspec.yaml index f15c6398f..d0677bc70 100644 --- a/build_runner_core/pubspec.yaml +++ b/build_runner_core/pubspec.yaml @@ -35,7 +35,7 @@ dependencies: dev_dependencies: _test_common: path: ../_test_common - analyzer: '>=5.2.0 <7.0.0' + analyzer: ^6.9.0 build_runner: ^2.0.0 build_test: ^2.0.0 json_serializable: ^6.0.0 From 0717cf4a06ed987cc6f73114a3b80045f69d06b6 Mon Sep 17 00:00:00 2001 From: Jake Macdonald Date: Tue, 8 Oct 2024 19:16:52 +0000 Subject: [PATCH 04/17] remove build_resolvers from the workspace --- build_resolvers/pubspec.yaml | 7 +++++-- pubspec.yaml | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/build_resolvers/pubspec.yaml b/build_resolvers/pubspec.yaml index f1ac17f3b..22e0c91fd 100644 --- a/build_resolvers/pubspec.yaml +++ b/build_resolvers/pubspec.yaml @@ -2,10 +2,13 @@ name: build_resolvers version: 2.4.3-wip description: Resolve Dart code in a Builder repository: https://github.com/dart-lang/build/tree/master/build_resolvers -resolution: workspace + +# This package can't be part of the workspace because it requires a very recent +# Dart SDK - see the top-level pubspec for details. +#resolution: workspace environment: - sdk: ^3.5.0 + sdk: ^3.6.0-165.0.dev dependencies: analyzer: ^6.9.0 diff --git a/pubspec.yaml b/pubspec.yaml index 44bc9a473..af028a0d7 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -19,7 +19,7 @@ workspace: - build_config - build_daemon - build_modules -- build_resolvers +# - build_resolvers - build_runner - build_runner_core - build_test From ff55290f606f185440ce38b277420fb256201801 Mon Sep 17 00:00:00 2001 From: Jake Macdonald Date: Tue, 8 Oct 2024 19:17:34 +0000 Subject: [PATCH 05/17] regenerate mono_repo config --- .github/workflows/dart.yml | 342 ++++++++++++++++++++++--------------- 1 file changed, 209 insertions(+), 133 deletions(-) diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index 85b28f01a..22bbdb782 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -70,16 +70,16 @@ jobs: if: "always() && steps.build_pub_upgrade.conclusion == 'success'" working-directory: build job_003: - name: "analyze_and_format; linux; Dart 3.5.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 3.5.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@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:build_resolvers-build_test-example-scratch_space;commands:format-analyze" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:build_test-example-scratch_space;commands:format-analyze" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:build_resolvers-build_test-example-scratch_space + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:build_test-example-scratch_space os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest @@ -90,19 +90,6 @@ jobs: - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 - - id: build_resolvers_pub_upgrade - name: build_resolvers; dart pub upgrade - run: dart pub upgrade - if: "always() && steps.checkout.conclusion == 'success'" - working-directory: build_resolvers - - name: "build_resolvers; dart format --output=none --set-exit-if-changed ." - run: "dart format --output=none --set-exit-if-changed ." - if: "always() && steps.build_resolvers_pub_upgrade.conclusion == 'success'" - working-directory: build_resolvers - - name: "build_resolvers; dart analyze --fatal-infos ." - run: dart analyze --fatal-infos . - if: "always() && steps.build_resolvers_pub_upgrade.conclusion == 'success'" - working-directory: build_resolvers - id: build_test_pub_upgrade name: build_test; dart pub upgrade run: dart pub upgrade @@ -143,6 +130,40 @@ jobs: if: "always() && steps.scratch_space_pub_upgrade.conclusion == 'success'" working-directory: scratch_space job_004: + name: "analyze_and_format; linux; Dart 3.6.0-165.0.dev; 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@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 + with: + path: "~/.pub-cache/hosted" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-165.0.dev;packages:build_resolvers;commands:format-analyze" + restore-keys: | + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-165.0.dev;packages:build_resolvers + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-165.0.dev + os:ubuntu-latest;pub-cache-hosted + os:ubuntu-latest + - name: Setup Dart SDK + uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 + with: + sdk: "3.6.0-165.0.dev" + - id: checkout + name: Checkout repository + uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 + - id: build_resolvers_pub_upgrade + name: build_resolvers; dart pub upgrade + run: dart pub upgrade + if: "always() && steps.checkout.conclusion == 'success'" + working-directory: build_resolvers + - name: "build_resolvers; dart format --output=none --set-exit-if-changed ." + run: "dart format --output=none --set-exit-if-changed ." + if: "always() && steps.build_resolvers_pub_upgrade.conclusion == 'success'" + working-directory: build_resolvers + - name: "build_resolvers; dart analyze --fatal-infos ." + run: dart analyze --fatal-infos . + if: "always() && steps.build_resolvers_pub_upgrade.conclusion == 'success'" + working-directory: build_resolvers + job_005: name: "analyze_and_format; linux; Dart dev; PKGS: _test_common, build; `dart analyze --fatal-infos .`" runs-on: ubuntu-latest steps: @@ -181,7 +202,7 @@ jobs: run: dart analyze --fatal-infos . if: "always() && steps.build_pub_upgrade.conclusion == 'success'" working-directory: build - job_005: + job_006: name: "analyze_and_format; linux; Dart dev; PKG: build; `dart format --output=none --set-exit-if-changed .`" runs-on: ubuntu-latest steps: @@ -211,7 +232,7 @@ jobs: run: "dart format --output=none --set-exit-if-changed ." if: "always() && steps.build_pub_upgrade.conclusion == 'success'" working-directory: build - job_006: + job_007: name: "analyze_and_format; linux; Dart dev; PKGS: build_config, build_daemon, build_resolvers, build_runner, build_runner_core, build_test, example, scratch_space; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos .`" runs-on: ubuntu-latest steps: @@ -336,7 +357,7 @@ jobs: run: dart analyze --fatal-infos . if: "always() && steps.scratch_space_pub_upgrade.conclusion == 'success'" working-directory: scratch_space - job_007: + job_008: name: "analyze_and_format; linux; Dart main; PKG: _test; `dart analyze --fatal-infos .`" runs-on: ubuntu-latest steps: @@ -366,7 +387,7 @@ jobs: run: dart analyze --fatal-infos . if: "always() && steps._test_pub_upgrade.conclusion == 'success'" working-directory: _test - job_008: + job_009: name: "analyze_and_format; linux; Dart main; PKGS: build_modules, build_runner, build_web_compilers; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos .`" runs-on: ubuntu-latest steps: @@ -426,7 +447,7 @@ jobs: run: dart analyze --fatal-infos . if: "always() && steps.build_web_compilers_pub_upgrade.conclusion == 'success'" working-directory: build_web_compilers - job_009: + job_010: name: "unit_test; linux; Dart 3.5.0; PKG: build; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: @@ -465,7 +486,8 @@ jobs: - job_006 - job_007 - job_008 - job_010: + - job_009 + job_011: name: "unit_test; linux; Dart 3.5.0; PKG: build_daemon; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: @@ -504,45 +526,7 @@ jobs: - job_006 - job_007 - job_008 - job_011: - name: "unit_test; linux; Dart 3.5.0; PKG: build_resolvers; `dart test --test-randomize-ordering-seed=random`" - runs-on: ubuntu-latest - steps: - - name: Cache Pub hosted dependencies - uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 - with: - path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:build_resolvers;commands:test_04" - restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:build_resolvers - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0 - os:ubuntu-latest;pub-cache-hosted - os:ubuntu-latest - - name: Setup Dart SDK - uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 - with: - sdk: "3.5.0" - - id: checkout - name: Checkout repository - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 - - id: build_resolvers_pub_upgrade - name: build_resolvers; dart pub upgrade - run: dart pub upgrade - if: "always() && steps.checkout.conclusion == 'success'" - working-directory: build_resolvers - - name: "build_resolvers; dart test --test-randomize-ordering-seed=random" - run: "dart test --test-randomize-ordering-seed=random" - if: "always() && steps.build_resolvers_pub_upgrade.conclusion == 'success'" - working-directory: build_resolvers - needs: - - job_001 - - job_002 - - job_003 - - job_004 - - job_005 - - job_006 - - job_007 - - job_008 + - job_009 job_012: name: "unit_test; linux; Dart 3.5.0; PKG: build_runner_core; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest @@ -582,6 +566,7 @@ jobs: - job_006 - job_007 - job_008 + - job_009 job_013: name: "unit_test; linux; Dart 3.5.0; PKG: build_test; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest @@ -621,6 +606,7 @@ jobs: - job_006 - job_007 - job_008 + - job_009 job_014: name: "unit_test; linux; Dart 3.5.0; PKG: scratch_space; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest @@ -660,7 +646,48 @@ jobs: - job_006 - job_007 - job_008 + - job_009 job_015: + name: "unit_test; linux; Dart 3.6.0-165.0.dev; PKG: build_resolvers; `dart test --test-randomize-ordering-seed=random`" + runs-on: ubuntu-latest + steps: + - name: Cache Pub hosted dependencies + uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 + with: + path: "~/.pub-cache/hosted" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-165.0.dev;packages:build_resolvers;commands:test_04" + restore-keys: | + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-165.0.dev;packages:build_resolvers + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-165.0.dev + os:ubuntu-latest;pub-cache-hosted + os:ubuntu-latest + - name: Setup Dart SDK + uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 + with: + sdk: "3.6.0-165.0.dev" + - id: checkout + name: Checkout repository + uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 + - id: build_resolvers_pub_upgrade + name: build_resolvers; dart pub upgrade + run: dart pub upgrade + if: "always() && steps.checkout.conclusion == 'success'" + working-directory: build_resolvers + - name: "build_resolvers; dart test --test-randomize-ordering-seed=random" + run: "dart test --test-randomize-ordering-seed=random" + if: "always() && steps.build_resolvers_pub_upgrade.conclusion == 'success'" + working-directory: build_resolvers + 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: build; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: @@ -699,7 +726,8 @@ jobs: - job_006 - job_007 - job_008 - job_016: + - job_009 + job_017: name: "unit_test; linux; Dart dev; PKG: build_config; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: @@ -738,7 +766,8 @@ jobs: - job_006 - job_007 - job_008 - job_017: + - job_009 + job_018: name: "unit_test; linux; Dart dev; PKG: build_daemon; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: @@ -777,7 +806,8 @@ jobs: - job_006 - job_007 - job_008 - job_018: + - job_009 + job_019: name: "unit_test; linux; Dart dev; PKG: build_resolvers; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: @@ -816,7 +846,8 @@ jobs: - job_006 - job_007 - job_008 - job_019: + - job_009 + job_020: name: "unit_test; linux; Dart dev; PKG: build_runner_core; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: @@ -855,7 +886,8 @@ jobs: - job_006 - job_007 - job_008 - job_020: + - job_009 + job_021: name: "unit_test; linux; Dart dev; PKG: build_test; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: @@ -894,7 +926,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: @@ -933,7 +966,8 @@ jobs: - job_006 - job_007 - job_008 - job_022: + - job_009 + job_023: name: "unit_test; linux; Dart dev; PKG: build_runner; `dart test -P experiments --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: @@ -972,7 +1006,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: @@ -1011,7 +1046,8 @@ jobs: - job_006 - job_007 - job_008 - job_024: + - job_009 + job_025: name: "unit_test; linux; Dart main; PKG: _test; `dart run build_runner test -- -p chrome --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: @@ -1050,7 +1086,8 @@ jobs: - job_006 - job_007 - job_008 - job_025: + - job_009 + job_026: name: "unit_test; linux; Dart main; PKG: _test; `dart run build_runner test -- -p vm test/configurable_uri_test.dart --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: @@ -1089,7 +1126,8 @@ jobs: - job_006 - job_007 - job_008 - job_026: + - job_009 + job_027: name: "unit_test; linux; Dart main; PKG: build_modules; `dart test -P presubmit --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: @@ -1128,7 +1166,8 @@ jobs: - job_006 - job_007 - job_008 - job_027: + - job_009 + job_028: name: "unit_test; linux; Dart main; PKG: build_runner; `dart test -x integration --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: @@ -1167,7 +1206,8 @@ jobs: - job_006 - job_007 - job_008 - job_028: + - job_009 + job_029: name: "unit_test; linux; Dart main; PKG: build_web_compilers; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: @@ -1206,7 +1246,8 @@ jobs: - job_006 - job_007 - job_008 - job_029: + - job_009 + job_030: name: "unit_test; windows; Dart 3.5.0; PKG: build; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: @@ -1235,7 +1276,8 @@ jobs: - job_006 - job_007 - job_008 - job_030: + - job_009 + job_031: name: "unit_test; windows; Dart 3.5.0; PKG: build_daemon; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: @@ -1264,35 +1306,7 @@ jobs: - job_006 - job_007 - job_008 - job_031: - name: "unit_test; windows; Dart 3.5.0; PKG: build_resolvers; `dart test --test-randomize-ordering-seed=random`" - runs-on: windows-latest - steps: - - name: Setup Dart SDK - uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 - with: - sdk: "3.5.0" - - id: checkout - name: Checkout repository - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 - - id: build_resolvers_pub_upgrade - name: build_resolvers; dart pub upgrade - run: dart pub upgrade - if: "always() && steps.checkout.conclusion == 'success'" - working-directory: build_resolvers - - name: "build_resolvers; dart test --test-randomize-ordering-seed=random" - run: "dart test --test-randomize-ordering-seed=random" - if: "always() && steps.build_resolvers_pub_upgrade.conclusion == 'success'" - working-directory: build_resolvers - needs: - - job_001 - - job_002 - - job_003 - - job_004 - - job_005 - - job_006 - - job_007 - - job_008 + - job_009 job_032: name: "unit_test; windows; Dart 3.5.0; PKG: build_runner_core; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest @@ -1322,6 +1336,7 @@ jobs: - job_006 - job_007 - job_008 + - job_009 job_033: name: "unit_test; windows; Dart 3.5.0; PKG: build_test; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest @@ -1351,6 +1366,7 @@ jobs: - job_006 - job_007 - job_008 + - job_009 job_034: name: "unit_test; windows; Dart 3.5.0; PKG: scratch_space; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest @@ -1380,7 +1396,38 @@ jobs: - job_006 - job_007 - job_008 + - job_009 job_035: + name: "unit_test; windows; Dart 3.6.0-165.0.dev; PKG: build_resolvers; `dart test --test-randomize-ordering-seed=random`" + runs-on: windows-latest + steps: + - name: Setup Dart SDK + uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 + with: + sdk: "3.6.0-165.0.dev" + - id: checkout + name: Checkout repository + uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 + - id: build_resolvers_pub_upgrade + name: build_resolvers; dart pub upgrade + run: dart pub upgrade + if: "always() && steps.checkout.conclusion == 'success'" + working-directory: build_resolvers + - name: "build_resolvers; dart test --test-randomize-ordering-seed=random" + run: "dart test --test-randomize-ordering-seed=random" + if: "always() && steps.build_resolvers_pub_upgrade.conclusion == 'success'" + working-directory: build_resolvers + needs: + - job_001 + - job_002 + - job_003 + - job_004 + - job_005 + - job_006 + - job_007 + - job_008 + - job_009 + job_036: name: "unit_test; windows; Dart dev; PKG: build; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: @@ -1409,7 +1456,8 @@ jobs: - job_006 - job_007 - job_008 - job_036: + - job_009 + job_037: name: "unit_test; windows; Dart dev; PKG: build_config; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: @@ -1438,7 +1486,8 @@ jobs: - job_006 - job_007 - job_008 - job_037: + - job_009 + job_038: name: "unit_test; windows; Dart dev; PKG: build_daemon; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: @@ -1467,7 +1516,8 @@ jobs: - job_006 - job_007 - job_008 - job_038: + - job_009 + job_039: name: "unit_test; windows; Dart dev; PKG: build_resolvers; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: @@ -1496,7 +1546,8 @@ jobs: - job_006 - job_007 - job_008 - job_039: + - job_009 + job_040: name: "unit_test; windows; Dart dev; PKG: build_runner_core; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: @@ -1525,7 +1576,8 @@ jobs: - job_006 - job_007 - job_008 - job_040: + - job_009 + job_041: name: "unit_test; windows; Dart dev; PKG: build_test; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: @@ -1554,7 +1606,8 @@ jobs: - job_006 - job_007 - job_008 - job_041: + - job_009 + job_042: name: "unit_test; windows; Dart dev; PKG: scratch_space; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: @@ -1583,7 +1636,8 @@ jobs: - job_006 - job_007 - job_008 - job_042: + - job_009 + job_043: name: "unit_test; windows; Dart main; PKG: _test; `dart run build_runner test -- -p chrome --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: @@ -1612,7 +1666,8 @@ jobs: - job_006 - job_007 - job_008 - job_043: + - job_009 + job_044: name: "unit_test; windows; Dart main; PKG: build_modules; `dart test -P presubmit --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: @@ -1641,7 +1696,8 @@ jobs: - job_006 - job_007 - job_008 - job_044: + - job_009 + job_045: name: "unit_test; windows; Dart main; PKG: build_web_compilers; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: @@ -1670,7 +1726,8 @@ jobs: - job_006 - job_007 - job_008 - job_045: + - job_009 + job_046: 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 -j 1`" runs-on: ubuntu-latest steps: @@ -1745,7 +1802,8 @@ jobs: - job_042 - job_043 - job_044 - job_046: + - job_045 + job_047: 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 -j 1`" runs-on: ubuntu-latest steps: @@ -1820,7 +1878,8 @@ jobs: - job_042 - job_043 - job_044 - job_047: + - job_045 + job_048: 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 -j 1`" runs-on: ubuntu-latest steps: @@ -1895,7 +1954,8 @@ jobs: - job_042 - job_043 - job_044 - job_048: + - job_045 + job_049: 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 -j 1`" runs-on: ubuntu-latest steps: @@ -1970,7 +2030,8 @@ jobs: - job_042 - job_043 - job_044 - job_049: + - job_045 + job_050: 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 -j 1`" runs-on: ubuntu-latest steps: @@ -2045,7 +2106,8 @@ jobs: - job_042 - job_043 - job_044 - job_050: + - job_045 + job_051: name: "e2e_test; linux; Dart main; PKG: _test; `dart test --total-shards 3 --shard-index 0 --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: @@ -2120,7 +2182,8 @@ jobs: - job_042 - job_043 - job_044 - job_051: + - job_045 + job_052: name: "e2e_test; linux; Dart main; PKG: _test; `dart test --total-shards 3 --shard-index 1 --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: @@ -2195,7 +2258,8 @@ jobs: - job_042 - job_043 - job_044 - job_052: + - job_045 + job_053: name: "e2e_test; linux; Dart main; PKG: _test; `dart test --total-shards 3 --shard-index 2 --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: @@ -2270,7 +2334,8 @@ jobs: - job_042 - job_043 - job_044 - job_053: + - job_045 + job_054: name: "e2e_test; linux; Dart main; PKG: build_runner; `dart test -t integration --total-shards 5 --shard-index 0 --test-randomize-ordering-seed=random --no-chain-stack-traces -j 1`" runs-on: ubuntu-latest steps: @@ -2345,7 +2410,8 @@ jobs: - job_042 - job_043 - job_044 - job_054: + - job_045 + job_055: name: "e2e_test; linux; Dart main; PKG: build_runner; `dart test -t integration --total-shards 5 --shard-index 1 --test-randomize-ordering-seed=random --no-chain-stack-traces -j 1`" runs-on: ubuntu-latest steps: @@ -2420,7 +2486,8 @@ jobs: - job_042 - job_043 - job_044 - job_055: + - job_045 + job_056: name: "e2e_test; linux; Dart main; PKG: build_runner; `dart test -t integration --total-shards 5 --shard-index 2 --test-randomize-ordering-seed=random --no-chain-stack-traces -j 1`" runs-on: ubuntu-latest steps: @@ -2495,7 +2562,8 @@ jobs: - job_042 - job_043 - job_044 - job_056: + - job_045 + job_057: name: "e2e_test; linux; Dart main; PKG: build_runner; `dart test -t integration --total-shards 5 --shard-index 3 --test-randomize-ordering-seed=random --no-chain-stack-traces -j 1`" runs-on: ubuntu-latest steps: @@ -2570,7 +2638,8 @@ jobs: - job_042 - job_043 - job_044 - job_057: + - job_045 + job_058: name: "e2e_test; linux; Dart main; PKG: build_runner; `dart test -t integration --total-shards 5 --shard-index 4 --test-randomize-ordering-seed=random --no-chain-stack-traces -j 1`" runs-on: ubuntu-latest steps: @@ -2645,7 +2714,8 @@ jobs: - job_042 - job_043 - job_044 - job_058: + - job_045 + job_059: name: "e2e_test; windows; Dart main; PKG: _test; `dart test --total-shards 3 --shard-index 0 --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: @@ -2710,7 +2780,8 @@ jobs: - job_042 - job_043 - job_044 - job_059: + - job_045 + job_060: name: "e2e_test; windows; Dart main; PKG: _test; `dart test --total-shards 3 --shard-index 1 --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: @@ -2775,7 +2846,8 @@ jobs: - job_042 - job_043 - job_044 - job_060: + - job_045 + job_061: name: "e2e_test; windows; Dart main; PKG: _test; `dart test --total-shards 3 --shard-index 2 --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: @@ -2840,7 +2912,8 @@ jobs: - job_042 - job_043 - job_044 - job_061: + - job_045 + job_062: name: "e2e_test_cron; linux; Dart main; PKG: _test; `dart test`" runs-on: ubuntu-latest if: "github.event_name == 'schedule'" @@ -2932,7 +3005,8 @@ jobs: - job_058 - job_059 - job_060 - job_062: + - job_061 + job_063: name: "e2e_test_cron; windows; Dart main; PKG: _test; `dart test`" runs-on: windows-latest if: "github.event_name == 'schedule'" @@ -3014,7 +3088,8 @@ jobs: - job_058 - job_059 - job_060 - job_063: + - job_061 + job_064: name: Notify failure runs-on: ubuntu-latest if: "(github.event_name == 'push' || github.event_name == 'schedule') && failure()" @@ -3088,3 +3163,4 @@ jobs: - job_060 - job_061 - job_062 + - job_063 From b0fc5af90701a8971f09801653fe0143b7cdcb3e Mon Sep 17 00:00:00 2001 From: Jake Macdonald Date: Tue, 8 Oct 2024 19:19:04 +0000 Subject: [PATCH 06/17] remove build_runner_core from the workspace --- .github/workflows/dart.yml | 134 ++++++++++++++++----------------- build_runner_core/pubspec.yaml | 7 +- pubspec.yaml | 2 +- 3 files changed, 73 insertions(+), 70 deletions(-) diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index 22bbdb782..b15f146e6 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -528,16 +528,16 @@ jobs: - job_008 - job_009 job_012: - name: "unit_test; linux; Dart 3.5.0; PKG: build_runner_core; `dart test --test-randomize-ordering-seed=random`" + name: "unit_test; linux; Dart 3.5.0; PKG: build_test; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:build_runner_core;commands:test_04" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:build_test;commands:test_04" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:build_runner_core + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:build_test os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest @@ -548,15 +548,15 @@ jobs: - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 - - id: build_runner_core_pub_upgrade - name: build_runner_core; dart pub upgrade + - id: build_test_pub_upgrade + name: build_test; dart pub upgrade run: dart pub upgrade if: "always() && steps.checkout.conclusion == 'success'" - working-directory: build_runner_core - - name: "build_runner_core; dart test --test-randomize-ordering-seed=random" + working-directory: build_test + - name: "build_test; dart test --test-randomize-ordering-seed=random" run: "dart test --test-randomize-ordering-seed=random" - if: "always() && steps.build_runner_core_pub_upgrade.conclusion == 'success'" - working-directory: build_runner_core + if: "always() && steps.build_test_pub_upgrade.conclusion == 'success'" + working-directory: build_test needs: - job_001 - job_002 @@ -568,16 +568,16 @@ jobs: - job_008 - job_009 job_013: - name: "unit_test; linux; Dart 3.5.0; PKG: build_test; `dart test --test-randomize-ordering-seed=random`" + name: "unit_test; linux; Dart 3.5.0; PKG: scratch_space; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:build_test;commands:test_04" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:scratch_space;commands:test_04" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:build_test + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:scratch_space os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest @@ -588,15 +588,15 @@ jobs: - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 - - id: build_test_pub_upgrade - name: build_test; dart pub upgrade + - id: scratch_space_pub_upgrade + name: scratch_space; dart pub upgrade run: dart pub upgrade if: "always() && steps.checkout.conclusion == 'success'" - working-directory: build_test - - name: "build_test; dart test --test-randomize-ordering-seed=random" + working-directory: scratch_space + - name: "scratch_space; dart test --test-randomize-ordering-seed=random" run: "dart test --test-randomize-ordering-seed=random" - if: "always() && steps.build_test_pub_upgrade.conclusion == 'success'" - working-directory: build_test + if: "always() && steps.scratch_space_pub_upgrade.conclusion == 'success'" + working-directory: scratch_space needs: - job_001 - job_002 @@ -608,35 +608,35 @@ jobs: - job_008 - job_009 job_014: - name: "unit_test; linux; Dart 3.5.0; PKG: scratch_space; `dart test --test-randomize-ordering-seed=random`" + name: "unit_test; linux; Dart 3.6.0-165.0.dev; PKG: build_resolvers; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:scratch_space;commands:test_04" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-165.0.dev;packages:build_resolvers;commands:test_04" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:scratch_space - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-165.0.dev;packages:build_resolvers + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-165.0.dev os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.5.0" + sdk: "3.6.0-165.0.dev" - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 - - id: scratch_space_pub_upgrade - name: scratch_space; dart pub upgrade + - id: build_resolvers_pub_upgrade + name: build_resolvers; dart pub upgrade run: dart pub upgrade if: "always() && steps.checkout.conclusion == 'success'" - working-directory: scratch_space - - name: "scratch_space; dart test --test-randomize-ordering-seed=random" + working-directory: build_resolvers + - name: "build_resolvers; dart test --test-randomize-ordering-seed=random" run: "dart test --test-randomize-ordering-seed=random" - if: "always() && steps.scratch_space_pub_upgrade.conclusion == 'success'" - working-directory: scratch_space + if: "always() && steps.build_resolvers_pub_upgrade.conclusion == 'success'" + working-directory: build_resolvers needs: - job_001 - job_002 @@ -648,16 +648,16 @@ jobs: - job_008 - job_009 job_015: - name: "unit_test; linux; Dart 3.6.0-165.0.dev; PKG: build_resolvers; `dart test --test-randomize-ordering-seed=random`" + name: "unit_test; linux; Dart 3.6.0-165.0.dev; PKG: build_runner_core; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-165.0.dev;packages:build_resolvers;commands:test_04" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-165.0.dev;packages:build_runner_core;commands:test_04" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-165.0.dev;packages:build_resolvers + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-165.0.dev;packages:build_runner_core os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-165.0.dev os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest @@ -668,15 +668,15 @@ jobs: - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 - - id: build_resolvers_pub_upgrade - name: build_resolvers; dart pub upgrade + - id: build_runner_core_pub_upgrade + name: build_runner_core; dart pub upgrade run: dart pub upgrade if: "always() && steps.checkout.conclusion == 'success'" - working-directory: build_resolvers - - name: "build_resolvers; dart test --test-randomize-ordering-seed=random" + working-directory: build_runner_core + - name: "build_runner_core; dart test --test-randomize-ordering-seed=random" run: "dart test --test-randomize-ordering-seed=random" - if: "always() && steps.build_resolvers_pub_upgrade.conclusion == 'success'" - working-directory: build_resolvers + if: "always() && steps.build_runner_core_pub_upgrade.conclusion == 'success'" + working-directory: build_runner_core needs: - job_001 - job_002 @@ -1308,7 +1308,7 @@ jobs: - job_008 - job_009 job_032: - name: "unit_test; windows; Dart 3.5.0; PKG: build_runner_core; `dart test --test-randomize-ordering-seed=random`" + name: "unit_test; windows; Dart 3.5.0; PKG: build_test; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: - name: Setup Dart SDK @@ -1318,15 +1318,15 @@ jobs: - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 - - id: build_runner_core_pub_upgrade - name: build_runner_core; dart pub upgrade + - id: build_test_pub_upgrade + name: build_test; dart pub upgrade run: dart pub upgrade if: "always() && steps.checkout.conclusion == 'success'" - working-directory: build_runner_core - - name: "build_runner_core; dart test --test-randomize-ordering-seed=random" + working-directory: build_test + - name: "build_test; dart test --test-randomize-ordering-seed=random" run: "dart test --test-randomize-ordering-seed=random" - if: "always() && steps.build_runner_core_pub_upgrade.conclusion == 'success'" - working-directory: build_runner_core + if: "always() && steps.build_test_pub_upgrade.conclusion == 'success'" + working-directory: build_test needs: - job_001 - job_002 @@ -1338,7 +1338,7 @@ jobs: - job_008 - job_009 job_033: - name: "unit_test; windows; Dart 3.5.0; PKG: build_test; `dart test --test-randomize-ordering-seed=random`" + name: "unit_test; windows; Dart 3.5.0; PKG: scratch_space; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: - name: Setup Dart SDK @@ -1348,15 +1348,15 @@ jobs: - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 - - id: build_test_pub_upgrade - name: build_test; dart pub upgrade + - id: scratch_space_pub_upgrade + name: scratch_space; dart pub upgrade run: dart pub upgrade if: "always() && steps.checkout.conclusion == 'success'" - working-directory: build_test - - name: "build_test; dart test --test-randomize-ordering-seed=random" + working-directory: scratch_space + - name: "scratch_space; dart test --test-randomize-ordering-seed=random" run: "dart test --test-randomize-ordering-seed=random" - if: "always() && steps.build_test_pub_upgrade.conclusion == 'success'" - working-directory: build_test + if: "always() && steps.scratch_space_pub_upgrade.conclusion == 'success'" + working-directory: scratch_space needs: - job_001 - job_002 @@ -1368,25 +1368,25 @@ jobs: - job_008 - job_009 job_034: - name: "unit_test; windows; Dart 3.5.0; PKG: scratch_space; `dart test --test-randomize-ordering-seed=random`" + name: "unit_test; windows; Dart 3.6.0-165.0.dev; PKG: build_resolvers; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.5.0" + sdk: "3.6.0-165.0.dev" - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 - - id: scratch_space_pub_upgrade - name: scratch_space; dart pub upgrade + - id: build_resolvers_pub_upgrade + name: build_resolvers; dart pub upgrade run: dart pub upgrade if: "always() && steps.checkout.conclusion == 'success'" - working-directory: scratch_space - - name: "scratch_space; dart test --test-randomize-ordering-seed=random" + working-directory: build_resolvers + - name: "build_resolvers; dart test --test-randomize-ordering-seed=random" run: "dart test --test-randomize-ordering-seed=random" - if: "always() && steps.scratch_space_pub_upgrade.conclusion == 'success'" - working-directory: scratch_space + if: "always() && steps.build_resolvers_pub_upgrade.conclusion == 'success'" + working-directory: build_resolvers needs: - job_001 - job_002 @@ -1398,7 +1398,7 @@ jobs: - job_008 - job_009 job_035: - name: "unit_test; windows; Dart 3.6.0-165.0.dev; PKG: build_resolvers; `dart test --test-randomize-ordering-seed=random`" + name: "unit_test; windows; Dart 3.6.0-165.0.dev; PKG: build_runner_core; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: - name: Setup Dart SDK @@ -1408,15 +1408,15 @@ jobs: - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 - - id: build_resolvers_pub_upgrade - name: build_resolvers; dart pub upgrade + - id: build_runner_core_pub_upgrade + name: build_runner_core; dart pub upgrade run: dart pub upgrade if: "always() && steps.checkout.conclusion == 'success'" - working-directory: build_resolvers - - name: "build_resolvers; dart test --test-randomize-ordering-seed=random" + working-directory: build_runner_core + - name: "build_runner_core; dart test --test-randomize-ordering-seed=random" run: "dart test --test-randomize-ordering-seed=random" - if: "always() && steps.build_resolvers_pub_upgrade.conclusion == 'success'" - working-directory: build_resolvers + if: "always() && steps.build_runner_core_pub_upgrade.conclusion == 'success'" + working-directory: build_runner_core needs: - job_001 - job_002 diff --git a/build_runner_core/pubspec.yaml b/build_runner_core/pubspec.yaml index d0677bc70..d42a682f3 100644 --- a/build_runner_core/pubspec.yaml +++ b/build_runner_core/pubspec.yaml @@ -2,10 +2,13 @@ name: build_runner_core version: 7.3.3-wip description: Core tools to organize the structure of a build and run Builders. repository: https://github.com/dart-lang/build/tree/master/build_runner_core -resolution: workspace + +# This package can't be part of the workspace because it requires a very recent +# Dart SDK - see the top-level pubspec for details. +#resolution: workspace environment: - sdk: ^3.5.0 + sdk: ^3.6.0-165.0.dev platforms: linux: diff --git a/pubspec.yaml b/pubspec.yaml index af028a0d7..59050be68 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -21,7 +21,7 @@ workspace: - build_modules # - build_resolvers - build_runner -- build_runner_core +# - build_runner_core - build_test #- build_web_compilers - example From 98f16053dd94d4c528af7eb2beb2bbdbf6476261 Mon Sep 17 00:00:00 2001 From: Jake Macdonald Date: Tue, 8 Oct 2024 19:21:50 +0000 Subject: [PATCH 07/17] require a newer SDK, regenerate mono_repo config --- .github/workflows/dart.yml | 38 +++++++++++++++++----------------- _test/pubspec.yaml | 2 +- build_resolvers/pubspec.yaml | 2 +- build_runner_core/pubspec.yaml | 2 +- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index b15f146e6..55b475003 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -130,23 +130,23 @@ jobs: if: "always() && steps.scratch_space_pub_upgrade.conclusion == 'success'" working-directory: scratch_space job_004: - name: "analyze_and_format; linux; Dart 3.6.0-165.0.dev; PKG: build_resolvers; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos .`" + name: "analyze_and_format; linux; Dart 3.6.0-217.0.dev; 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@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-165.0.dev;packages:build_resolvers;commands:format-analyze" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-217.0.dev;packages:build_resolvers;commands:format-analyze" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-165.0.dev;packages:build_resolvers - os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-165.0.dev + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-217.0.dev;packages:build_resolvers + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-217.0.dev os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.6.0-165.0.dev" + sdk: "3.6.0-217.0.dev" - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 @@ -608,23 +608,23 @@ jobs: - job_008 - job_009 job_014: - name: "unit_test; linux; Dart 3.6.0-165.0.dev; PKG: build_resolvers; `dart test --test-randomize-ordering-seed=random`" + name: "unit_test; linux; Dart 3.6.0-217.0.dev; PKG: build_resolvers; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-165.0.dev;packages:build_resolvers;commands:test_04" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-217.0.dev;packages:build_resolvers;commands:test_04" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-165.0.dev;packages:build_resolvers - os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-165.0.dev + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-217.0.dev;packages:build_resolvers + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-217.0.dev os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.6.0-165.0.dev" + sdk: "3.6.0-217.0.dev" - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 @@ -648,23 +648,23 @@ jobs: - job_008 - job_009 job_015: - name: "unit_test; linux; Dart 3.6.0-165.0.dev; PKG: build_runner_core; `dart test --test-randomize-ordering-seed=random`" + name: "unit_test; linux; Dart 3.6.0-217.0.dev; PKG: build_runner_core; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-165.0.dev;packages:build_runner_core;commands:test_04" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-217.0.dev;packages:build_runner_core;commands:test_04" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-165.0.dev;packages:build_runner_core - os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-165.0.dev + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-217.0.dev;packages:build_runner_core + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-217.0.dev os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.6.0-165.0.dev" + sdk: "3.6.0-217.0.dev" - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 @@ -1368,13 +1368,13 @@ jobs: - job_008 - job_009 job_034: - name: "unit_test; windows; Dart 3.6.0-165.0.dev; PKG: build_resolvers; `dart test --test-randomize-ordering-seed=random`" + name: "unit_test; windows; Dart 3.6.0-217.0.dev; PKG: build_resolvers; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.6.0-165.0.dev" + sdk: "3.6.0-217.0.dev" - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 @@ -1398,13 +1398,13 @@ jobs: - job_008 - job_009 job_035: - name: "unit_test; windows; Dart 3.6.0-165.0.dev; PKG: build_runner_core; `dart test --test-randomize-ordering-seed=random`" + name: "unit_test; windows; Dart 3.6.0-217.0.dev; PKG: build_runner_core; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.6.0-165.0.dev" + sdk: "3.6.0-217.0.dev" - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 diff --git a/_test/pubspec.yaml b/_test/pubspec.yaml index 01ffbdf1c..5f6385039 100644 --- a/_test/pubspec.yaml +++ b/_test/pubspec.yaml @@ -6,7 +6,7 @@ publish_to: none #resolution: workspace environment: - sdk: ^3.6.0-165.0.dev + sdk: ^3.6.0-217.0.dev dependencies: web: ^1.0.0 diff --git a/build_resolvers/pubspec.yaml b/build_resolvers/pubspec.yaml index 22e0c91fd..feca8789b 100644 --- a/build_resolvers/pubspec.yaml +++ b/build_resolvers/pubspec.yaml @@ -8,7 +8,7 @@ repository: https://github.com/dart-lang/build/tree/master/build_resolvers #resolution: workspace environment: - sdk: ^3.6.0-165.0.dev + sdk: ^3.6.0-217.0.dev dependencies: analyzer: ^6.9.0 diff --git a/build_runner_core/pubspec.yaml b/build_runner_core/pubspec.yaml index d42a682f3..d579b67d1 100644 --- a/build_runner_core/pubspec.yaml +++ b/build_runner_core/pubspec.yaml @@ -8,7 +8,7 @@ repository: https://github.com/dart-lang/build/tree/master/build_runner_core #resolution: workspace environment: - sdk: ^3.6.0-165.0.dev + sdk: ^3.6.0-217.0.dev platforms: linux: From 317c07c3207332e5aa33d0ef3224e3a44f6bd248 Mon Sep 17 00:00:00 2001 From: Jake Macdonald Date: Tue, 8 Oct 2024 19:29:27 +0000 Subject: [PATCH 08/17] fix more deprecations, remove build from the workspace --- .github/workflows/dart.yml | 194 +++++++++---------- build/CHANGELOG.md | 4 +- build/pubspec.yaml | 8 +- build/test/builder/build_step_impl_test.dart | 8 +- build_runner_core/CHANGELOG.md | 2 + pubspec.yaml | 2 +- 6 files changed, 114 insertions(+), 104 deletions(-) diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index 55b475003..6587a4f91 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -40,36 +40,6 @@ jobs: - name: mono_repo self validate run: dart pub global run mono_repo generate --validate job_002: - name: "analyze_and_format; linux; Dart 3.5.0; PKG: build; `dart analyze --fatal-infos .`" - runs-on: ubuntu-latest - steps: - - name: Cache Pub hosted dependencies - uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 - with: - path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:build;commands:analyze" - restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:build - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0 - os:ubuntu-latest;pub-cache-hosted - os:ubuntu-latest - - name: Setup Dart SDK - uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 - with: - sdk: "3.5.0" - - id: checkout - name: Checkout repository - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 - - id: build_pub_upgrade - name: build; dart pub upgrade - run: dart pub upgrade - if: "always() && steps.checkout.conclusion == 'success'" - working-directory: build - - name: "build; dart analyze --fatal-infos ." - run: dart analyze --fatal-infos . - if: "always() && steps.build_pub_upgrade.conclusion == 'success'" - working-directory: build - job_003: name: "analyze_and_format; linux; Dart 3.5.0; PKGS: build_test, example, scratch_space; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos .`" runs-on: ubuntu-latest steps: @@ -129,6 +99,36 @@ jobs: run: dart analyze --fatal-infos . if: "always() && steps.scratch_space_pub_upgrade.conclusion == 'success'" working-directory: scratch_space + job_003: + name: "analyze_and_format; linux; Dart 3.6.0-217.0.dev; PKG: build; `dart analyze --fatal-infos .`" + runs-on: ubuntu-latest + steps: + - name: Cache Pub hosted dependencies + uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 + with: + path: "~/.pub-cache/hosted" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-217.0.dev;packages:build;commands:analyze" + restore-keys: | + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-217.0.dev;packages:build + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-217.0.dev + os:ubuntu-latest;pub-cache-hosted + os:ubuntu-latest + - name: Setup Dart SDK + uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 + with: + sdk: "3.6.0-217.0.dev" + - id: checkout + name: Checkout repository + uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 + - id: build_pub_upgrade + name: build; dart pub upgrade + run: dart pub upgrade + if: "always() && steps.checkout.conclusion == 'success'" + working-directory: build + - name: "build; dart analyze --fatal-infos ." + run: dart analyze --fatal-infos . + if: "always() && steps.build_pub_upgrade.conclusion == 'success'" + working-directory: build job_004: name: "analyze_and_format; linux; Dart 3.6.0-217.0.dev; PKG: build_resolvers; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos .`" runs-on: ubuntu-latest @@ -448,16 +448,16 @@ jobs: if: "always() && steps.build_web_compilers_pub_upgrade.conclusion == 'success'" working-directory: build_web_compilers job_010: - name: "unit_test; linux; Dart 3.5.0; PKG: build; `dart test --test-randomize-ordering-seed=random`" + name: "unit_test; linux; Dart 3.5.0; PKG: build_daemon; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:build;commands:test_04" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:build_daemon;commands:test_04" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:build + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:build_daemon os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest @@ -468,15 +468,15 @@ jobs: - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 - - id: build_pub_upgrade - name: build; dart pub upgrade + - id: build_daemon_pub_upgrade + name: build_daemon; dart pub upgrade run: dart pub upgrade if: "always() && steps.checkout.conclusion == 'success'" - working-directory: build - - name: "build; dart test --test-randomize-ordering-seed=random" + working-directory: build_daemon + - name: "build_daemon; dart test --test-randomize-ordering-seed=random" run: "dart test --test-randomize-ordering-seed=random" - if: "always() && steps.build_pub_upgrade.conclusion == 'success'" - working-directory: build + if: "always() && steps.build_daemon_pub_upgrade.conclusion == 'success'" + working-directory: build_daemon needs: - job_001 - job_002 @@ -488,16 +488,16 @@ jobs: - job_008 - job_009 job_011: - name: "unit_test; linux; Dart 3.5.0; PKG: build_daemon; `dart test --test-randomize-ordering-seed=random`" + name: "unit_test; linux; Dart 3.5.0; PKG: build_test; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:build_daemon;commands:test_04" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:build_test;commands:test_04" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:build_daemon + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:build_test os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest @@ -508,15 +508,15 @@ jobs: - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 - - id: build_daemon_pub_upgrade - name: build_daemon; dart pub upgrade + - id: build_test_pub_upgrade + name: build_test; dart pub upgrade run: dart pub upgrade if: "always() && steps.checkout.conclusion == 'success'" - working-directory: build_daemon - - name: "build_daemon; dart test --test-randomize-ordering-seed=random" + working-directory: build_test + - name: "build_test; dart test --test-randomize-ordering-seed=random" run: "dart test --test-randomize-ordering-seed=random" - if: "always() && steps.build_daemon_pub_upgrade.conclusion == 'success'" - working-directory: build_daemon + if: "always() && steps.build_test_pub_upgrade.conclusion == 'success'" + working-directory: build_test needs: - job_001 - job_002 @@ -528,16 +528,16 @@ jobs: - job_008 - job_009 job_012: - name: "unit_test; linux; Dart 3.5.0; PKG: build_test; `dart test --test-randomize-ordering-seed=random`" + name: "unit_test; linux; Dart 3.5.0; PKG: scratch_space; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:build_test;commands:test_04" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:scratch_space;commands:test_04" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:build_test + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:scratch_space os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest @@ -548,15 +548,15 @@ jobs: - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 - - id: build_test_pub_upgrade - name: build_test; dart pub upgrade + - id: scratch_space_pub_upgrade + name: scratch_space; dart pub upgrade run: dart pub upgrade if: "always() && steps.checkout.conclusion == 'success'" - working-directory: build_test - - name: "build_test; dart test --test-randomize-ordering-seed=random" + working-directory: scratch_space + - name: "scratch_space; dart test --test-randomize-ordering-seed=random" run: "dart test --test-randomize-ordering-seed=random" - if: "always() && steps.build_test_pub_upgrade.conclusion == 'success'" - working-directory: build_test + if: "always() && steps.scratch_space_pub_upgrade.conclusion == 'success'" + working-directory: scratch_space needs: - job_001 - job_002 @@ -568,35 +568,35 @@ jobs: - job_008 - job_009 job_013: - name: "unit_test; linux; Dart 3.5.0; PKG: scratch_space; `dart test --test-randomize-ordering-seed=random`" + name: "unit_test; linux; Dart 3.6.0-217.0.dev; PKG: build; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:scratch_space;commands:test_04" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-217.0.dev;packages:build;commands:test_04" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:scratch_space - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-217.0.dev;packages:build + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-217.0.dev os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.5.0" + sdk: "3.6.0-217.0.dev" - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 - - id: scratch_space_pub_upgrade - name: scratch_space; dart pub upgrade + - id: build_pub_upgrade + name: build; dart pub upgrade run: dart pub upgrade if: "always() && steps.checkout.conclusion == 'success'" - working-directory: scratch_space - - name: "scratch_space; dart test --test-randomize-ordering-seed=random" + working-directory: build + - name: "build; dart test --test-randomize-ordering-seed=random" run: "dart test --test-randomize-ordering-seed=random" - if: "always() && steps.scratch_space_pub_upgrade.conclusion == 'success'" - working-directory: scratch_space + if: "always() && steps.build_pub_upgrade.conclusion == 'success'" + working-directory: build needs: - job_001 - job_002 @@ -1248,7 +1248,7 @@ jobs: - job_008 - job_009 job_030: - name: "unit_test; windows; Dart 3.5.0; PKG: build; `dart test --test-randomize-ordering-seed=random`" + name: "unit_test; windows; Dart 3.5.0; PKG: build_daemon; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: - name: Setup Dart SDK @@ -1258,15 +1258,15 @@ jobs: - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 - - id: build_pub_upgrade - name: build; dart pub upgrade + - id: build_daemon_pub_upgrade + name: build_daemon; dart pub upgrade run: dart pub upgrade if: "always() && steps.checkout.conclusion == 'success'" - working-directory: build - - name: "build; dart test --test-randomize-ordering-seed=random" + working-directory: build_daemon + - name: "build_daemon; dart test --test-randomize-ordering-seed=random" run: "dart test --test-randomize-ordering-seed=random" - if: "always() && steps.build_pub_upgrade.conclusion == 'success'" - working-directory: build + if: "always() && steps.build_daemon_pub_upgrade.conclusion == 'success'" + working-directory: build_daemon needs: - job_001 - job_002 @@ -1278,7 +1278,7 @@ jobs: - job_008 - job_009 job_031: - name: "unit_test; windows; Dart 3.5.0; PKG: build_daemon; `dart test --test-randomize-ordering-seed=random`" + name: "unit_test; windows; Dart 3.5.0; PKG: build_test; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: - name: Setup Dart SDK @@ -1288,15 +1288,15 @@ jobs: - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 - - id: build_daemon_pub_upgrade - name: build_daemon; dart pub upgrade + - id: build_test_pub_upgrade + name: build_test; dart pub upgrade run: dart pub upgrade if: "always() && steps.checkout.conclusion == 'success'" - working-directory: build_daemon - - name: "build_daemon; dart test --test-randomize-ordering-seed=random" + working-directory: build_test + - name: "build_test; dart test --test-randomize-ordering-seed=random" run: "dart test --test-randomize-ordering-seed=random" - if: "always() && steps.build_daemon_pub_upgrade.conclusion == 'success'" - working-directory: build_daemon + if: "always() && steps.build_test_pub_upgrade.conclusion == 'success'" + working-directory: build_test needs: - job_001 - job_002 @@ -1308,7 +1308,7 @@ jobs: - job_008 - job_009 job_032: - name: "unit_test; windows; Dart 3.5.0; PKG: build_test; `dart test --test-randomize-ordering-seed=random`" + name: "unit_test; windows; Dart 3.5.0; PKG: scratch_space; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: - name: Setup Dart SDK @@ -1318,15 +1318,15 @@ jobs: - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 - - id: build_test_pub_upgrade - name: build_test; dart pub upgrade + - id: scratch_space_pub_upgrade + name: scratch_space; dart pub upgrade run: dart pub upgrade if: "always() && steps.checkout.conclusion == 'success'" - working-directory: build_test - - name: "build_test; dart test --test-randomize-ordering-seed=random" + working-directory: scratch_space + - name: "scratch_space; dart test --test-randomize-ordering-seed=random" run: "dart test --test-randomize-ordering-seed=random" - if: "always() && steps.build_test_pub_upgrade.conclusion == 'success'" - working-directory: build_test + if: "always() && steps.scratch_space_pub_upgrade.conclusion == 'success'" + working-directory: scratch_space needs: - job_001 - job_002 @@ -1338,25 +1338,25 @@ jobs: - job_008 - job_009 job_033: - name: "unit_test; windows; Dart 3.5.0; PKG: scratch_space; `dart test --test-randomize-ordering-seed=random`" + name: "unit_test; windows; Dart 3.6.0-217.0.dev; PKG: build; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.5.0" + sdk: "3.6.0-217.0.dev" - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 - - id: scratch_space_pub_upgrade - name: scratch_space; dart pub upgrade + - id: build_pub_upgrade + name: build; dart pub upgrade run: dart pub upgrade if: "always() && steps.checkout.conclusion == 'success'" - working-directory: scratch_space - - name: "scratch_space; dart test --test-randomize-ordering-seed=random" + working-directory: build + - name: "build; dart test --test-randomize-ordering-seed=random" run: "dart test --test-randomize-ordering-seed=random" - if: "always() && steps.scratch_space_pub_upgrade.conclusion == 'success'" - working-directory: scratch_space + if: "always() && steps.build_pub_upgrade.conclusion == 'success'" + working-directory: build needs: - job_001 - job_002 diff --git a/build/CHANGELOG.md b/build/CHANGELOG.md index 2dab8faff..181a40418 100644 --- a/build/CHANGELOG.md +++ b/build/CHANGELOG.md @@ -1,8 +1,10 @@ ## 2.4.2-wip -- Bump the min sdk to 3.5.0. +- Bump the min sdk to 3.6.0-217.0.dev. - Remove some unnecessary casts and non-null assertions now that we have private field promotion. +- Require analyzer ^6.9.0. +- Fix analyzer deprecations. ## 2.4.1 diff --git a/build/pubspec.yaml b/build/pubspec.yaml index cc3a3177f..63f844749 100644 --- a/build/pubspec.yaml +++ b/build/pubspec.yaml @@ -4,11 +4,15 @@ description: A package for authoring build_runner compatible code generators. repository: https://github.com/dart-lang/build/tree/master/build resolution: workspace +# This package can't be part of the workspace because it requires a very recent +# Dart SDK - see the top-level pubspec for details. +#resolution: workspace + environment: - sdk: ^3.5.0 + sdk: ^3.6.0-217.0.dev dependencies: - analyzer: ">=1.5.0 <7.0.0" + analyzer: ^6.9.0 async: ^2.5.0 convert: ^3.0.0 crypto: ^3.0.0 diff --git a/build/test/builder/build_step_impl_test.dart b/build/test/builder/build_step_impl_test.dart index 9115c75bc..098db68a9 100644 --- a/build/test/builder/build_step_impl_test.dart +++ b/build/test/builder/build_step_impl_test.dart @@ -128,13 +128,15 @@ void main() { var aLib = await resolver.libraryFor(primary); expect(aLib.name, 'a'); - expect(aLib.importedLibraries.length, 2); - expect(aLib.importedLibraries.any((library) => library.name == 'b'), + expect(aLib.definingCompilationUnit.libraryImports.length, 2); + expect( + aLib.definingCompilationUnit.libraryImports + .any((import) => import.library.name == 'b'), isTrue); var bLib = await resolver.findLibraryByName('b'); expect(bLib!.name, 'b'); - expect(bLib.importedLibraries.length, 1); + expect(bLib.definingCompilationUnit.libraryImports.length, 1); await buildStep.complete(); }); diff --git a/build_runner_core/CHANGELOG.md b/build_runner_core/CHANGELOG.md index af9505d8a..487cad35b 100644 --- a/build_runner_core/CHANGELOG.md +++ b/build_runner_core/CHANGELOG.md @@ -1,6 +1,8 @@ ## 7.3.3-wip - Bump the min sdk to 3.5.0. +- Require analyzer ^6.9.0. +- Fix analyzer deprecations. ## 7.3.2 diff --git a/pubspec.yaml b/pubspec.yaml index 59050be68..66d17e67c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -15,7 +15,7 @@ workspace: #- _test #- _test/pkgs/provides_builder - _test_common -- build +# - build - build_config - build_daemon - build_modules From 3e598fa88b905ce84c6d7ada7c07a180fe40b284 Mon Sep 17 00:00:00 2001 From: Jake Macdonald Date: Tue, 8 Oct 2024 19:33:40 +0000 Subject: [PATCH 09/17] actually require 3.6.0-228.0.dev --- .github/workflows/dart.yml | 62 +++++++++++++++++----------------- _test/pubspec.yaml | 2 +- build/CHANGELOG.md | 2 +- build/pubspec.yaml | 2 +- build_resolvers/CHANGELOG.md | 2 +- build_resolvers/pubspec.yaml | 2 +- build_runner_core/CHANGELOG.md | 2 +- build_runner_core/pubspec.yaml | 2 +- 8 files changed, 38 insertions(+), 38 deletions(-) diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index 6587a4f91..73c044bd7 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -100,23 +100,23 @@ jobs: if: "always() && steps.scratch_space_pub_upgrade.conclusion == 'success'" working-directory: scratch_space job_003: - name: "analyze_and_format; linux; Dart 3.6.0-217.0.dev; PKG: build; `dart analyze --fatal-infos .`" + name: "analyze_and_format; linux; Dart 3.6.0-228.0.dev; PKG: build; `dart analyze --fatal-infos .`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-217.0.dev;packages:build;commands:analyze" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-228.0.dev;packages:build;commands:analyze" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-217.0.dev;packages:build - os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-217.0.dev + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-228.0.dev;packages:build + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-228.0.dev os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.6.0-217.0.dev" + sdk: "3.6.0-228.0.dev" - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 @@ -130,23 +130,23 @@ jobs: if: "always() && steps.build_pub_upgrade.conclusion == 'success'" working-directory: build job_004: - name: "analyze_and_format; linux; Dart 3.6.0-217.0.dev; PKG: build_resolvers; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos .`" + name: "analyze_and_format; linux; Dart 3.6.0-228.0.dev; 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@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-217.0.dev;packages:build_resolvers;commands:format-analyze" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-228.0.dev;packages:build_resolvers;commands:format-analyze" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-217.0.dev;packages:build_resolvers - os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-217.0.dev + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-228.0.dev;packages:build_resolvers + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-228.0.dev os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.6.0-217.0.dev" + sdk: "3.6.0-228.0.dev" - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 @@ -568,23 +568,23 @@ jobs: - job_008 - job_009 job_013: - name: "unit_test; linux; Dart 3.6.0-217.0.dev; PKG: build; `dart test --test-randomize-ordering-seed=random`" + name: "unit_test; linux; Dart 3.6.0-228.0.dev; PKG: build; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-217.0.dev;packages:build;commands:test_04" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-228.0.dev;packages:build;commands:test_04" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-217.0.dev;packages:build - os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-217.0.dev + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-228.0.dev;packages:build + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-228.0.dev os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.6.0-217.0.dev" + sdk: "3.6.0-228.0.dev" - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 @@ -608,23 +608,23 @@ jobs: - job_008 - job_009 job_014: - name: "unit_test; linux; Dart 3.6.0-217.0.dev; PKG: build_resolvers; `dart test --test-randomize-ordering-seed=random`" + name: "unit_test; linux; Dart 3.6.0-228.0.dev; PKG: build_resolvers; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-217.0.dev;packages:build_resolvers;commands:test_04" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-228.0.dev;packages:build_resolvers;commands:test_04" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-217.0.dev;packages:build_resolvers - os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-217.0.dev + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-228.0.dev;packages:build_resolvers + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-228.0.dev os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.6.0-217.0.dev" + sdk: "3.6.0-228.0.dev" - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 @@ -648,23 +648,23 @@ jobs: - job_008 - job_009 job_015: - name: "unit_test; linux; Dart 3.6.0-217.0.dev; PKG: build_runner_core; `dart test --test-randomize-ordering-seed=random`" + name: "unit_test; linux; Dart 3.6.0-228.0.dev; PKG: build_runner_core; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-217.0.dev;packages:build_runner_core;commands:test_04" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-228.0.dev;packages:build_runner_core;commands:test_04" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-217.0.dev;packages:build_runner_core - os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-217.0.dev + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-228.0.dev;packages:build_runner_core + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-228.0.dev os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.6.0-217.0.dev" + sdk: "3.6.0-228.0.dev" - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 @@ -1338,13 +1338,13 @@ jobs: - job_008 - job_009 job_033: - name: "unit_test; windows; Dart 3.6.0-217.0.dev; PKG: build; `dart test --test-randomize-ordering-seed=random`" + name: "unit_test; windows; Dart 3.6.0-228.0.dev; PKG: build; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.6.0-217.0.dev" + sdk: "3.6.0-228.0.dev" - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 @@ -1368,13 +1368,13 @@ jobs: - job_008 - job_009 job_034: - name: "unit_test; windows; Dart 3.6.0-217.0.dev; PKG: build_resolvers; `dart test --test-randomize-ordering-seed=random`" + name: "unit_test; windows; Dart 3.6.0-228.0.dev; PKG: build_resolvers; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.6.0-217.0.dev" + sdk: "3.6.0-228.0.dev" - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 @@ -1398,13 +1398,13 @@ jobs: - job_008 - job_009 job_035: - name: "unit_test; windows; Dart 3.6.0-217.0.dev; PKG: build_runner_core; `dart test --test-randomize-ordering-seed=random`" + name: "unit_test; windows; Dart 3.6.0-228.0.dev; PKG: build_runner_core; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.6.0-217.0.dev" + sdk: "3.6.0-228.0.dev" - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 diff --git a/_test/pubspec.yaml b/_test/pubspec.yaml index 5f6385039..bd736d1e9 100644 --- a/_test/pubspec.yaml +++ b/_test/pubspec.yaml @@ -6,7 +6,7 @@ publish_to: none #resolution: workspace environment: - sdk: ^3.6.0-217.0.dev + sdk: ^3.6.0-228.0.dev dependencies: web: ^1.0.0 diff --git a/build/CHANGELOG.md b/build/CHANGELOG.md index 181a40418..bd4b9ae70 100644 --- a/build/CHANGELOG.md +++ b/build/CHANGELOG.md @@ -1,6 +1,6 @@ ## 2.4.2-wip -- Bump the min sdk to 3.6.0-217.0.dev. +- Bump the min sdk to 3.6.0-228.0.dev. - Remove some unnecessary casts and non-null assertions now that we have private field promotion. - Require analyzer ^6.9.0. diff --git a/build/pubspec.yaml b/build/pubspec.yaml index 63f844749..080d338ff 100644 --- a/build/pubspec.yaml +++ b/build/pubspec.yaml @@ -9,7 +9,7 @@ resolution: workspace #resolution: workspace environment: - sdk: ^3.6.0-217.0.dev + sdk: ^3.6.0-228.0.dev dependencies: analyzer: ^6.9.0 diff --git a/build_resolvers/CHANGELOG.md b/build_resolvers/CHANGELOG.md index ccda8e908..38f15d4ef 100644 --- a/build_resolvers/CHANGELOG.md +++ b/build_resolvers/CHANGELOG.md @@ -2,7 +2,7 @@ - Require the latest analyzer, and stop passing the `withNullability` parameter which was previously required and is now deprecated. -- Bump the min sdk to 3.5.0. +- Bump the min sdk to 3.6.0-228.0.dev. - Fix SDK summary reads when multiple isolates are using build resolvers (not recommended). - Fix analyzer deprecations. diff --git a/build_resolvers/pubspec.yaml b/build_resolvers/pubspec.yaml index feca8789b..1ab821e58 100644 --- a/build_resolvers/pubspec.yaml +++ b/build_resolvers/pubspec.yaml @@ -8,7 +8,7 @@ repository: https://github.com/dart-lang/build/tree/master/build_resolvers #resolution: workspace environment: - sdk: ^3.6.0-217.0.dev + sdk: ^3.6.0-228.0.dev dependencies: analyzer: ^6.9.0 diff --git a/build_runner_core/CHANGELOG.md b/build_runner_core/CHANGELOG.md index 487cad35b..830645e32 100644 --- a/build_runner_core/CHANGELOG.md +++ b/build_runner_core/CHANGELOG.md @@ -1,6 +1,6 @@ ## 7.3.3-wip -- Bump the min sdk to 3.5.0. +- Bump the min sdk to 3.6.0-dev.228. - Require analyzer ^6.9.0. - Fix analyzer deprecations. diff --git a/build_runner_core/pubspec.yaml b/build_runner_core/pubspec.yaml index d579b67d1..2bdd55822 100644 --- a/build_runner_core/pubspec.yaml +++ b/build_runner_core/pubspec.yaml @@ -8,7 +8,7 @@ repository: https://github.com/dart-lang/build/tree/master/build_runner_core #resolution: workspace environment: - sdk: ^3.6.0-217.0.dev + sdk: ^3.6.0-228.0.dev platforms: linux: From 47fd30478d92c233a319ec305118c290f4daeb1c Mon Sep 17 00:00:00 2001 From: Jake Macdonald Date: Tue, 8 Oct 2024 19:34:11 +0000 Subject: [PATCH 10/17] actually remove resolution:workspace from build --- build/pubspec.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/build/pubspec.yaml b/build/pubspec.yaml index 080d338ff..aff731afe 100644 --- a/build/pubspec.yaml +++ b/build/pubspec.yaml @@ -2,7 +2,6 @@ name: build version: 2.4.2-wip description: A package for authoring build_runner compatible code generators. repository: https://github.com/dart-lang/build/tree/master/build -resolution: workspace # This package can't be part of the workspace because it requires a very recent # Dart SDK - see the top-level pubspec for details. From c85be04806036b7d108ee2b6c0c07d369ee04b79 Mon Sep 17 00:00:00 2001 From: Jake Macdonald Date: Tue, 8 Oct 2024 19:35:56 +0000 Subject: [PATCH 11/17] add missing dart_flutter_team_lints dependencies --- build/pubspec.yaml | 1 + build_resolvers/pubspec.yaml | 1 + build_runner_core/pubspec.yaml | 1 + 3 files changed, 3 insertions(+) diff --git a/build/pubspec.yaml b/build/pubspec.yaml index aff731afe..be3e1535a 100644 --- a/build/pubspec.yaml +++ b/build/pubspec.yaml @@ -24,6 +24,7 @@ dependencies: dev_dependencies: build_resolvers: ^2.4.0 build_test: ^2.0.0 + dart_flutter_team_lints: ^3.1.0 test: ^1.16.0 topics: diff --git a/build_resolvers/pubspec.yaml b/build_resolvers/pubspec.yaml index 1ab821e58..2e42bd1ce 100644 --- a/build_resolvers/pubspec.yaml +++ b/build_resolvers/pubspec.yaml @@ -28,6 +28,7 @@ dependencies: dev_dependencies: build_test: ^2.0.0 + dart_flutter_team_lints: ^3.1.0 test: ^1.16.0 topics: diff --git a/build_runner_core/pubspec.yaml b/build_runner_core/pubspec.yaml index 2bdd55822..8911cf0aa 100644 --- a/build_runner_core/pubspec.yaml +++ b/build_runner_core/pubspec.yaml @@ -41,6 +41,7 @@ dev_dependencies: analyzer: ^6.9.0 build_runner: ^2.0.0 build_test: ^2.0.0 + dart_flutter_team_lints: ^3.1.0 json_serializable: ^6.0.0 test: ^1.16.0 test_descriptor: ^2.0.0 From 10991b9c3ec6daf62e9c5d2c5ff4062f7b87d58e Mon Sep 17 00:00:00 2001 From: Jake Macdonald Date: Tue, 8 Oct 2024 19:40:31 +0000 Subject: [PATCH 12/17] fix build_web_compilers and build_modules constraints to allow 3.7.0 dev releases --- build_modules/CHANGELOG.md | 1 + build_modules/pubspec.yaml | 2 +- build_web_compilers/CHANGELOG.md | 4 ++++ build_web_compilers/pubspec.yaml | 4 ++-- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/build_modules/CHANGELOG.md b/build_modules/CHANGELOG.md index fd09cedb3..9f239e9ed 100644 --- a/build_modules/CHANGELOG.md +++ b/build_modules/CHANGELOG.md @@ -1,6 +1,7 @@ ## 5.0.10-wip - Bump the min sdk to 3.5.0. +- Support 3.7.0 pre-release sdks. ## 5.0.9 diff --git a/build_modules/pubspec.yaml b/build_modules/pubspec.yaml index 095545f07..0cace077e 100644 --- a/build_modules/pubspec.yaml +++ b/build_modules/pubspec.yaml @@ -7,7 +7,7 @@ repository: https://github.com/dart-lang/build/tree/master/build_modules resolution: workspace environment: - sdk: '>=3.5.0 <3.7.0' + sdk: '>=3.5.0 <3.7.0-z' dependencies: analyzer: '>=5.1.0 <7.0.0' diff --git a/build_web_compilers/CHANGELOG.md b/build_web_compilers/CHANGELOG.md index 3bc8c58d9..91de97ad3 100644 --- a/build_web_compilers/CHANGELOG.md +++ b/build_web_compilers/CHANGELOG.md @@ -1,3 +1,7 @@ +## 4.1.0-wip + +- Support 3.7.0 pre-release sdks. + ## 4.1.0-beta.2 - Add source maps for dart2wasm builds. diff --git a/build_web_compilers/pubspec.yaml b/build_web_compilers/pubspec.yaml index 0e6598e01..a6dfbc3d1 100644 --- a/build_web_compilers/pubspec.yaml +++ b/build_web_compilers/pubspec.yaml @@ -1,5 +1,5 @@ name: build_web_compilers -version: 4.1.0-beta.2 +version: 4.1.0-wip description: Builder implementations wrapping the dart2js and DDC compilers. repository: https://github.com/dart-lang/build/tree/master/build_web_compilers # This package can't be part of the workspace because it requires a very recent @@ -7,7 +7,7 @@ repository: https://github.com/dart-lang/build/tree/master/build_web_compilers #resolution: workspace environment: - sdk: ^3.6.0-165.0.dev + sdk: '>=3.6.0-165.0.dev <3.7.0-z' dependencies: analyzer: '>=5.1.0 <7.0.0' From 47fefe59d7016e254e73f6bf6a0a4ed76e14bc4a Mon Sep 17 00:00:00 2001 From: Jake Macdonald Date: Tue, 8 Oct 2024 19:44:32 +0000 Subject: [PATCH 13/17] override build_modules in build_web_compilers --- build_web_compilers/pubspec.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build_web_compilers/pubspec.yaml b/build_web_compilers/pubspec.yaml index a6dfbc3d1..46f2df4c4 100644 --- a/build_web_compilers/pubspec.yaml +++ b/build_web_compilers/pubspec.yaml @@ -42,5 +42,10 @@ dev_dependencies: test: ^1.16.0 yaml: ^3.1.0 +# TODO: remove once this package is back in the workspace +dependency_overrides: + build_modules: + path: ../build_modules + topics: - build-runner From d142fd83d00e8615d78371341d89f0c05a6ba289 Mon Sep 17 00:00:00 2001 From: Jake Macdonald Date: Tue, 8 Oct 2024 19:59:41 +0000 Subject: [PATCH 14/17] fix build_step_impl_test.dart --- build/test/builder/build_step_impl_test.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/test/builder/build_step_impl_test.dart b/build/test/builder/build_step_impl_test.dart index 098db68a9..315f6f140 100644 --- a/build/test/builder/build_step_impl_test.dart +++ b/build/test/builder/build_step_impl_test.dart @@ -131,7 +131,7 @@ void main() { expect(aLib.definingCompilationUnit.libraryImports.length, 2); expect( aLib.definingCompilationUnit.libraryImports - .any((import) => import.library.name == 'b'), + .any((import) => import.importedLibrary!.name == 'b'), isTrue); var bLib = await resolver.findLibraryByName('b'); From ccfb8f8f81781d2d0d2dfcddc47efc3f85f10699 Mon Sep 17 00:00:00 2001 From: Jake Macdonald Date: Tue, 8 Oct 2024 20:34:49 +0000 Subject: [PATCH 15/17] fix resolver tests --- build_resolvers/lib/src/resolver.dart | 5 +++-- build_resolvers/test/resolver_test.dart | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/build_resolvers/lib/src/resolver.dart b/build_resolvers/lib/src/resolver.dart index d0d379cfd..cd299cb6e 100644 --- a/build_resolvers/lib/src/resolver.dart +++ b/build_resolvers/lib/src/resolver.dart @@ -65,9 +65,10 @@ class PerActionResolver implements ReleasableResolver { // model manually. yield current; final toCrawl = current.definingCompilationUnit.libraryImports - .map((import) => import.library) + .map((import) => import.importedLibrary) .followedBy(current.definingCompilationUnit.libraryExports - .map((export) => export.library)) + .map((export) => export.exportedLibrary)) + .nonNulls .where((library) => !seen.contains(library)) .toSet(); toVisit.addAll(toCrawl); diff --git a/build_resolvers/test/resolver_test.dart b/build_resolvers/test/resolver_test.dart index 04c0308e5..1f4874b2a 100644 --- a/build_resolvers/test/resolver_test.dart +++ b/build_resolvers/test/resolver_test.dart @@ -50,7 +50,7 @@ void main() { var libA = lib ..definingCompilationUnit .libraryImports - .where((l) => l.library.name == 'a') + .where((l) => l.importedLibrary!.name == 'a') .single; expect(libA.getClass('Foo'), isNull); }, resolvers: AnalyzerResolvers()); @@ -72,7 +72,7 @@ void main() { var libB = lib ..definingCompilationUnit .libraryImports - .where((l) => l.library.name == 'b') + .where((l) => l.importedLibrary!.name == 'b') .single; expect(libB.getClass('Foo'), isNull); }, resolvers: AnalyzerResolvers()); @@ -466,7 +466,7 @@ void main() { }, (resolver) async { var entry = await resolver.libraryFor(AssetId('a', 'lib/a.dart')); var classDefinition = entry.definingCompilationUnit.libraryImports - .map((l) => l.library.getClass('SomeClass')) + .map((l) => l.importedLibrary!.getClass('SomeClass')) .singleWhere((c) => c != null)!; expect(await resolver.assetIdForElement(classDefinition), AssetId('a', 'lib/b.dart')); From 31f53ff3200acb8592722e48cbc02a3bd09f50ca Mon Sep 17 00:00:00 2001 From: Jake Macdonald Date: Tue, 8 Oct 2024 20:36:28 +0000 Subject: [PATCH 16/17] fix build tests to expect new language version --- build/test/generate/run_builder_test.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/test/generate/run_builder_test.dart b/build/test/generate/run_builder_test.dart index cea4f79b4..90747ba54 100644 --- a/build/test/generate/run_builder_test.dart +++ b/build/test/generate/run_builder_test.dart @@ -82,7 +82,7 @@ void main() { config.packages.singleWhere((p) => p.name == 'build'); expect(buildPackage.root, Uri.parse('asset:build/')); expect(buildPackage.packageUriRoot, Uri.parse('asset:build/lib/')); - expect(buildPackage.languageVersion, LanguageVersion(3, 5)); + expect(buildPackage.languageVersion, LanguageVersion(3, 6)); final resolvedBuildUri = config.resolve(Uri.parse('package:build/foo.txt'))!; @@ -106,7 +106,7 @@ void main() { Package( 'build', Uri.file('/foo/bar/'), - languageVersion: LanguageVersion(3, 5), + languageVersion: LanguageVersion(3, 6), ), ]), ); From b60151a4269be15442a8d706f056c4e9037606a7 Mon Sep 17 00:00:00 2001 From: Jake Macdonald Date: Tue, 8 Oct 2024 20:44:13 +0000 Subject: [PATCH 17/17] fix build_runner_core tests --- .../test/generate/resolver_reuse_test.dart | 11 +++++++---- .../test/package_graph/package_graph_test.dart | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/build_runner_core/test/generate/resolver_reuse_test.dart b/build_runner_core/test/generate/resolver_reuse_test.dart index 6dcc88a93..391b927c0 100644 --- a/build_runner_core/test/generate/resolver_reuse_test.dart +++ b/build_runner_core/test/generate/resolver_reuse_test.dart @@ -40,10 +40,13 @@ void main() { await buildStep.canRead(buildStep.inputId.addExtension('.foo')); // Check that the `.imported.dart` library is still reachable // through the resolver. - var importedLibrary = - inputLibrary.definingCompilationUnit.libraryImports.firstWhere( - (l) => l.librarySource.uri.path.endsWith('.imported.dart')); - var classNames = importedLibrary.enclosingElement3.classes + var importedLibrary = inputLibrary + .definingCompilationUnit.libraryImports + .firstWhere((l) => l + .importedLibrary!.definingCompilationUnit.source.uri.path + .endsWith('.imported.dart')) + .importedLibrary!; + var classNames = importedLibrary.definingCompilationUnit.classes .map((c) => c.name) .toList(); return buildStep.writeAsString( diff --git a/build_runner_core/test/package_graph/package_graph_test.dart b/build_runner_core/test/package_graph/package_graph_test.dart index 4a3c9195d..989a4d48d 100644 --- a/build_runner_core/test/package_graph/package_graph_test.dart +++ b/build_runner_core/test/package_graph/package_graph_test.dart @@ -27,7 +27,7 @@ void main() { final buildRunner = config.packages.singleWhere((p) => p.name == 'build_runner_core'); - expect(buildRunner.languageVersion, LanguageVersion(3, 5)); + expect(buildRunner.languageVersion, LanguageVersion(3, 6)); }); });