Merge branch 'main' into surface-producer-lifecycle-148417

flutter · Jun 13, 2024 · 4865484 · 4865484
2 parents 26b832b + dbb4a03
commit 4865484
Show file tree

Hide file tree

Showing 82 changed files with 2,362 additions and 1,345 deletions.
diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml
@@ -49,6 +49,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@9fdb3e49720b44c48891d036bb502feb25684276
+        uses: github/codeql-action/upload-sarif@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff
         with:
           sarif_file: results.sarif
diff --git a/.github/workflows/third_party_scan.yml b/.github/workflows/third_party_scan.yml
@@ -41,7 +41,7 @@ jobs:
     name: Vulnerability scanning
     needs:
       extract-deps
-    uses: "google/osv-scanner-action/.github/workflows/[email protected].3"
+    uses: "google/osv-scanner-action/.github/workflows/[email protected].4"
     with:
       # Download the artifact uploaded in extract-deps step
       download-artifact: osv-lockfile-${{github.sha}}

diff --git a/DEPS b/DEPS
@@ -14,7 +14,7 @@ vars = {
   'flutter_git': 'https://flutter.googlesource.com',
   'skia_git': 'https://skia.googlesource.com',
   'llvm_git': 'https://llvm.googlesource.com',
-  'skia_revision': 'ad3c9f203f4e65d0070b1257f40479563e416c46',
+  'skia_revision': '0f47a9333edb589e6908370882d24eb68705db8f',
 
   # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
   # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
@@ -56,7 +56,7 @@ vars = {
   # Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS
   # You can use //tools/dart/create_updated_flutter_deps.py to produce
   # updated revision list of existing dependencies.
-  'dart_revision': '4b693b16eec1333a33344c73295de20036feff8e',
+  'dart_revision': 'aa2265e5a192be635c4f555032a6742fc68a38eb',
 
   # WARNING: DO NOT EDIT MANUALLY
   # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -65,13 +65,13 @@ vars = {
   'dart_boringssl_rev': 'd24a38200fef19150eef00cad35b138936c08767',
   'dart_browser_launcher_rev': '7348ceae6508e5350771979c2951a54313303416',
   'dart_clock_rev': '7cbf08e36a92f14f22132d255846610c1b065324',
-  'dart_collection_rev': '586a5e841fad5572beae421ef9902ba7ceab1292',
+  'dart_collection_rev': 'c90b19f07b48391f3b1b4c39dd06ef0177f8e07c',
   'dart_devtools_rev': 'a53696352fe1508c18d908a85b68c113b11dbe58',
   'dart_libprotobuf_rev': '24487dd1045c7f3d64a21f38a3f0c06cc4cf2edb',
   'dart_perfetto_rev': '13ce0c9e13b0940d2476cd0cff2301708a9a2e2b',
   'dart_protobuf_gn_rev': 'ca669f79945418f6229e4fef89b666b2a88cbb10',
   'dart_protobuf_rev': 'ccf104dbc36929c0f8708285d5f3a8fae206343e',
-  'dart_pub_rev': '75ab224376e80e918d3c53494a36d4bf8a2f2af6',
+  'dart_pub_rev': 'df3664d17fd146ccd19b32820a022404da91f6d3',
   'dart_tools_rev': '4321aecf2cb618dceab5d90adf0cb2ef7207169c',
   'dart_watcher_rev': 'c00fc2a6cd869cdebbc52e00af3d912d25745729',
   'dart_web_rev': '2fe754fb396cb9b87010f0318cfbfc5408346c48',
@@ -374,7 +374,7 @@ deps = {
    Var('dart_git') + '/collection.git' + '@' + Var('dart_collection_rev'),
 
   'src/flutter/third_party/dart/third_party/pkg/convert':
-   Var('dart_git') + '/convert.git@302af1b7d7dffe5bc1f85a6f1b0958b9de920cd7',
+   Var('dart_git') + '/convert.git@70940e3728f34d897ad92f44f98db2d47286b090',
 
   'src/flutter/third_party/dart/third_party/pkg/crypto':
    Var('dart_git') + '/crypto.git@7a9428a78962783f6081dc42465ed580cff225ca',
@@ -386,7 +386,7 @@ deps = {
    Var('dart_git') + '/dart_style.git@a6ad7693555a9add6f98ad6fd94de80d35c89415',
 
   'src/flutter/third_party/dart/third_party/pkg/dartdoc':
-   Var('dart_git') + '/dartdoc.git@ddb8fb4410797f34d4c2245038f051683dd062a8',
+   Var('dart_git') + '/dartdoc.git@3decf1edfe8c12fc76e2e5c901f9e6427af01c03',
 
   'src/flutter/third_party/dart/third_party/pkg/file':
    Var('dart_git') + '/external/github.com/google/file.dart@07cacaed6679a173e29176747e6ce0325742749f',
@@ -401,7 +401,7 @@ deps = {
    Var('dart_git') + '/html.git@3bc803d7e655491b243418f19300ef0c6112bcea',
 
   'src/flutter/third_party/dart/third_party/pkg/http':
-   Var('dart_git') + '/http.git@a3567f83db01d55c0c8248b7298830410b5b297b',
+   Var('dart_git') + '/http.git@b522000fe8995df17fd0a1b4c4354bc8975ea835',
 
   'src/flutter/third_party/dart/third_party/pkg/http_multi_server':
    Var('dart_git') + '/http_multi_server.git@25941e260658efb324de857e6022f418faf9bdd1',
@@ -428,7 +428,7 @@ deps = {
    Var('dart_git') + '/matcher.git@0abd4054c47a923486a6c0c04b5c974ba13ad2da',
 
   'src/flutter/third_party/dart/third_party/pkg/mime':
-   Var('dart_git') + '/mime.git@8d2d559240ad76c8c2d231bcee0d89cf0ea3edc6',
+   Var('dart_git') + '/mime.git@4ca2f5edaafe21f462922d34db99486a44bb08b8',
 
   'src/flutter/third_party/dart/third_party/pkg/mockito':
    Var('dart_git') + '/mockito.git@2302814df66e651b6710311366501523dbee2e11',
@@ -979,7 +979,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/linux-amd64',
-        'version': 'zpBZmUB_JC5AjG-f4i_qQxNIcws8P5hoAbdg6gf4v9oC'
+        'version': 'pGxbL7JoNb3yAYFw4MYOIPMlJT-nC7Ks_5Yp3wI3BN8C'
        }
      ],
      'condition': 'download_fuchsia_deps and not download_fuchsia_sdk',