From e0de91184ef7d3523e13752db163cb1d0030f51c Mon Sep 17 00:00:00 2001 From: Sourcegraph Date: Thu, 21 Sep 2023 20:42:26 +0000 Subject: [PATCH 1/3] "Rollout Analyzer 5" --- pubspec.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pubspec.yaml b/pubspec.yaml index d00cc26..ea65af7 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -19,7 +19,7 @@ dependencies: quiver: ^3.0.0 source_span: ^1.8.1 stack_trace: ^1.10.0 - test: ^1.16.8 + test: ^1.21.1 test_descriptor: ^2.0.0 dev_dependencies: @@ -27,7 +27,7 @@ dev_dependencies: dart_style: ^2.0.0 dependency_validator: ^3.0.0 meta: ^1.6.0 - mockito: '>=5.0.0 <5.3.0' # pin to workaround https://github.com/dart-lang/mockito/issues/552 + mockito: ^5.3.2 pedantic: ^1.11.0 dependency_validator: ignore: From 8da6da55b14936a70bcadbf97f235c21a01441cb Mon Sep 17 00:00:00 2001 From: evanweible-wf Date: Fri, 22 Sep 2023 15:42:05 -0600 Subject: [PATCH 2/3] Update analyzer minimum and CI --- .github/workflows/dart_ci.yaml | 8 ++++---- pubspec.yaml | 5 +---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/dart_ci.yaml b/.github/workflows/dart_ci.yaml index 3838450..45983b3 100644 --- a/.github/workflows/dart_ci.yaml +++ b/.github/workflows/dart_ci.yaml @@ -39,11 +39,11 @@ jobs: matrix: sdk: [ stable ] analyzer: - - ^2.0.0 - - ^3.0.0 - - ^4.0.0 + - ^5.0.0 + # Uncomment once we're on Dart 2.19+ + # - ^6.0.0 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: dart-lang/setup-dart@v1 with: sdk: ${{ matrix.sdk }} diff --git a/pubspec.yaml b/pubspec.yaml index ea65af7..40d2789 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -10,7 +10,7 @@ environment: sdk: '>=2.12.0 <3.0.0' dependencies: - analyzer: '>=2.0.0 <6.0.0' + analyzer: ^5.0.0 args: ^2.0.0 glob: ^2.0.1 io: ^1.0.0 @@ -29,6 +29,3 @@ dev_dependencies: meta: ^1.6.0 mockito: ^5.3.2 pedantic: ^1.11.0 -dependency_validator: - ignore: - - mockito From 2030a6972f6c9b51bdd02d48d094d0eeec269747 Mon Sep 17 00:00:00 2001 From: evanweible-wf Date: Fri, 22 Sep 2023 15:53:02 -0600 Subject: [PATCH 3/3] Update Dart version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 45c8844..a87d31e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM google/dart:2 as build +FROM dart:2.18 as build WORKDIR /build/ ADD pubspec.yaml /build/ RUN dart pub get