From 317c07c3207332e5aa33d0ef3224e3a44f6bd248 Mon Sep 17 00:00:00 2001 From: Jake Macdonald Date: Tue, 8 Oct 2024 19:29:27 +0000 Subject: [PATCH] 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