Merge branch 'flutter:main' into main

Author: zijiehe-google-com

.ci.yaml

@@ -118,7 +118,6 @@ targets:
     presubmit: false
     properties:
       cache_name: "builder"
-      cache_root: "cache"
       cache_paths: >-
         [
           "builder",
@@ -138,7 +137,6 @@ targets:
     presubmit: false
     properties:
       cache_name: "builder"
-      cache_root: "cache"
       cache_paths: >-
         [
           "builder",
@@ -157,7 +155,6 @@ targets:
     presubmit: false
     properties:
       cache_name: "builder"
-      cache_root: "cache"
       cache_paths: >-
         [
           "builder",
@@ -189,8 +186,6 @@ targets:
     properties:
       release_build: "true"
       config_name: linux_fuchsia
-    drone_dimensions:
-      - os=Linux
     dimensions:
       kvm: "1"
     # TODO(https://github.com/flutter/flutter/issues/138559): Re-enable/delete.
@@ -228,8 +223,6 @@ targets:
       add_recipes_cq: "true"
       release_build: "true"
       config_name: linux_arm_host_engine
-    drone_dimensions:
-      - os=Linux
 
   - name: Linux linux_host_engine
     recipe: engine_v2/engine_v2
@@ -242,8 +235,6 @@ targets:
         [
           {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
         ]
-    drone_dimensions:
-      - os=Linux
 
   - name: Linux linux_host_desktop_engine
     recipe: engine_v2/engine_v2
@@ -252,8 +243,6 @@ targets:
       add_recipes_cq: "true"
       release_build: "true"
       config_name: linux_host_desktop_engine
-    drone_dimensions:
-      - os=Linux
 
   - name: Linux linux_android_aot_engine
     recipe: engine_v2/engine_v2
@@ -262,8 +251,6 @@ targets:
       add_recipes_cq: "true"
       release_build: "true"
       config_name: linux_android_aot_engine
-    drone_dimensions:
-      - os=Linux
 
   - name: Linux linux_android_debug_engine
     recipe: engine_v2/engine_v2
@@ -272,8 +259,6 @@ targets:
       add_recipes_cq: "true"
       release_build: "true"
       config_name: linux_android_debug_engine
-    drone_dimensions:
-      - os=Linux
 
   - name: Linux linux_license
     recipe: engine_v2/builder
@@ -289,8 +274,6 @@ targets:
     properties:
       release_build: "true"
       config_name: linux_web_engine
-    drone_dimensions:
-      - os=Linux
     runIf:
       - DEPS
       - .ci.yaml
@@ -320,7 +303,6 @@ targets:
           {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
           {"dependency": "curl", "version": "version:7.64.0"}
         ]
-      framework: "true"
       no_goma: "true"
       drone_dimensions: >
         ["device_type=none", "os=Linux"]
@@ -344,8 +326,6 @@ targets:
       add_recipes_cq: "true"
       release_build: "true"
       config_name: mac_android_aot_engine
-    drone_dimensions:
-      - os=Linux
 
   - name: Mac mac_clang_tidy
     recipe: engine_v2/engine_v2
@@ -383,10 +363,8 @@ targets:
         {
           "sdk_version": "15a240d"
         }
-    drone_dimensions:
-      - os=Mac-13
 
-  - name: Linux mac_unopt
+  - name: Mac mac_unopt
     recipe: engine_v2/engine_v2
     properties:
       config_name: mac_unopt
@@ -404,9 +382,6 @@ targets:
         {
           "sdk_version": "15a240d"
         }
-    drone_dimensions:
-      - os=Mac-13
-      - cpu=x86
 
   - name: Mac impeller-cmake-example
     bringup: true
@@ -423,8 +398,6 @@ targets:
       add_recipes_cq: "true"
       release_build: "true"
       config_name: windows_android_aot_engine
-    drone_dimensions:
-      - os=Windows
 
   - name: Windows windows_host_engine
     recipe: engine_v2/engine_v2
@@ -433,8 +406,6 @@ targets:
       add_recipes_cq: "true"
       release_build: "true"
       config_name: windows_host_engine
-    drone_dimensions:
-      - os=Windows
 
   - name: Windows windows_arm_host_engine
     recipe: engine_v2/engine_v2
@@ -445,8 +416,6 @@ targets:
     properties:
       add_recipes_cq: "true"
       config_name: windows_arm_host_engine
-    drone_dimensions:
-      - os=Windows
 
   - name: Windows windows_unopt
     recipe: engine_v2/builder

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': 'ec119f44e6b910761b9d87d93f1c270127ccb2ae',
+  'skia_revision': '5a0a82af779616470ec3d078594f82de97ef550f',
 
   # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
   # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
@@ -62,28 +62,28 @@ 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': '0f0f7400c38a7684ba4c4c6dfd7c9a017336abf6',
+  'dart_revision': '957130770e7dd939fa11206d7b8c3e038c209117',
 
   # WARNING: DO NOT EDIT MANUALLY
   # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
   'dart_binaryen_rev': '9784f012848a7eb321c2037bdb363dfe0eab8bc9',
   'dart_boringssl_gen_rev': '9c7294fd58261a79794f5afaa26598cf1442ad20',
   'dart_boringssl_rev': 'd24a38200fef19150eef00cad35b138936c08767',
-  'dart_browser_launcher_rev': '74a0efe937a29d4d9aff50c145579c6e6479df1e',
+  'dart_browser_launcher_rev': '79562306c86e5c087359a31a60309c8d65a699d3',
   'dart_clock_rev': 'daf0fadabc5b3dc8e6e71bf3fb27ef9c3b79df5c',
   'dart_collection_rev': 'fc616ff8fd7b732c07b2b19e31b6601e59900ccf',
-  'dart_devtools_rev': '1f208c84965e9edddea11485fb73b170dba1cd96',
+  'dart_devtools_rev': '333b00377c092306534404c68a82e925ee2e23a3',
   'dart_libprotobuf_rev': '24487dd1045c7f3d64a21f38a3f0c06cc4cf2edb',
   'dart_perfetto_rev': '13ce0c9e13b0940d2476cd0cff2301708a9a2e2b',
   'dart_protobuf_gn_rev': 'ca669f79945418f6229e4fef89b666b2a88cbb10',
-  'dart_protobuf_rev': 'a293fb9c866b1def3d3e7fffc5f6763a2ec59cc9',
+  'dart_protobuf_rev': 'f085bfdc4e746cd5e189da3dc9223031cf958e02',
   'dart_pub_rev': '4ab2e3663f0a98be40427e004e789caebf3ea72e',
-  'dart_tools_rev': '2ef7673ca4c8eb346debe6d628f0196788fc3c66',
+  'dart_tools_rev': '9f4e6a4a7de6602a5c13109c1fad8d7b36bec55f',
   'dart_watcher_rev': '21858a41da1482922e03ee65cdf2169d01d59a67',
-  'dart_web_rev': 'a54a1f0447979f9a3ea220199eca849ffb214e91',
-  'dart_webdev_rev': '629c63214466a77d0994e9b8003120f48af9ef1d',
+  'dart_web_rev': '975e55cbe4ac683c33d5256a91f4133fa97b4c34',
+  'dart_webdev_rev': '51b5484348b4a8ede351e8dff0428b083495ba78',
   'dart_webkit_inspection_protocol_rev': '07295b9a5a1f1851666269128e95a9644d65107a',
-  'dart_yaml_edit_rev': '2a9a11bee120d507d61d501c34585440be8c12b6',
+  'dart_yaml_edit_rev': '82ab64d1217c08d93697aa414f214836eef52a4e',
   'dart_zlib_rev': '14dd4c4455602c9b71a1a89b5cafd1f4030d2e3f',
 
   'ocmock_rev': 'c4ec0e3a7a9f56cfdbd0aa01f4f97bb4b75c5ef8', # v3.7.1
@@ -347,13 +347,13 @@ deps = {
    Var('chromium_git') + '/external/github.com/WebAssembly/binaryen.git@9784f012848a7eb321c2037bdb363dfe0eab8bc9',
 
   'src/third_party/dart/third_party/devtools':
-   {'dep_type': 'cipd', 'packages': [{'package': 'dart/third_party/flutter/devtools', 'version': 'git_revision:1f208c84965e9edddea11485fb73b170dba1cd96'}]},
+   {'dep_type': 'cipd', 'packages': [{'package': 'dart/third_party/flutter/devtools', 'version': 'git_revision:333b00377c092306534404c68a82e925ee2e23a3'}]},
 
   'src/third_party/dart/third_party/pkg/args':
    Var('dart_git') + '/args.git@7dc7fe0430709229ccc87c3eaae729aeffe10c56',
 
   'src/third_party/dart/third_party/pkg/async':
-   Var('dart_git') + '/async.git@24266cafbba7703b82c652d454baa5df09402f8f',
+   Var('dart_git') + '/async.git@6cdbc41631054870318ae28baea2c62cf2a91945',
 
   'src/third_party/dart/third_party/pkg/bazel_worker':
    Var('dart_git') + '/bazel_worker.git@372b8b514c7342465f58627a2418910f76120db9',
@@ -386,7 +386,7 @@ deps = {
    Var('dart_git') + '/dart_style.git@633b01cba68f4b42ddc2985c3d521c22149d5ce3',
 
   'src/third_party/dart/third_party/pkg/dartdoc':
-   Var('dart_git') + '/dartdoc.git@7e171fc9d5ae2727ba2f7f7f78d3da5fb0dbbb1e',
+   Var('dart_git') + '/dartdoc.git@7a9df65fbca600ecb3ada4b08002c8ab9ee4e987',
 
   'src/third_party/dart/third_party/pkg/file':
    Var('dart_git') + '/external/github.com/google/file.dart@3aa06490bf34bddf04c7ea964a50c177a4ca0de7',
@@ -401,7 +401,7 @@ deps = {
    Var('dart_git') + '/html.git@327e37a6a4dd46599737ee982f280d73a8f646f7',
 
   'src/third_party/dart/third_party/pkg/http':
-   Var('dart_git') + '/http.git@6d9f9efe04886d9685fbfb1a76ba24a71b6c951c',
+   Var('dart_git') + '/http.git@ce0de370e4f6fabf54d2c47fafe38f80cdc2501c',
 
   'src/third_party/dart/third_party/pkg/http_multi_server':
    Var('dart_git') + '/http_multi_server.git@ba9d07f3596b24718ddf45c9e071d40879cca565',
@@ -416,13 +416,13 @@ deps = {
    Var('dart_git') + '/json_rpc_2.git@639857be892050159f5164c749d7947694976a4a',
 
   'src/third_party/dart/third_party/pkg/leak_tracker':
-   Var('dart_git') + '/leak_tracker.git@4a5b077739886f61bd6dc11c78865ef487c917c2',
+   Var('dart_git') + '/leak_tracker.git@f5620600a5ce1c44f65ddaa02001e200b096e14c',
 
   'src/third_party/dart/third_party/pkg/logging':
    Var('dart_git') + '/logging.git@cbaf4ee2e59c318d7519edb5381f5fe2a7f69587',
 
   'src/third_party/dart/third_party/pkg/markdown':
-   Var('dart_git') + '/markdown.git@c2b842937787bc0dce1763d56e7551b9045deb42',
+   Var('dart_git') + '/markdown.git@d735b0b0aa793f4f6e22f8e0e835a5dffe00b6b9',
 
   'src/third_party/dart/third_party/pkg/matcher':
    Var('dart_git') + '/matcher.git@d954c8d979579b4b46427b0ea1d9c721117c191e',
@@ -467,19 +467,19 @@ deps = {
    Var('dart_git') + '/source_span.git@21a403a75b6887fbd811fb53b74b08c2cef67ab6',
 
   'src/third_party/dart/third_party/pkg/sse':
-   Var('dart_git') + '/sse.git@af7d8d0881d3309fe9ffc3f0778b33ae745fddd1',
+   Var('dart_git') + '/sse.git@13ec752b5f253f11a3d9e2f8aca5003b94c170d2',
 
   'src/third_party/dart/third_party/pkg/stack_trace':
    Var('dart_git') + '/stack_trace.git@155f12c51226d6372f6722f5e55c38ef39625006',
 
   'src/third_party/dart/third_party/pkg/stream_channel':
-   Var('dart_git') + '/stream_channel.git@851336fada8759aa3a2e9ce344844d48dee67495',
+   Var('dart_git') + '/stream_channel.git@e02a5ddef804f0d546a405ab3917fb27788acaef',
 
   'src/third_party/dart/third_party/pkg/string_scanner':
    Var('dart_git') + '/string_scanner.git@a2bcdb575f6bb30b944b4f632ea95d8dc4f914bd',
 
   'src/third_party/dart/third_party/pkg/tar':
-   Var('dart_git') + '/external/github.com/simolus3/tar.git@0fc831c6e93be5342d4863d9e464428e73007cce',
+   Var('dart_git') + '/external/github.com/simolus3/tar.git@6150a0c88d9bd17e3e961593a9a7a9564866e8b4',
 
   'src/third_party/dart/third_party/pkg/term_glyph':
    Var('dart_git') + '/term_glyph.git@85a4aa6bf25cd6ecaa5c56a1b259b2d95264a439',
@@ -1004,7 +1004,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/linux-amd64',
-        'version': 'dLhvv964txwnSlvNw-qiuPtzH97grhOfLDOeg3QQKucC'
+        'version': 'j9cJ94K-T1i3u5xGhNKHB3oJWIZ3lO7m7Ob0kSQL-wsC'
        }
      ],
      'condition': 'host_os == "linux" and not download_fuchsia_sdk',

ci/ban_generated_plugin_registrant_java.sh

@@ -0,0 +1,68 @@
+#!/bin/bash
+#
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+set -e
+
+# Needed because if it is set, cd may print the path it changed to.
+unset CDPATH
+
+# On Mac OS, readlink -f doesn't work, so follow_links traverses the path one
+# link at a time, and then cds into the link destination and find out where it
+# ends up.
+#
+# The function is enclosed in a subshell to avoid changing the working directory
+# of the caller.
+function follow_links() (
+  cd -P "$(dirname -- "$1")"
+  file="$PWD/$(basename -- "$1")"
+  while [[ -L "$file" ]]; do
+    cd -P "$(dirname -- "$file")"
+    file="$(readlink -- "$file")"
+    cd -P "$(dirname -- "$file")"
+    file="$PWD/$(basename -- "$file")"
+  done
+  echo "$file"
+)
+
+SCRIPT_DIR=$(follow_links "$(dirname -- "${BASH_SOURCE[0]}")")
+SRC_DIR="$(
+  cd "$SCRIPT_DIR/../.."
+  pwd -P
+)"
+
+# Check if a file named **/GeneratedPluginRegistrant.java exists in the project.
+# If it does, fail the build and print a message to the user pointing them to
+# the file and instructing them to remove it.
+#
+# See: https://github.com/flutter/flutter/issues/143782.
+
+# The expected path to the file. Any *other* path is unexpected.
+EXPECTED_PATHS=("./shell/platform/android/test/io/flutter/plugins/GeneratedPluginRegistrant.java")
+
+# Temporarily change the working directory to the root of the Flutter project.
+pushd "$SRC_DIR/flutter" >/dev/null
+
+# Change back to the original working directory.
+function cleanup() {
+  popd >/dev/null
+}
+
+trap cleanup EXIT
+
+# Find all files named GeneratedPluginRegistrant.java in the project.
+echo "Finding all files named GeneratedPluginRegistrant.java in the project..."
+GENERATED_PLUGIN_REGISTRANT_PATHS=$(find . -name "GeneratedPluginRegistrant.java")
+
+# Iterate over the found paths and check if they are expected.
+for path in $GENERATED_PLUGIN_REGISTRANT_PATHS; do
+  if [[ ! " ${EXPECTED_PATHS[@]} " =~ " ${path} " ]]; then
+    echo "ERROR: Found unexpected file named GeneratedPluginRegistrant.java at $path."
+    echo "Please remove this file from the project."
+    exit 1
+  fi
+done
+
+echo "Done."

ci/builders/linux_unopt.json

@@ -46,8 +46,12 @@
                     ]
                 },
                 {
-                    "nane": "test:GeneratedPluginRegistant.java omitted",
-                    "script": "flutter/ci/test/format_no_generated_java_test.sh"
+                    "name": "ban GeneratedPluginRegistrant.java",
+                    "script": "flutter/ci/ban_generated_plugin_registrant_java.sh"
+                },
+                {
+                    "name": "ban_test GeneratedPluginRegistrant.java",
+                    "script": "flutter/ci/test/ban_generated_plugin_registrant_java_test.sh"
                 },
                 {
                     "language": "python3",

ci/builders/mac_host_engine.json

@@ -476,6 +476,21 @@
             "source": "out/release/snapshot/gen_snapshot.zip",
             "destination": "darwin-x64-release/gen_snapshot.zip",
             "realm": "production"
+        },
+        {
+            "source": "out/debug/framework/framework.zip",
+            "destination": "darwin-x64/framework.zip",
+            "realm": "production"
+        },
+        {
+            "source": "out/profile/framework/framework.zip",
+            "destination": "darwin-x64-profile/framework.zip",
+            "realm": "production"
+        },
+        {
+            "source": "out/release/framework/framework.zip",
+            "destination": "darwin-x64-release/framework.zip",
+            "realm": "production"
         }
     ]
 }