Merge pull request #69 from Workiva/batch/fedx/analyzer_5

Rollout Analyzer 5
Workiva · Sep 22, 2023 · cce8a6c · cce8a6c
2 parents 1fabab0 + 2030a69
commit cce8a6c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git 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/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

diff --git 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
@@ -19,16 +19,13 @@ 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:
   build_runner: ^2.0.1
   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:
-    - mockito