Merge branch 'flutter:main' into main

ricardoamador · Dec 15, 2023 · 858e21b · 858e21b
2 parents 52d42f0 + 3c38374
commit 858e21b
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml
@@ -43,7 +43,7 @@ jobs:
 
       # Upload the results as artifacts (optional).
       - name: "Upload artifact"
-        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32
+        uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392
         with:
           name: SARIF file
           path: results.sarif

diff --git a/analyze/pubspec.yaml b/analyze/pubspec.yaml
@@ -11,5 +11,5 @@ dependencies:
   platform: 3.1.3
 
 dev_dependencies:
-  mockito: 5.4.3
+  mockito: 5.4.4
   test_api: 0.6.1
diff --git a/app_dart/pubspec.yaml b/app_dart/pubspec.yaml
@@ -47,7 +47,7 @@ dev_dependencies:
   fake_async: 1.3.1
   flutter_lints: 3.0.1
   json_serializable: 6.7.1
-  mockito: 5.4.3
+  mockito: 5.4.4
   platform: 3.1.3
   test: 1.24.9
 

diff --git a/auto_submit/pubspec.yaml b/auto_submit/pubspec.yaml
@@ -34,7 +34,7 @@ dev_dependencies:
   build_runner: 2.4.7
   json_serializable: 6.7.1
   flutter_lints: 3.0.1
-  mockito: 5.4.3
+  mockito: 5.4.4
   test: 1.24.9
 
 builders:

diff --git a/cipd_packages/codesign/pubspec.yaml b/cipd_packages/codesign/pubspec.yaml
@@ -8,7 +8,7 @@ environment:
 
 dev_dependencies:
   lints: 3.0.0
-  test: 1.24.9
+  test: 1.25.0
 dependencies:
   archive: 3.4.9
   args: 2.4.2

diff --git a/cipd_packages/device_doctor/pubspec.yaml b/cipd_packages/device_doctor/pubspec.yaml
@@ -18,5 +18,5 @@ dependencies:
 dev_dependencies:
   build_runner: 2.4.7
   fake_async: 1.3.1
-  mockito: 5.4.3
+  mockito: 5.4.4
   test: 1.24.9
diff --git a/dashboard/lib/service/dev_cocoon.dart b/dashboard/lib/service/dev_cocoon.dart
@@ -35,7 +35,7 @@ class _PausedCommitStatus {
 
   void complete() {
     assert(_pausedStatus != null);
-    _completer.complete(_pausedStatus);
+    _completer.complete(_pausedStatus!);
     _pausedStatus = null;
   }
 }

diff --git a/dashboard/pubspec.yaml b/dashboard/pubspec.yaml
@@ -18,7 +18,7 @@ dependencies:
   firebase_core: 2.24.2 # Rolled by dependabot
   fixnum: 1.1.0 # Rolled by dependabot
   flutter_app_icons: 0.0.9 # Rolled by dependabot
-  google_sign_in: 6.2.0 # Rolled by dependabot
+  google_sign_in: 6.2.1 # Rolled by dependabot
   google_sign_in_platform_interface: any # Match google_sign_in
   google_sign_in_web: 0.12.3 # Rolled by dependabot
   http: 1.1.2 # Rolled by dependabot
@@ -34,7 +34,7 @@ dev_dependencies:
     sdk: flutter
   build_runner: 2.4.7 # Rolled by dependabot
   flutter_lints: 3.0.1 # Rolled by dependabot
-  mockito: 5.4.3 # Remember to run ./regen_mocks.sh!
+  mockito: 5.4.4 # Remember to run ./regen_mocks.sh!
   path: any # Match Flutter SDK
 
 flutter:

diff --git a/licenses/pubspec.yaml b/licenses/pubspec.yaml
@@ -9,5 +9,5 @@ dependencies:
   platform: 3.1.3
 
 dev_dependencies:
-  mockito: 5.4.3
+  mockito: 5.4.4
   test_api: 0.6.1