Merge branch 'flutter:main' into main

ricardoamador · Jan 16, 2024 · 5877b5e · 5877b5e
2 parents 01256f1 + e816d49
commit 5877b5e
Show file tree

Hide file tree

Showing 13 changed files with 94 additions and 93 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@c7d193f32edcb7bfad88892161225aeda64e9392
+        uses: actions/upload-artifact@1eb3cb2b3e0f29609092a73eb033bb759a334595
         with:
           name: SARIF file
           path: results.sarif

diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -26,8 +26,6 @@ analyzer:
   errors:
     # treat missing required parameters as a warning (not a hint)
     missing_required_param: warning
-    # treat missing returns as a warning (not a hint)
-    missing_return: warning
     # allow having TODOs in the code
     todo: ignore
   exclude:

diff --git a/app_dart/Dockerfile b/app_dart/Dockerfile
@@ -4,7 +4,7 @@
 
 
 # Dart Docker official images can be found here: https://hub.docker.com/_/dart
-FROM dart:beta@sha256:4bddd6ccaed32d2d2b8c27bcd71b1ebca13cec47f3abe7b12f640f9432da8e83
+FROM dart:beta@sha256:ee8c9ecca537d9989d1831c0fbfd76bc378e3c9184319d4125121bae061d268a
 
 WORKDIR /app
 

diff --git a/app_dart/lib/src/request_handlers/github/webhook_subscription.dart b/app_dart/lib/src/request_handlers/github/webhook_subscription.dart
@@ -404,6 +404,8 @@ class GithubWebhookSubscription extends SubscriptionHandler {
           !_isTestExempt(filename) &&
           // License goldens are auto-generated.
           !filename.startsWith('ci/licenses_golden/') &&
+          // Build configuration files tell CI what to run.
+          !filename.startsWith('ci/builders/') &&
           // Build files don't need unit tests.
           !filename.endsWith('.gn') &&
           !filename.endsWith('.gni')) {

diff --git a/app_dart/pubspec.yaml b/app_dart/pubspec.yaml
@@ -19,7 +19,7 @@ dependencies:
   dbcrypt: 2.0.0
   file: 7.0.0
   fixnum: 1.1.0
-  gcloud: 0.8.11
+  gcloud: 0.8.12
   github: 9.22.0
   googleapis: 11.4.0
   googleapis_auth: 1.4.1
@@ -43,13 +43,13 @@ dependencies:
 
 dev_dependencies:
   analyzer: 6.3.0
-  build_runner: 2.4.7
+  build_runner: 2.4.8
   fake_async: 1.3.1
   flutter_lints: 3.0.1
   json_serializable: 6.7.1
   mockito: 5.4.4
   platform: 3.1.4
-  test: 1.25.0
+  test: 1.25.1
 
 builders:
   json_serializable: 3.3.0
diff --git a/app_dart/test/request_handlers/github/webhook_subscription_test.dart b/app_dart/test/request_handlers/github/webhook_subscription_test.dart
@@ -1523,7 +1523,7 @@ void foo() {
       );
     });
 
-    test('Engine labels PRs, no comment for license goldens', () async {
+    test('Engine labels PRs, no comment for license goldens or build configs', () async {
       const int issueNumber = 123;
 
       tester.message = generateGithubWebhookMessage(
@@ -1534,9 +1534,10 @@ void foo() {
       );
 
       when(pullRequestsService.listFiles(Config.engineSlug, issueNumber)).thenAnswer(
-        (_) => Stream<PullRequestFile>.value(
+        (_) => Stream<PullRequestFile>.fromIterable(<PullRequestFile>[
           PullRequestFile()..filename = 'ci/licenses_golden/licenses_dart',
-        ),
+          PullRequestFile()..filename = 'ci/builders/linux_unopt.json',
+        ]),
       );
 
       await tester.post(webhook);

diff --git a/auto_submit/Dockerfile b/auto_submit/Dockerfile
@@ -4,7 +4,7 @@
 
 
 # Dart Docker official images can be found here: https://hub.docker.com/_/dart
-FROM dart:beta@sha256:4bddd6ccaed32d2d2b8c27bcd71b1ebca13cec47f3abe7b12f640f9432da8e83
+FROM dart:beta@sha256:ee8c9ecca537d9989d1831c0fbfd76bc378e3c9184319d4125121bae061d268a
 
 WORKDIR /app
 

diff --git a/auto_submit/pubspec.yaml b/auto_submit/pubspec.yaml
@@ -14,7 +14,7 @@ dependencies:
   appengine: 0.13.7
   corsac_jwt: 1.0.0-nullsafety.1
   github: 9.22.0
-  googleapis: 11.4.0
+  googleapis: 12.0.0
   googleapis_auth: 1.4.1
   graphql: 5.2.0-beta.7
   gql: 1.0.1-alpha+1691943394579
@@ -31,11 +31,11 @@ dependencies:
   mutex: 3.1.0
 
 dev_dependencies:
-  build_runner: 2.4.7
+  build_runner: 2.4.8
   json_serializable: 6.7.1
   flutter_lints: 3.0.1
   mockito: 5.4.4
-  test: 1.25.0
+  test: 1.25.1
 
 builders:
   json_serializable: 3.3.0
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.25.0
+  test: 1.25.1
 dependencies:
   archive: 3.4.10
   args: 2.4.2

diff --git a/cipd_packages/device_doctor/pubspec.yaml b/cipd_packages/device_doctor/pubspec.yaml
@@ -16,7 +16,7 @@ dependencies:
   yaml: 3.1.2
 
 dev_dependencies:
-  build_runner: 2.4.7
+  build_runner: 2.4.8
   fake_async: 1.3.1
   mockito: 5.4.4
-  test: 1.25.0
+  test: 1.25.1
diff --git a/dashboard/pubspec.yaml b/dashboard/pubspec.yaml
@@ -26,13 +26,13 @@ dependencies:
   provider: 6.1.1 # Rolled by dependabot
   truncate: 3.0.1 # Rolled by dependabot
   url_launcher: 6.2.2 # Rolled by dependabot
-  url_launcher_platform_interface: 2.3.0 # Rolled by dependabot
+  url_launcher_platform_interface: 2.3.1 # Rolled by dependabot
   url_launcher_web: 2.2.2 # Rolled by dependabot
 
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  build_runner: 2.4.7 # Rolled by dependabot
+  build_runner: 2.4.8 # Rolled by dependabot
   flutter_lints: 3.0.1 # Rolled by dependabot
   mockito: 5.4.4 # Remember to run ./regen_mocks.sh!
   path: any # Match Flutter SDK