From 54d1ca6107737f4a3f501a0a9c74242eb2ff192f Mon Sep 17 00:00:00 2001
From: Matan Lurey <matan@lurey.org>
Date: Mon, 24 Jun 2024 12:31:06 -0700
Subject: [PATCH 01/27] Move one package to a workspace.

---
 pubspec.yaml                   | 180 +++++++++++++++++++++++++++++++++
 tools/engine_tool/pubspec.yaml |  59 ++---------
 2 files changed, 187 insertions(+), 52 deletions(-)
 create mode 100644 pubspec.yaml

diff --git a/pubspec.yaml b/pubspec.yaml
new file mode 100644
index 0000000000000..c4a6091cf03e6
--- /dev/null
+++ b/pubspec.yaml
@@ -0,0 +1,180 @@
+# This file represents a "workspace" that applies to the whole repository.
+#
+# See <https://flutter.dev/go/pub-workspace> for details.
+#
+# The `flutter/engine` repository is a quasi-monorepo, with multiple Dart tools
+# and packages that are all interdependent. Third party dependencies are managed
+# by the `DEPS` file in the root of the repository, and are synced to either the
+# `third_party` (i.e. `//flutter/third_party`) or `../third_party` (i.e. 
+# `//third_party`) directories by `gclient sync`.
+#
+# Every dependency declared here are dependencies used by _one or more_ of the
+# packages in the repository (though there is no enforcement of this). This file
+# then generates a `.dart_tool/package_config.json` file that is used by the
+# rest of the repository to resolve dependencies.
+#
+# ==============================================================================
+# WORKFLOWS
+# ==============================================================================
+#
+# ------------------------------------------------------------------------------
+# (1) ADDING A NEW DEPENDENCY
+# ------------------------------------------------------------------------------
+# Dependencies need to be added either via the DEPS file, or by checking the are
+# available in the vendored Dart SDK (see notes below on library locations). If
+# they are available, do the following.
+#
+# See (4) for how to add dependencies to a package in the workspace.
+#
+# ------------------------------------------------------------------------------
+# (2) CREATING A NEW PACKAGE
+# ------------------------------------------------------------------------------
+# If creating a package, say in ./tools or ./tools/pkg, ensure the following
+# header in it's respective `pubspec.yaml`:
+# ```
+# # We don't publish packages to pub.dev from the engine repository.
+# publish_to: none
+#
+# # Required for workspace support.
+# environment:
+#   sdk: ^3.5.0-294.0.dev
+#
+# # This package is managed as part of the engine workspace.
+# resolution: workspace
+# ```
+#
+# See (4) for how to add dependencies to a package in the workspace.
+#
+# ------------------------------------------------------------------------------
+# (3) MIGRATING A NON-WORKSPACE PACKAGE TO USING THE WORKSPACE
+# ------------------------------------------------------------------------------
+# Many packages in this repo are still using a pre-workspace style pubspec.yaml,
+# either with manuallu declared `dependency_overrides` (much of ./tools) or by
+# using pub (./web_sdk, ./lib/web_ui). To migrate a package to the workspace:
+#
+# A. Add the `resolution: workspace` field to the pubspec.yaml.
+# B. Update the minimum SDK version to at least `^3.5.0-294.0.dev`.
+# C. Add the package to the `workspace` field in this file.
+# D. Ensure every dependency in the package is added to the `dependencies` field
+#    in this file, following instructions in (4).
+#
+# Once `dart pub get` is run on the workspace, the package will be resolved as
+# part of the workspace, and the `dependency_overrides` in this file will be
+# applied to the package.
+#
+# ------------------------------------------------------------------------------
+# (4) ADDING DEPENDENCIES TO A PACKAGE IN THIS WORKSPACE
+# ------------------------------------------------------------------------------
+# When adding a dependency to a package in the workspace, add the dependency to
+# the `dependencies` field in this file. If the dependency is located within
+# the repository, use the `path` field to point to the package.
+#
+# If the dependency is a third party package, add it to the
+# `dependency_overrides` field in this file. The `any` version constraint is
+# used to indicate that the version of the package is not important, as it is
+# managed by the `DEPS` file.
+
+name: _engine_workspace
+
+# Required for workspace support.
+environment:
+  sdk: ^3.5.0-294.0.dev
+
+# Declare all packages that are part of the workspace.
+workspace:
+  - tools/engine_tool
+
+# Declare all dependencies that are used by one or more packages.
+#
+# A few notes:
+# 1. There is no distinction between "dependencies" and "dev_dependencies";
+#    those notions are for *publishing* packages, not for managing a workspace.
+#    Specific packages in the workspace itself will declare whether they are
+#    dependencies or dev_dependencies, but here it is a union of both.
+#
+# 2. The `any` version constraint is used to indicate that the version of the
+#    package is not important, as it is managed by the `DEPS` file. In other
+#    words, "if the test pass, ship it".
+#
+# 3. The `path` field is used to indicate the location of the package in the
+#    local repository itself. This is to *only* be used for local packages that
+#    are part of the workspace. Third party dependencies are managed by the
+#    `DEPS` file: they get a "any" version constraint and are overridden in the
+#    `dependency_overrides` section below.
+#
+# While not enforced by tooling, try to keep this list in alphabetical order.
+dependencies:
+  args: any
+  async_helper: any
+  engine_build_configs:
+    path: ./tools/pkg/engine_build_configs
+  engine_repo_tools:
+    path: ./tools/pkg/engine_repo_tools
+  expect: any
+  file: any
+  litetest:
+    path: ./testing/litetest
+  logging: any
+  meta: any
+  path: any
+  platform: any
+  process_fakes:
+    path: ./tools/pkg/process_fakes
+  process_runner: any
+  smith: any
+
+# Instructs pub on how to resolve the dependencies that are part of "DEPS".
+#
+# For historic reasons, there are ~3 or so places packages might be located:
+#
+# - `./third_party/pkg/{name}`: for packages vended directly as part of "DEPS".
+#    Usually these are Flutter engine specific packages, i.e. they did not exist
+#    in the Dart vended SDK (the other options below). Typically these originate
+#    from pub (https://pub.dev) and are mirrored into a Google Git repository:
+#    <https://flutter.googlesource.com/>.
+#
+# - `./third_party/dart/pkg/{name}`: for packages that lives *in* the Dart SDK,
+#    which is in turn vendored into the Flutter engine repository. You can see
+#    a full list of available packages here:
+#    <https://github.com/dart-lang/sdk/tree/main/pkg>.
+#
+# - `./third_party/dart/third_party/pkg/{name}`: for packages that are vendored
+#    into the Dart SDK from pub.dev. These are often first-party packages from
+#    the Dart team, but not part of the Dart SDK itself. You can see a full list
+#    of available packages here:
+#    <https://github.com/dart-lang/sdk/blob/main/DEPS>.
+dependency_overrides:
+  args:
+    path: ./third_party/dart/third_party/pkg/args
+  async:
+    path: ./third_party/dart/third_party/pkg/async
+  async_helper:
+    path: ./third_party/dart/pkg/async_helper
+  collection:
+    path: ./third_party/dart/third_party/pkg/collection
+  expect:
+    path: ./third_party/dart/pkg/expect
+  file:
+    path: ./third_party/dart/third_party/pkg/file/packages/file
+  logging:
+    path: ./third_party/dart/third_party/pkg/logging
+  meta:
+    path: ./third_party/dart/pkg/meta
+  path:
+    path: ./third_party/dart/third_party/pkg/path
+  platform:
+    path: ./third_party/pkg/platform
+  process:
+    path: ./third_party/pkg/process
+  process_runner:
+    path: ./third_party/pkg/process_runner
+  smith:
+    path: ./third_party/dart/pkg/smith
+  source_span:
+    path: ./third_party/dart/third_party/pkg/source_span
+  string_scanner:
+    path: ./third_party/dart/third_party/pkg/string_scanner
+  term_glyph:
+    path: ./third_party/dart/third_party/pkg/term_glyph
+  yaml:
+    path: ./third_party/dart/third_party/pkg/yaml
diff --git a/tools/engine_tool/pubspec.yaml b/tools/engine_tool/pubspec.yaml
index 0e0e14e159c96..135e5a3ec1ba2 100644
--- a/tools/engine_tool/pubspec.yaml
+++ b/tools/engine_tool/pubspec.yaml
@@ -4,18 +4,13 @@
 
 name: engine_tool
 publish_to: none
-environment:
-  # Required for extension types.
-  sdk: ^3.3.0
 
-# Do not add any dependencies that require more than what is provided in
-# //third_party/pkg, //third_party/dart/pkg, or
-# //third_party/dart/third_party/pkg. In particular, package:test is not usable
-# here.
+# Required for workspace support.
+environment:
+  sdk: ^3.5.0-294.0.dev
 
-# If you do add packages here, make sure you can run `pub get --offline`, and
-# check the .packages and .package_config to make sure all the paths are
-# relative to this directory into //third_party/dart
+# This package is managed as part of the engine workspace.
+resolution: workspace
 
 dependencies:
   args: any
@@ -31,47 +26,7 @@ dependencies:
   process_runner: any
 
 dev_dependencies:
-  async_helper: any
-  expect: any
-  litetest: any
-  process_fakes:
-    path: ../pkg/process_fakes
-  smith: any
-
-dependency_overrides:
-  args:
-    path: ../../third_party/dart/third_party/pkg/args
-  async:
-    path: ../../third_party/dart/third_party/pkg/async
-  async_helper:
-    path: ../../third_party/dart/pkg/async_helper
-  collection:
-    path: ../../third_party/dart/third_party/pkg/collection
-  expect:
-    path: ../../third_party/dart/pkg/expect
-  file:
-    path: ../../third_party/dart/third_party/pkg/file/packages/file
   litetest:
     path: ../../testing/litetest
-  logging:
-    path: ../../third_party/dart/third_party/pkg/logging
-  meta:
-    path: ../../third_party/dart/pkg/meta
-  path:
-    path: ../../third_party/dart/third_party/pkg/path
-  platform:
-    path: ../../third_party/pkg/platform
-  process:
-    path: ../../third_party/pkg/process
-  process_runner:
-    path: ../../third_party/pkg/process_runner
-  smith:
-    path: ../../third_party/dart/pkg/smith
-  source_span:
-    path: ../../third_party/dart/third_party/pkg/source_span
-  string_scanner:
-    path: ../../third_party/dart/third_party/pkg/string_scanner
-  term_glyph:
-    path: ../../third_party/dart/third_party/pkg/term_glyph
-  yaml:
-    path: ../../third_party/dart/third_party/pkg/yaml
+  process_fakes:
+    path: ../pkg/process_fakes

From 2068ba11223262724741a5815e8143e7eca98a7d Mon Sep 17 00:00:00 2001
From: Matan Lurey <matan@lurey.org>
Date: Mon, 24 Jun 2024 12:31:31 -0700
Subject: [PATCH 02/27] ++

---
 pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index c4a6091cf03e6..0c4d8f50788a6 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -5,7 +5,7 @@
 # The `flutter/engine` repository is a quasi-monorepo, with multiple Dart tools
 # and packages that are all interdependent. Third party dependencies are managed
 # by the `DEPS` file in the root of the repository, and are synced to either the
-# `third_party` (i.e. `//flutter/third_party`) or `../third_party` (i.e. 
+# `third_party` (i.e. `//flutter/third_party`) or `../third_party` (i.e.
 # `//third_party`) directories by `gclient sync`.
 #
 # Every dependency declared here are dependencies used by _one or more_ of the

From fcde54c89b2386a5938b6f03488214a3f4a738a4 Mon Sep 17 00:00:00 2001
From: Matan Lurey <matan@lurey.org>
Date: Mon, 24 Jun 2024 13:04:21 -0700
Subject: [PATCH 03/27] ++

---
 tools/pub_get_offline.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tools/pub_get_offline.py b/tools/pub_get_offline.py
index 9452e5449ed71..b17050d8d2097 100644
--- a/tools/pub_get_offline.py
+++ b/tools/pub_get_offline.py
@@ -87,6 +87,8 @@ def check_package(package):
 
 
 EXCLUDED_DIRS = [
+    # FIXME: Do not submit this change, it's for PR testing only.
+    os.path.join(ENGINE_DIR),
     os.path.join(ENGINE_DIR, 'lib'),
     os.path.join(ENGINE_DIR, 'prebuilts'),
     os.path.join(ENGINE_DIR, 'shell', 'platform', 'fuchsia'),
@@ -119,6 +121,9 @@ def find_unlisted_packages():
 
 
 def main():
+  # Intentionally use the Dart SDK prebuilt instead of the Flutter prebuilt
+  # (i.e. prebuilts/{platform}/dart-sdk/bin/dart) because the script has to run
+  # in a monorepo build *before* the newer Dart SDK has been built from source.
   dart_sdk_bin = os.path.join(
       SRC_ROOT, 'flutter', 'third_party', 'dart', 'tools', 'sdks', 'dart-sdk', 'bin'
   )

From 9f49e49233574093113f845b9da0040272e6e093 Mon Sep 17 00:00:00 2001
From: Matan Lurey <matan@lurey.org>
Date: Mon, 1 Jul 2024 16:13:33 -0700
Subject: [PATCH 04/27] ++

---
 pubspec.yaml             | 25 ++++++++++---------------
 tools/pub_get_offline.py |  3 +--
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index 0c4d8f50788a6..8b306fdc97bfe 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -49,7 +49,7 @@
 # (3) MIGRATING A NON-WORKSPACE PACKAGE TO USING THE WORKSPACE
 # ------------------------------------------------------------------------------
 # Many packages in this repo are still using a pre-workspace style pubspec.yaml,
-# either with manuallu declared `dependency_overrides` (much of ./tools) or by
+# either with manually declared `dependency_overrides` (much of ./tools) or by
 # using pub (./web_sdk, ./lib/web_ui). To migrate a package to the workspace:
 #
 # A. Add the `resolution: workspace` field to the pubspec.yaml.
@@ -96,30 +96,17 @@ workspace:
 #    package is not important, as it is managed by the `DEPS` file. In other
 #    words, "if the test pass, ship it".
 #
-# 3. The `path` field is used to indicate the location of the package in the
-#    local repository itself. This is to *only* be used for local packages that
-#    are part of the workspace. Third party dependencies are managed by the
-#    `DEPS` file: they get a "any" version constraint and are overridden in the
-#    `dependency_overrides` section below.
-#
 # While not enforced by tooling, try to keep this list in alphabetical order.
+# TODO(matanlurey): https://dart.dev/tools/linter-rules/sort_pub_dependencies.
 dependencies:
   args: any
   async_helper: any
-  engine_build_configs:
-    path: ./tools/pkg/engine_build_configs
-  engine_repo_tools:
-    path: ./tools/pkg/engine_repo_tools
   expect: any
   file: any
-  litetest:
-    path: ./testing/litetest
   logging: any
   meta: any
   path: any
   platform: any
-  process_fakes:
-    path: ./tools/pkg/process_fakes
   process_runner: any
   smith: any
 
@@ -152,10 +139,16 @@ dependency_overrides:
     path: ./third_party/dart/pkg/async_helper
   collection:
     path: ./third_party/dart/third_party/pkg/collection
+  engine_build_configs:
+    path: ./tools/pkg/engine_build_configs
+  engine_repo_tools:
+    path: ./tools/pkg/engine_repo_tools
   expect:
     path: ./third_party/dart/pkg/expect
   file:
     path: ./third_party/dart/third_party/pkg/file/packages/file
+  litetest:
+    path: ./testing/litetest
   logging:
     path: ./third_party/dart/third_party/pkg/logging
   meta:
@@ -166,6 +159,8 @@ dependency_overrides:
     path: ./third_party/pkg/platform
   process:
     path: ./third_party/pkg/process
+  process_fakes:
+    path: ./tools/pkg/process_fakes
   process_runner:
     path: ./third_party/pkg/process_runner
   smith:
diff --git a/tools/pub_get_offline.py b/tools/pub_get_offline.py
index b17050d8d2097..b4382c23fce00 100644
--- a/tools/pub_get_offline.py
+++ b/tools/pub_get_offline.py
@@ -18,6 +18,7 @@
 ENGINE_DIR = os.path.join(SRC_ROOT, 'flutter')
 
 ALL_PACKAGES = [
+    os.path.join(ENGINE_DIR),
     os.path.join(ENGINE_DIR, 'ci'),
     os.path.join(ENGINE_DIR, 'flutter_frontend_server'),
     os.path.join(ENGINE_DIR, 'impeller', 'tessellator', 'dart'),
@@ -87,8 +88,6 @@ def check_package(package):
 
 
 EXCLUDED_DIRS = [
-    # FIXME: Do not submit this change, it's for PR testing only.
-    os.path.join(ENGINE_DIR),
     os.path.join(ENGINE_DIR, 'lib'),
     os.path.join(ENGINE_DIR, 'prebuilts'),
     os.path.join(ENGINE_DIR, 'shell', 'platform', 'fuchsia'),

From a467fb66b759d3ae43730f70e236009d6de352a2 Mon Sep 17 00:00:00 2001
From: Matan Lurey <matan@lurey.org>
Date: Thu, 11 Jul 2024 14:19:14 -0700
Subject: [PATCH 05/27] Modify pub_get_offline.py to respect resolution:
 workspace.

---
 tools/pub_get_offline.py | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/tools/pub_get_offline.py b/tools/pub_get_offline.py
index b4382c23fce00..80cef03dfdc43 100644
--- a/tools/pub_get_offline.py
+++ b/tools/pub_get_offline.py
@@ -64,8 +64,18 @@ def fetch_package(pub, package):
     return 1
   return 0
 
-
-def check_package(package):
+def package_uses_workspace_resolution(package):
+  pubspec = os.path.join(package, 'pubspec.yaml')
+  
+  with open(pubspec) as pubspec_file:
+    for line in pubspec_file:
+      line = line.strip()
+      if 'resolution: workspace' in line:
+        return True
+  
+  return False
+
+def check_package_config(package):
   package_config = os.path.join(package, '.dart_tool', 'package_config.json')
   pub_count = 0
   with open(package_config) as config_file:
@@ -143,7 +153,8 @@ def main():
   for package in ALL_PACKAGES:
     if fetch_package(pubcmd, package) != 0:
       return 1
-    pub_count = pub_count + check_package(package)
+    if not package_uses_workspace_resolution(package):
+      pub_count = pub_count + check_package_config(package)
 
   if pub_count > 0:
     return 1

From 901b47f49d997484544d7010734c78f94a9a7f62 Mon Sep 17 00:00:00 2001
From: Matan Lurey <matan@lurey.org>
Date: Thu, 11 Jul 2024 14:20:31 -0700
Subject: [PATCH 06/27] ++

---
 pubspec.yaml             | 6 +++---
 tools/pub_get_offline.py | 6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index 8b306fdc97bfe..b16ff54e2be99 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -20,9 +20,9 @@
 # ------------------------------------------------------------------------------
 # (1) ADDING A NEW DEPENDENCY
 # ------------------------------------------------------------------------------
-# Dependencies need to be added either via the DEPS file, or by checking the are
-# available in the vendored Dart SDK (see notes below on library locations). If
-# they are available, do the following.
+# Dependencies need to be added either via the DEPS file, or by checking they
+# are available in the vendored Dart SDK (see notes below on library locations).
+# If they are available, do the following.
 #
 # See (4) for how to add dependencies to a package in the workspace.
 #
diff --git a/tools/pub_get_offline.py b/tools/pub_get_offline.py
index 80cef03dfdc43..1cad3d5b0f4e9 100644
--- a/tools/pub_get_offline.py
+++ b/tools/pub_get_offline.py
@@ -64,17 +64,19 @@ def fetch_package(pub, package):
     return 1
   return 0
 
+
 def package_uses_workspace_resolution(package):
   pubspec = os.path.join(package, 'pubspec.yaml')
-  
+
   with open(pubspec) as pubspec_file:
     for line in pubspec_file:
       line = line.strip()
       if 'resolution: workspace' in line:
         return True
-  
+
   return False
 
+
 def check_package_config(package):
   package_config = os.path.join(package, '.dart_tool', 'package_config.json')
   pub_count = 0

From 4f99625a6a5adc4083e5e61360a829b90d7665fb Mon Sep 17 00:00:00 2001
From: Matan Lurey <matan@lurey.org>
Date: Thu, 11 Jul 2024 14:24:29 -0700
Subject: [PATCH 07/27] ++

---
 tools/engine_tool/pubspec.yaml | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/tools/engine_tool/pubspec.yaml b/tools/engine_tool/pubspec.yaml
index 135e5a3ec1ba2..1b71b9b688bc2 100644
--- a/tools/engine_tool/pubspec.yaml
+++ b/tools/engine_tool/pubspec.yaml
@@ -14,19 +14,11 @@ resolution: workspace
 
 dependencies:
   args: any
-  engine_build_configs:
-    path: ../pkg/engine_build_configs
-  engine_repo_tools:
-    path: ../pkg/engine_repo_tools
+  engine_build_configs: any
+  engine_repo_tools: any
   file: any
   logging: any
   meta: any
   path: any
   platform: any
   process_runner: any
-
-dev_dependencies:
-  litetest:
-    path: ../../testing/litetest
-  process_fakes:
-    path: ../pkg/process_fakes

From d1ba5095431f066a009d84a6ffec40ee00bfb850 Mon Sep 17 00:00:00 2001
From: Matan Lurey <matan@lurey.org>
Date: Thu, 11 Jul 2024 14:46:40 -0700
Subject: [PATCH 08/27] Use pyyaml.

---
 tools/pub_get_offline.py | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/tools/pub_get_offline.py b/tools/pub_get_offline.py
index 1cad3d5b0f4e9..f9f498cc3122b 100644
--- a/tools/pub_get_offline.py
+++ b/tools/pub_get_offline.py
@@ -1,3 +1,13 @@
+#!/usr/bin/env vpython3
+
+# [VPYTHON:BEGIN]
+# python_version: "3.8"
+# wheel <
+#   name: "infra/python/wheels/pyyaml/${platform}_${py_python}_${py_abi}"
+#   version: "version:5.4.1.chromium.1"
+# >
+# [VPYTHON:END]
+
 # 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.
@@ -14,6 +24,9 @@
 import subprocess
 import sys
 
+# The import is coming from vpython wheel and pylint cannot find it.
+import yaml  # pylint: disable=import-error
+
 SRC_ROOT = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 ENGINE_DIR = os.path.join(SRC_ROOT, 'flutter')
 
@@ -69,12 +82,7 @@ def package_uses_workspace_resolution(package):
   pubspec = os.path.join(package, 'pubspec.yaml')
 
   with open(pubspec) as pubspec_file:
-    for line in pubspec_file:
-      line = line.strip()
-      if 'resolution: workspace' in line:
-        return True
-
-  return False
+    return yaml.safe_load(pubspec_file).get('resolution') == 'workspace'
 
 
 def check_package_config(package):

From b4c418690e2bd0b14b7516d638c613d8eee5e23a Mon Sep 17 00:00:00 2001
From: Matan Lurey <matan@lurey.org>
Date: Thu, 11 Jul 2024 14:48:54 -0700
Subject: [PATCH 09/27] ++

---
 tools/licenses/lib/paths.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/licenses/lib/paths.dart b/tools/licenses/lib/paths.dart
index 913a5d6213317..fc9874fd973da 100644
--- a/tools/licenses/lib/paths.dart
+++ b/tools/licenses/lib/paths.dart
@@ -105,6 +105,7 @@ final Set<String> skippedPaths = <String>{
   r'flutter/third_party/inja/doc', // documentation
   r'flutter/third_party/inja/third_party/amalgamate', // only used at build time
   r'flutter/third_party/inja/third_party/include/doctest', // seems to be a unit test library
+  r'flutter/third_party/java', // only used for Android builds
   r'flutter/third_party/json/docs',
   r'flutter/third_party/libcxx/benchmarks',
   r'flutter/third_party/libcxx/docs',
@@ -222,7 +223,6 @@ final Set<String> skippedPaths = <String>{
   r'fuchsia/sdk/mac/tools',
   r'out', // output of build
   r'third_party/android_tools', // excluded on advice
-  r'third_party/java', // only used for Android builds
   r'third_party/libxml', // dependency of the testing system that we don't actually use
   r'tools', // not distributed in binary
 };

From 9485af8e1cf6b3a86eb8be1c53377ac4c463b8d1 Mon Sep 17 00:00:00 2001
From: Matan Lurey <matan@lurey.org>
Date: Thu, 11 Jul 2024 14:51:33 -0700
Subject: [PATCH 10/27] Oops.

---
 DEPS | 52 ++++++++++++++++++++++++++--------------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/DEPS b/DEPS
index c60ffb8cb387c..2b538177118a3 100644
--- 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': '037d5f8a727ff3c0e5f3de1caf8a6d1c8e77b032',
+  'skia_revision': '9fd1dc7795896a7744edca4ef6080285f083b34a',
 
   # 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': 'fb546f313557602aa828d3121501a58ffd251e0e',
+  'dart_revision': 'ffc8bb004a64f6357e3d5d1185e974e966f00931',
 
   # 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,8 +65,8 @@ vars = {
   'dart_boringssl_rev': 'd24a38200fef19150eef00cad35b138936c08767',
   'dart_browser_launcher_rev': '60126904a26b761d29b4f2d76292ff3c089160de',
   'dart_clock_rev': 'ad428ea8b75fa0d7ba629791552d40478745c54a',
-  'dart_collection_rev': '0c1f829c29da1d63488be774f430b2035a565d6f',
-  'dart_devtools_rev': 'e77d6ce142b7bc737af3652f5727e449e84b7b03',
+  'dart_collection_rev': '9354f386de3c57f5486b01ab4dfa1a2f033307d9',
+  'dart_devtools_rev': '70375f6c6d81faa8f3069aa6dcf2a98c69445455',
   'dart_libprotobuf_rev': '24487dd1045c7f3d64a21f38a3f0c06cc4cf2edb',
   'dart_perfetto_rev': '13ce0c9e13b0940d2476cd0cff2301708a9a2e2b',
   'dart_protobuf_gn_rev': 'ca669f79945418f6229e4fef89b666b2a88cbb10',
@@ -77,7 +77,7 @@ vars = {
   'dart_web_rev': 'e4c4d8126466e28dc137890b8f999da59bdedddd',
   'dart_webdev_rev': '75417c09181c97786d9539a662834bed9d2f1e77',
   'dart_webkit_inspection_protocol_rev': '32fffa53df3f54005c742ddf4f859fb585a6b254',
-  'dart_yaml_edit_rev': 'd605cce3946828253a97f4b3de1a43260b6edf3b',
+  'dart_yaml_edit_rev': '57a28daea82a3f00f57a90d5ea6df6a458b2f781',
 
   'ocmock_rev': 'c4ec0e3a7a9f56cfdbd0aa01f4f97bb4b75c5ef8', # v3.7.1
 
@@ -277,7 +277,7 @@ allowed_hosts = [
 ]
 
 deps = {
-  'src': 'https://github.com/flutter/buildroot.git' + '@' + 'e265c359126b24351f534080fb22edaa159f2215',
+  'src': 'https://github.com/flutter/buildroot.git' + '@' + '8c2d66fa4e6298894425f5bdd0591bc5b1154c53',
 
   'src/flutter/third_party/depot_tools':
   Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '580b4ff3f5cd0dcaa2eacda28cefe0f45320e8f7',
@@ -347,16 +347,16 @@ deps = {
    Var('chromium_git') + '/external/github.com/WebAssembly/binaryen.git@654ee6e2504f11fb0e982a2cf276bafa750f694b',
 
   'src/flutter/third_party/dart/third_party/devtools':
-   {'dep_type': 'cipd', 'packages': [{'package': 'dart/third_party/flutter/devtools', 'version': 'git_revision:e77d6ce142b7bc737af3652f5727e449e84b7b03'}]},
+   {'dep_type': 'cipd', 'packages': [{'package': 'dart/third_party/flutter/devtools', 'version': 'git_revision:70375f6c6d81faa8f3069aa6dcf2a98c69445455'}]},
 
   'src/flutter/third_party/dart/third_party/pkg/args':
-   Var('dart_git') + '/args.git@1a24d614423e7861ae2e341bfb19050959cef0cd',
+   Var('dart_git') + '/args.git@6a5a2e6b1f0020b873c7ffbdd36a784c4f9ee300',
 
   'src/flutter/third_party/dart/third_party/pkg/async':
    Var('dart_git') + '/async.git@c0d81f8699682d01d657a9bf827107d11904a247',
 
   'src/flutter/third_party/dart/third_party/pkg/bazel_worker':
-   Var('dart_git') + '/bazel_worker.git@02f190b88df771fc8e05c07d4b64ae942c02f456',
+   Var('dart_git') + '/bazel_worker.git@c76d7c86381a6ed594641ba03b55c65b84ee11a6',
 
   'src/flutter/third_party/dart/third_party/pkg/boolean_selector':
    Var('dart_git') + '/boolean_selector.git@c5468f44fd9ca0ea3435e1a0a84ff9b6fac38261',
@@ -386,40 +386,40 @@ deps = {
    Var('dart_git') + '/dart_style.git@a6ad7693555a9add6f98ad6fd94de80d35c89415',
 
   'src/flutter/third_party/dart/third_party/pkg/dartdoc':
-   Var('dart_git') + '/dartdoc.git@5e8de164057dd5f7f34eee0ad443dc2f59c60c1c',
+   Var('dart_git') + '/dartdoc.git@7e5da6090e6a48cebaee8789ca0fc396b34fd8a4',
 
   'src/flutter/third_party/dart/third_party/pkg/file':
-   Var('dart_git') + '/external/github.com/google/file.dart@855831c242a17c2dee163828d52710d9043c7c8d',
+   Var('dart_git') + '/external/github.com/google/file.dart@07cacaed6679a173e29176747e6ce0325742749f',
 
   'src/flutter/third_party/dart/third_party/pkg/fixnum':
    Var('dart_git') + '/fixnum.git@6c19e60366ce3d5edfaed51a7c12c98e7977977e',
 
   'src/flutter/third_party/dart/third_party/pkg/glob':
-   Var('dart_git') + '/glob.git@8b05be87f84f74d90dc0c15956f3ff95805322e5',
+   Var('dart_git') + '/glob.git@6d3ba5ec02817e62d17ace040590bb81a3e1242f',
 
   'src/flutter/third_party/dart/third_party/pkg/html':
    Var('dart_git') + '/html.git@0da420ca1e196cda54ede476d0d8d3ecf55375ef',
 
   'src/flutter/third_party/dart/third_party/pkg/http':
-   Var('dart_git') + '/http.git@4178b67e7970ff02926e79649db5ab473b46cf30',
+   Var('dart_git') + '/http.git@8d893851904d8cd292a66e39812b59aca2cc4d96',
 
   'src/flutter/third_party/dart/third_party/pkg/http_multi_server':
-   Var('dart_git') + '/http_multi_server.git@8348be1bf8fd17881e2643086e68c9d2b28dd9ce',
+   Var('dart_git') + '/http_multi_server.git@25941e260658efb324de857e6022f418faf9bdd1',
 
   'src/flutter/third_party/dart/third_party/pkg/http_parser':
-   Var('dart_git') + '/http_parser.git@ce528cf82f3d26ac761e29b2494a9e0c270d4939',
+   Var('dart_git') + '/http_parser.git@9bf7bd981a39137da1e5d7fe64f4652b078c7aa9',
 
   'src/flutter/third_party/dart/third_party/pkg/intl':
    Var('dart_git') + '/intl.git@5d65e3808ce40e6282e40881492607df4e35669f',
 
   'src/flutter/third_party/dart/third_party/pkg/json_rpc_2':
-   Var('dart_git') + '/json_rpc_2.git@b4810dc7bee5828f240586c81f3f34853cacdbce',
+   Var('dart_git') + '/json_rpc_2.git@616937f6d3837e38a2a287653ddaf722de260702',
 
   'src/flutter/third_party/dart/third_party/pkg/leak_tracker':
    Var('dart_git') + '/leak_tracker.git@f5620600a5ce1c44f65ddaa02001e200b096e14c',
 
   'src/flutter/third_party/dart/third_party/pkg/logging':
-   Var('dart_git') + '/logging.git@8752902b75a476d2c7b64dcf01aaaee885f35c4c',
+   Var('dart_git') + '/logging.git@6c3fb37fecb2e30415072f327b834a3e95517fa9',
 
   'src/flutter/third_party/dart/third_party/pkg/markdown':
    Var('dart_git') + '/markdown.git@62424376d0b5fe35a2957b3caed4b75db010ba82',
@@ -431,13 +431,13 @@ deps = {
    Var('dart_git') + '/mime.git@11fec7d6df509a4efd554051cc27e3bf82df9c96',
 
   'src/flutter/third_party/dart/third_party/pkg/mockito':
-   Var('dart_git') + '/mockito.git@eb4d1daa20c105c94ac29689c1975f0850fa18f2',
+   Var('dart_git') + '/mockito.git@a7fdf7101fbd31132a59188a6057d21004345927',
 
   'src/flutter/third_party/dart/third_party/pkg/native':
-   Var('dart_git') + '/native.git@bc0a10865b5b7b0c5444581b77728fc20bffedb8',
+   Var('dart_git') + '/native.git@fcc783c1d2777555616dfc850f131878ea5d88a9',
 
   'src/flutter/third_party/dart/third_party/pkg/package_config':
-   Var('dart_git') + '/package_config.git@f0b72567d85b827aa0f53991fe8a4a8bf36eb479',
+   Var('dart_git') + '/package_config.git@903a0e528f91aef90821c8f5eaafbc1ae27198ab',
 
   'src/flutter/third_party/dart/third_party/pkg/path':
    Var('dart_git') + '/path.git@e969f42ed112dd702a9453beb9df6c12ae2d3805',
@@ -461,10 +461,10 @@ deps = {
    Var('dart_git') + '/source_map_stack_trace.git@741b6ceb4b6cdb8ff620664337d7ecc63ca52cc1',
 
   'src/flutter/third_party/dart/third_party/pkg/source_maps':
-   Var('dart_git') + '/source_maps.git@5f82c613664ade03c7a6d0e6c59687c69dec894b',
+   Var('dart_git') + '/source_maps.git@caa79c2011015759c6cf3299f299f5cccdf8bb61',
 
   'src/flutter/third_party/dart/third_party/pkg/source_span':
-   Var('dart_git') + '/source_span.git@f81cd4a2df630a97264fb4015fb93944b5b98b11',
+   Var('dart_git') + '/source_span.git@89520f3009e332ce2b6675f71dca166521c36cc4',
 
   'src/flutter/third_party/dart/third_party/pkg/sse':
    Var('dart_git') + '/sse.git@52d042ff9ab2d0e5bc26805d74a03077a67861e1',
@@ -476,7 +476,7 @@ deps = {
    Var('dart_git') + '/stream_channel.git@28a65331aa2d66a5e953205aa462bcdb1e240a5b',
 
   'src/flutter/third_party/dart/third_party/pkg/string_scanner':
-   Var('dart_git') + '/string_scanner.git@a40bbbd83f1176bcc0021b336f5841310f91d8cb',
+   Var('dart_git') + '/string_scanner.git@0de03b5279a04aa05052ce306f90fca473c6fd1a',
 
   'src/flutter/third_party/dart/third_party/pkg/tar':
    Var('dart_git') + '/external/github.com/simolus3/tar.git@552a49d7595e444184d4f91e9afd533aa253a31d',
@@ -485,7 +485,7 @@ deps = {
    Var('dart_git') + '/term_glyph.git@38a158f55006cf30942c928171ea601ee5e0308f',
 
   'src/flutter/third_party/dart/third_party/pkg/test':
-   Var('dart_git') + '/test.git@14f9b3ec7e06f987dd70bb1f47267462ce218048',
+   Var('dart_git') + '/test.git@3256c23cc753a184bb3bf27610a7c8410735e3ac',
 
   'src/flutter/third_party/dart/third_party/pkg/test_reflective_loader':
    Var('dart_git') + '/test_reflective_loader.git@6e648863b39aab8d0204e769d25805eea9db0ac4',
@@ -518,7 +518,7 @@ deps = {
    Var('dart_git') + '/yaml_edit.git' + '@' + Var('dart_yaml_edit_rev'),
 
   'src/flutter/third_party/dart/tools/sdks/dart-sdk':
-   {'dep_type': 'cipd', 'packages': [{'package': 'dart/dart-sdk/${{platform}}', 'version': 'git_revision:7e6469bd51d404916395a47b011d907d2c905121'}]},
+   {'dep_type': 'cipd', 'packages': [{'package': 'dart/dart-sdk/${{platform}}', 'version': 'version:3.5.0-278.0.dev'}]},
 
   # WARNING: end of dart dependencies list that is cleaned up automatically - see create_updated_flutter_deps.py.
 
@@ -969,7 +969,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/linux-amd64',
-        'version': '0e47sje8wkJ08sGJ6FlfWO7Z3CT5g0sEMI2gYD5KCD8C'
+        'version': '-VgqOfoW5sf04SuJh64NbuVnDIwiyl7NyTAD4fsTLNkC'
        }
      ],
      'condition': 'download_fuchsia_deps and not download_fuchsia_sdk',

From 2638753a9926e662e7f821deddff02845f6d109e Mon Sep 17 00:00:00 2001
From: Matan Lurey <matan@lurey.org>
Date: Thu, 11 Jul 2024 14:54:31 -0700
Subject: [PATCH 11/27] ++

---
 tools/licenses/lib/paths.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/licenses/lib/paths.dart b/tools/licenses/lib/paths.dart
index fc9874fd973da..913a5d6213317 100644
--- a/tools/licenses/lib/paths.dart
+++ b/tools/licenses/lib/paths.dart
@@ -105,7 +105,6 @@ final Set<String> skippedPaths = <String>{
   r'flutter/third_party/inja/doc', // documentation
   r'flutter/third_party/inja/third_party/amalgamate', // only used at build time
   r'flutter/third_party/inja/third_party/include/doctest', // seems to be a unit test library
-  r'flutter/third_party/java', // only used for Android builds
   r'flutter/third_party/json/docs',
   r'flutter/third_party/libcxx/benchmarks',
   r'flutter/third_party/libcxx/docs',
@@ -223,6 +222,7 @@ final Set<String> skippedPaths = <String>{
   r'fuchsia/sdk/mac/tools',
   r'out', // output of build
   r'third_party/android_tools', // excluded on advice
+  r'third_party/java', // only used for Android builds
   r'third_party/libxml', // dependency of the testing system that we don't actually use
   r'tools', // not distributed in binary
 };

From 46853e1383e8c5d3ee799f7e65219de674d5f5e1 Mon Sep 17 00:00:00 2001
From: Matan Lurey <matan@lurey.org>
Date: Thu, 11 Jul 2024 14:55:25 -0700
Subject: [PATCH 12/27] ++

---
 DEPS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DEPS b/DEPS
index 459a873c9a764..2b538177118a3 100644
--- 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': 'ddf045505cb9a61bf90fd404f663d88254ef7553',
+  'skia_revision': '9fd1dc7795896a7744edca4ef6080285f083b34a',
 
   # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
   # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.

From 339abd3576ce09c99edc246813b5e57bf63efd7c Mon Sep 17 00:00:00 2001
From: Matan Lurey <matan@lurey.org>
Date: Thu, 11 Jul 2024 15:29:37 -0700
Subject: [PATCH 13/27] ++

---
 tools/pub_get_offline.py | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/tools/pub_get_offline.py b/tools/pub_get_offline.py
index f9f498cc3122b..ae1c01306d650 100644
--- a/tools/pub_get_offline.py
+++ b/tools/pub_get_offline.py
@@ -1,13 +1,3 @@
-#!/usr/bin/env vpython3
-
-# [VPYTHON:BEGIN]
-# python_version: "3.8"
-# wheel <
-#   name: "infra/python/wheels/pyyaml/${platform}_${py_python}_${py_abi}"
-#   version: "version:5.4.1.chromium.1"
-# >
-# [VPYTHON:END]
-
 # 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.
@@ -24,8 +14,9 @@
 import subprocess
 import sys
 
-# The import is coming from vpython wheel and pylint cannot find it.
-import yaml  # pylint: disable=import-error
+THIS_DIR = os.path.abspath(os.path.dirname(__file__))
+sys.path += [os.path.join(THIS_DIR, '..', '..', '..', 'third_party', 'pyyaml', 'lib3')]
+import yaml # type: ignore
 
 SRC_ROOT = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 ENGINE_DIR = os.path.join(SRC_ROOT, 'flutter')

From 3ed2f04549875c506cb95a51c01c62960a37d97a Mon Sep 17 00:00:00 2001
From: Matan Lurey <matan@lurey.org>
Date: Thu, 11 Jul 2024 15:49:19 -0700
Subject: [PATCH 14/27] ++

---
 tools/pub_get_offline.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/pub_get_offline.py b/tools/pub_get_offline.py
index ae1c01306d650..cf4657d8d206d 100644
--- a/tools/pub_get_offline.py
+++ b/tools/pub_get_offline.py
@@ -15,7 +15,7 @@
 import sys
 
 THIS_DIR = os.path.abspath(os.path.dirname(__file__))
-sys.path += [os.path.join(THIS_DIR, '..', '..', '..', 'third_party', 'pyyaml', 'lib3')]
+sys.path += [os.path.join(THIS_DIR, '..', 'third_party', 'pyyaml', 'lib3')]
 import yaml # type: ignore
 
 SRC_ROOT = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))

From d8892203126bdc7180266cfd81bba1321ff3b7c6 Mon Sep 17 00:00:00 2001
From: Matan Lurey <matan@lurey.org>
Date: Thu, 11 Jul 2024 15:51:30 -0700
Subject: [PATCH 15/27] ++|

---
 tools/pub_get_offline.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/pub_get_offline.py b/tools/pub_get_offline.py
index cf4657d8d206d..cc748141037ba 100644
--- a/tools/pub_get_offline.py
+++ b/tools/pub_get_offline.py
@@ -16,7 +16,7 @@
 
 THIS_DIR = os.path.abspath(os.path.dirname(__file__))
 sys.path += [os.path.join(THIS_DIR, '..', 'third_party', 'pyyaml', 'lib3')]
-import yaml # type: ignore
+import yaml  # type: ignore
 
 SRC_ROOT = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 ENGINE_DIR = os.path.join(SRC_ROOT, 'flutter')

From eb2303a1c4950ee1bca0c1ddfda0cb82736b2c4d Mon Sep 17 00:00:00 2001
From: Matan Lurey <matanlurey@users.noreply.github.com>
Date: Wed, 17 Jul 2024 10:38:03 -0700
Subject: [PATCH 16/27] Update pubspec.yaml
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Loïc Sharma <737941+loic-sharma@users.noreply.github.com>
---
 pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index b16ff54e2be99..f71bebcc6f3fd 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -20,7 +20,7 @@
 # ------------------------------------------------------------------------------
 # (1) ADDING A NEW DEPENDENCY
 # ------------------------------------------------------------------------------
-# Dependencies need to be added either via the DEPS file, or by checking they
+# Dependencies need to be added either via the DEPS file, or by checking if they
 # are available in the vendored Dart SDK (see notes below on library locations).
 # If they are available, do the following.
 #

From ef6605dae4a98c1e05f153ba4fe623e84c725c6f Mon Sep 17 00:00:00 2001
From: Matan Lurey <matanlurey@users.noreply.github.com>
Date: Wed, 17 Jul 2024 10:38:10 -0700
Subject: [PATCH 17/27] Update pubspec.yaml
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Loïc Sharma <737941+loic-sharma@users.noreply.github.com>
---
 pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index f71bebcc6f3fd..06d9fc4a3a5b3 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -30,7 +30,7 @@
 # (2) CREATING A NEW PACKAGE
 # ------------------------------------------------------------------------------
 # If creating a package, say in ./tools or ./tools/pkg, ensure the following
-# header in it's respective `pubspec.yaml`:
+# header in its respective `pubspec.yaml`:
 # ```
 # # We don't publish packages to pub.dev from the engine repository.
 # publish_to: none

From 2d727a6707ab0eba457eb0e52f274a466a3dfbe8 Mon Sep 17 00:00:00 2001
From: Matan Lurey <matanlurey@users.noreply.github.com>
Date: Wed, 17 Jul 2024 10:38:18 -0700
Subject: [PATCH 18/27] Update pubspec.yaml
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Loïc Sharma <737941+loic-sharma@users.noreply.github.com>
---
 pubspec.yaml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index 06d9fc4a3a5b3..23ae972fa6e4f 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -22,9 +22,7 @@
 # ------------------------------------------------------------------------------
 # Dependencies need to be added either via the DEPS file, or by checking if they
 # are available in the vendored Dart SDK (see notes below on library locations).
-# If they are available, do the following.
-#
-# See (4) for how to add dependencies to a package in the workspace.
+# If dependencies are available, see (4) for how to add dependencies to a package in the workspace.
 #
 # ------------------------------------------------------------------------------
 # (2) CREATING A NEW PACKAGE

From 8ee0c85224802f3e8cd97a6a548f344159553e97 Mon Sep 17 00:00:00 2001
From: Matan Lurey <matan@lurey.org>
Date: Wed, 17 Jul 2024 10:38:48 -0700
Subject: [PATCH 19/27] Fix DEPS merge.

---
 DEPS | 70 ++++++++++++++++++++++++++++++------------------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/DEPS b/DEPS
index ceb81f73fa7a5..bcecca3616355 100644
--- 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': '4d2047aa3c8db76ae6dfc11f0695ee9a2555d5ba',
+  'skia_revision': 'ddf045505cb9a61bf90fd404f663d88254ef7553',
 
   # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
   # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
@@ -56,15 +56,15 @@ 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': 'd679a4c98193700a649ff17216e23083c6661e7f',
+  'dart_revision': 'fb546f313557602aa828d3121501a58ffd251e0e',
 
   # 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': '654ee6e2504f11fb0e982a2cf276bafa750f694b',
-  'dart_boringssl_gen_rev': 'fef055e8d2749b82c79c8f043be1cbe5e8e4b40c',
-  'dart_boringssl_rev': '2db0eb3f96a5756298dcd7f9319e56a98585bd10',
-  'dart_browser_launcher_rev': 'fe7ffa13ba59ec6f7d56256f79059344555fdaf2',
-  'dart_clock_rev': '6e43768a0b135a0d36fc886907b70c4bf27117e6',
+  'dart_boringssl_gen_rev': '9c7294fd58261a79794f5afaa26598cf1442ad20',
+  'dart_boringssl_rev': 'd24a38200fef19150eef00cad35b138936c08767',
+  'dart_browser_launcher_rev': '60126904a26b761d29b4f2d76292ff3c089160de',
+  'dart_clock_rev': 'ad428ea8b75fa0d7ba629791552d40478745c54a',
   'dart_collection_rev': '0c1f829c29da1d63488be774f430b2035a565d6f',
   'dart_devtools_rev': 'e77d6ce142b7bc737af3652f5727e449e84b7b03',
   'dart_libprotobuf_rev': '24487dd1045c7f3d64a21f38a3f0c06cc4cf2edb',
@@ -72,12 +72,12 @@ vars = {
   'dart_protobuf_gn_rev': 'ca669f79945418f6229e4fef89b666b2a88cbb10',
   'dart_protobuf_rev': 'ccf104dbc36929c0f8708285d5f3a8fae206343e',
   'dart_pub_rev': 'ea4a1c854690d3abceb92c8cc2c6454470f9d5a7',
-  'dart_tools_rev': '6a07a1625f57c4b5844e26e51d30de0444a84763',
+  'dart_tools_rev': '43a8582a85d2220b5f1ca8383d97587792085b36',
   'dart_watcher_rev': '0484625589d8512b36a7ad898a6cc6351d24c556',
-  'dart_web_rev': 'e89fe49d8a86845e49686b4578c56b67bdd7ba49',
+  'dart_web_rev': 'e4c4d8126466e28dc137890b8f999da59bdedddd',
   'dart_webdev_rev': '75417c09181c97786d9539a662834bed9d2f1e77',
   'dart_webkit_inspection_protocol_rev': '32fffa53df3f54005c742ddf4f859fb585a6b254',
-  'dart_yaml_edit_rev': '57a28daea82a3f00f57a90d5ea6df6a458b2f781',
+  'dart_yaml_edit_rev': 'd605cce3946828253a97f4b3de1a43260b6edf3b',
 
   'ocmock_rev': 'c4ec0e3a7a9f56cfdbd0aa01f4f97bb4b75c5ef8', # v3.7.1
 
@@ -277,7 +277,7 @@ allowed_hosts = [
 ]
 
 deps = {
-  'src': 'https://github.com/flutter/buildroot.git' + '@' + '8c2d66fa4e6298894425f5bdd0591bc5b1154c53',
+  'src': 'https://github.com/flutter/buildroot.git' + '@' + 'e265c359126b24351f534080fb22edaa159f2215',
 
   'src/flutter/third_party/depot_tools':
   Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '580b4ff3f5cd0dcaa2eacda28cefe0f45320e8f7',
@@ -307,7 +307,7 @@ deps = {
    Var('chromium_git') + '/external/github.com/google/flatbuffers' + '@' + '0a80646371179f8a7a5c1f42c31ee1d44dcf6709',
 
   'src/flutter/third_party/icu':
-   Var('chromium_git') + '/chromium/deps/icu.git' + '@' + '9408c6fd4a39e6fef0e1c4077602e1c83b15f3fb',
+   Var('chromium_git') + '/chromium/deps/icu.git' + '@' + '43953f57b037778a1b8005564afabe214834f7bd',
 
    'src/flutter/third_party/gtest-parallel':
    Var('chromium_git') + '/external/github.com/google/gtest-parallel' + '@' + '38191e2733d7cbaeaef6a3f1a942ddeb38a2ad14',
@@ -347,16 +347,16 @@ deps = {
    Var('chromium_git') + '/external/github.com/WebAssembly/binaryen.git@654ee6e2504f11fb0e982a2cf276bafa750f694b',
 
   'src/flutter/third_party/dart/third_party/devtools':
-   {'dep_type': 'cipd', 'packages': [{'package': 'dart/third_party/flutter/devtools', 'version': 'git_revision:70375f6c6d81faa8f3069aa6dcf2a98c69445455'}]},
+   {'dep_type': 'cipd', 'packages': [{'package': 'dart/third_party/flutter/devtools', 'version': 'git_revision:e77d6ce142b7bc737af3652f5727e449e84b7b03'}]},
 
   'src/flutter/third_party/dart/third_party/pkg/args':
-   Var('dart_git') + '/args.git@6a5a2e6b1f0020b873c7ffbdd36a784c4f9ee300',
+   Var('dart_git') + '/args.git@1a24d614423e7861ae2e341bfb19050959cef0cd',
 
   'src/flutter/third_party/dart/third_party/pkg/async':
    Var('dart_git') + '/async.git@c0d81f8699682d01d657a9bf827107d11904a247',
 
   'src/flutter/third_party/dart/third_party/pkg/bazel_worker':
-   Var('dart_git') + '/bazel_worker.git@c76d7c86381a6ed594641ba03b55c65b84ee11a6',
+   Var('dart_git') + '/bazel_worker.git@02f190b88df771fc8e05c07d4b64ae942c02f456',
 
   'src/flutter/third_party/dart/third_party/pkg/boolean_selector':
    Var('dart_git') + '/boolean_selector.git@c5468f44fd9ca0ea3435e1a0a84ff9b6fac38261',
@@ -365,7 +365,7 @@ deps = {
    Var('dart_git') + '/browser_launcher.git' + '@' + Var('dart_browser_launcher_rev'),
 
   'src/flutter/third_party/dart/third_party/pkg/cli_util':
-   Var('dart_git') + '/cli_util.git@6a0bb9292ea4bb2c9e547af03da4c9948f9556a1',
+   Var('dart_git') + '/cli_util.git@64192706344d0598784bebe1abc4a9bfc2608de0',
 
   'src/flutter/third_party/dart/third_party/pkg/clock':
    Var('dart_git') + '/clock.git' + '@' + Var('dart_clock_rev'),
@@ -386,40 +386,40 @@ deps = {
    Var('dart_git') + '/dart_style.git@a6ad7693555a9add6f98ad6fd94de80d35c89415',
 
   'src/flutter/third_party/dart/third_party/pkg/dartdoc':
-   Var('dart_git') + '/dartdoc.git@1d005239cbe30bac643d7471c6bae5166dc75c8b',
+   Var('dart_git') + '/dartdoc.git@5e8de164057dd5f7f34eee0ad443dc2f59c60c1c',
 
   'src/flutter/third_party/dart/third_party/pkg/file':
-   Var('dart_git') + '/external/github.com/google/file.dart@07cacaed6679a173e29176747e6ce0325742749f',
+   Var('dart_git') + '/external/github.com/google/file.dart@855831c242a17c2dee163828d52710d9043c7c8d',
 
   'src/flutter/third_party/dart/third_party/pkg/fixnum':
    Var('dart_git') + '/fixnum.git@6c19e60366ce3d5edfaed51a7c12c98e7977977e',
 
   'src/flutter/third_party/dart/third_party/pkg/glob':
-   Var('dart_git') + '/glob.git@6d3ba5ec02817e62d17ace040590bb81a3e1242f',
+   Var('dart_git') + '/glob.git@8b05be87f84f74d90dc0c15956f3ff95805322e5',
 
   'src/flutter/third_party/dart/third_party/pkg/html':
    Var('dart_git') + '/html.git@0da420ca1e196cda54ede476d0d8d3ecf55375ef',
 
   'src/flutter/third_party/dart/third_party/pkg/http':
-   Var('dart_git') + '/http.git@757438e938ebe81f4b130e6372897b5f977615a6',
+   Var('dart_git') + '/http.git@4178b67e7970ff02926e79649db5ab473b46cf30',
 
   'src/flutter/third_party/dart/third_party/pkg/http_multi_server':
-   Var('dart_git') + '/http_multi_server.git@25941e260658efb324de857e6022f418faf9bdd1',
+   Var('dart_git') + '/http_multi_server.git@8348be1bf8fd17881e2643086e68c9d2b28dd9ce',
 
   'src/flutter/third_party/dart/third_party/pkg/http_parser':
-   Var('dart_git') + '/http_parser.git@9bf7bd981a39137da1e5d7fe64f4652b078c7aa9',
+   Var('dart_git') + '/http_parser.git@ce528cf82f3d26ac761e29b2494a9e0c270d4939',
 
   'src/flutter/third_party/dart/third_party/pkg/intl':
    Var('dart_git') + '/intl.git@5d65e3808ce40e6282e40881492607df4e35669f',
 
   'src/flutter/third_party/dart/third_party/pkg/json_rpc_2':
-   Var('dart_git') + '/json_rpc_2.git@616937f6d3837e38a2a287653ddaf722de260702',
+   Var('dart_git') + '/json_rpc_2.git@b4810dc7bee5828f240586c81f3f34853cacdbce',
 
   'src/flutter/third_party/dart/third_party/pkg/leak_tracker':
    Var('dart_git') + '/leak_tracker.git@f5620600a5ce1c44f65ddaa02001e200b096e14c',
 
   'src/flutter/third_party/dart/third_party/pkg/logging':
-   Var('dart_git') + '/logging.git@6c3fb37fecb2e30415072f327b834a3e95517fa9',
+   Var('dart_git') + '/logging.git@8752902b75a476d2c7b64dcf01aaaee885f35c4c',
 
   'src/flutter/third_party/dart/third_party/pkg/markdown':
    Var('dart_git') + '/markdown.git@62424376d0b5fe35a2957b3caed4b75db010ba82',
@@ -431,13 +431,13 @@ deps = {
    Var('dart_git') + '/mime.git@11fec7d6df509a4efd554051cc27e3bf82df9c96',
 
   'src/flutter/third_party/dart/third_party/pkg/mockito':
-   Var('dart_git') + '/mockito.git@a7fdf7101fbd31132a59188a6057d21004345927',
+   Var('dart_git') + '/mockito.git@eb4d1daa20c105c94ac29689c1975f0850fa18f2',
 
   'src/flutter/third_party/dart/third_party/pkg/native':
-   Var('dart_git') + '/native.git@b01a3f3ef5e3a219fefb182d4cfc41d2895f32ca',
+   Var('dart_git') + '/native.git@bc0a10865b5b7b0c5444581b77728fc20bffedb8',
 
   'src/flutter/third_party/dart/third_party/pkg/package_config':
-   Var('dart_git') + '/package_config.git@903a0e528f91aef90821c8f5eaafbc1ae27198ab',
+   Var('dart_git') + '/package_config.git@f0b72567d85b827aa0f53991fe8a4a8bf36eb479',
 
   'src/flutter/third_party/dart/third_party/pkg/path':
    Var('dart_git') + '/path.git@e969f42ed112dd702a9453beb9df6c12ae2d3805',
@@ -461,22 +461,22 @@ deps = {
    Var('dart_git') + '/source_map_stack_trace.git@741b6ceb4b6cdb8ff620664337d7ecc63ca52cc1',
 
   'src/flutter/third_party/dart/third_party/pkg/source_maps':
-   Var('dart_git') + '/source_maps.git@caa79c2011015759c6cf3299f299f5cccdf8bb61',
+   Var('dart_git') + '/source_maps.git@5f82c613664ade03c7a6d0e6c59687c69dec894b',
 
   'src/flutter/third_party/dart/third_party/pkg/source_span':
-   Var('dart_git') + '/source_span.git@89520f3009e332ce2b6675f71dca166521c36cc4',
+   Var('dart_git') + '/source_span.git@f81cd4a2df630a97264fb4015fb93944b5b98b11',
 
   'src/flutter/third_party/dart/third_party/pkg/sse':
    Var('dart_git') + '/sse.git@52d042ff9ab2d0e5bc26805d74a03077a67861e1',
 
   'src/flutter/third_party/dart/third_party/pkg/stack_trace':
-   Var('dart_git') + '/stack_trace.git@090d3d186c085fdb913fe5350c666f8d0bd0f60f',
+   Var('dart_git') + '/stack_trace.git@4fd3e2a2dc6611febf4cfb9197ebf9e60fc6a34d',
 
   'src/flutter/third_party/dart/third_party/pkg/stream_channel':
    Var('dart_git') + '/stream_channel.git@28a65331aa2d66a5e953205aa462bcdb1e240a5b',
 
   'src/flutter/third_party/dart/third_party/pkg/string_scanner':
-   Var('dart_git') + '/string_scanner.git@0de03b5279a04aa05052ce306f90fca473c6fd1a',
+   Var('dart_git') + '/string_scanner.git@a40bbbd83f1176bcc0021b336f5841310f91d8cb',
 
   'src/flutter/third_party/dart/third_party/pkg/tar':
    Var('dart_git') + '/external/github.com/simolus3/tar.git@552a49d7595e444184d4f91e9afd533aa253a31d',
@@ -485,7 +485,7 @@ deps = {
    Var('dart_git') + '/term_glyph.git@38a158f55006cf30942c928171ea601ee5e0308f',
 
   'src/flutter/third_party/dart/third_party/pkg/test':
-   Var('dart_git') + '/test.git@2c2ac49de0e9d6ea9744c6e7990d5730806410c0',
+   Var('dart_git') + '/test.git@14f9b3ec7e06f987dd70bb1f47267462ce218048',
 
   'src/flutter/third_party/dart/third_party/pkg/test_reflective_loader':
    Var('dart_git') + '/test_reflective_loader.git@6e648863b39aab8d0204e769d25805eea9db0ac4',
@@ -503,7 +503,7 @@ deps = {
    Var('dart_git') + '/web.git' + '@' + Var('dart_web_rev'),
 
   'src/flutter/third_party/dart/third_party/pkg/web_socket_channel':
-   Var('dart_git') + '/web_socket_channel.git@0e1d6e2eb5a0bfd62e45b772ac7107d796176cf6',
+   Var('dart_git') + '/web_socket_channel.git@8e95ea75302180af075295f7dd7ffe922e26f789',
 
   'src/flutter/third_party/dart/third_party/pkg/webdev':
    Var('dart_git') + '/webdev.git' + '@' + Var('dart_webdev_rev'),
@@ -518,7 +518,7 @@ deps = {
    Var('dart_git') + '/yaml_edit.git' + '@' + Var('dart_yaml_edit_rev'),
 
   'src/flutter/third_party/dart/tools/sdks/dart-sdk':
-   {'dep_type': 'cipd', 'packages': [{'package': 'dart/dart-sdk/${{platform}}', 'version': 'version:3.5.0-278.0.dev'}]},
+   {'dep_type': 'cipd', 'packages': [{'package': 'dart/dart-sdk/${{platform}}', 'version': 'git_revision:7e6469bd51d404916395a47b011d907d2c905121'}]},
 
   # WARNING: end of dart dependencies list that is cleaned up automatically - see create_updated_flutter_deps.py.
 
@@ -792,7 +792,7 @@ deps = {
      'dep_type': 'cipd',
    },
 
-  'src/flutter/third_party/java/openjdk': {
+  'src/third_party/java/openjdk': {
      'packages': [
        {
         'package': 'flutter/java/openjdk/${{platform}}',
@@ -969,7 +969,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/linux-amd64',
-        'version': 'C_ze_BbJWtfB9GdOAJ8adc80nF1Yxh7jJp68b9hCxxMC'
+        'version': '0e47sje8wkJ08sGJ6FlfWO7Z3CT5g0sEMI2gYD5KCD8C'
        }
      ],
      'condition': 'download_fuchsia_deps and not download_fuchsia_sdk',

From d2aa032f722ed0ae98891d2d8485410116fa49a5 Mon Sep 17 00:00:00 2001
From: Matan Lurey <matan@lurey.org>
Date: Wed, 17 Jul 2024 12:25:37 -0700
Subject: [PATCH 20/27] ++

---
 DEPS | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/DEPS b/DEPS
index bcecca3616355..025f391ab915b 100644
--- 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': 'ddf045505cb9a61bf90fd404f663d88254ef7553',
+  'skia_revision': '5efad82d5387047afc91e1b598834d284c72a33a',
 
   # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
   # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
@@ -56,15 +56,15 @@ 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': 'fb546f313557602aa828d3121501a58ffd251e0e',
+  'dart_revision': 'd679a4c98193700a649ff17216e23083c6661e7f',
 
   # 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': '654ee6e2504f11fb0e982a2cf276bafa750f694b',
-  'dart_boringssl_gen_rev': '9c7294fd58261a79794f5afaa26598cf1442ad20',
-  'dart_boringssl_rev': 'd24a38200fef19150eef00cad35b138936c08767',
-  'dart_browser_launcher_rev': '60126904a26b761d29b4f2d76292ff3c089160de',
-  'dart_clock_rev': 'ad428ea8b75fa0d7ba629791552d40478745c54a',
+  'dart_boringssl_gen_rev': 'fef055e8d2749b82c79c8f043be1cbe5e8e4b40c',
+  'dart_boringssl_rev': '2db0eb3f96a5756298dcd7f9319e56a98585bd10',
+  'dart_browser_launcher_rev': 'fe7ffa13ba59ec6f7d56256f79059344555fdaf2',
+  'dart_clock_rev': '6e43768a0b135a0d36fc886907b70c4bf27117e6',
   'dart_collection_rev': '0c1f829c29da1d63488be774f430b2035a565d6f',
   'dart_devtools_rev': 'e77d6ce142b7bc737af3652f5727e449e84b7b03',
   'dart_libprotobuf_rev': '24487dd1045c7f3d64a21f38a3f0c06cc4cf2edb',
@@ -72,9 +72,9 @@ vars = {
   'dart_protobuf_gn_rev': 'ca669f79945418f6229e4fef89b666b2a88cbb10',
   'dart_protobuf_rev': 'ccf104dbc36929c0f8708285d5f3a8fae206343e',
   'dart_pub_rev': 'ea4a1c854690d3abceb92c8cc2c6454470f9d5a7',
-  'dart_tools_rev': '43a8582a85d2220b5f1ca8383d97587792085b36',
+  'dart_tools_rev': '6a07a1625f57c4b5844e26e51d30de0444a84763',
   'dart_watcher_rev': '0484625589d8512b36a7ad898a6cc6351d24c556',
-  'dart_web_rev': 'e4c4d8126466e28dc137890b8f999da59bdedddd',
+  'dart_web_rev': 'e89fe49d8a86845e49686b4578c56b67bdd7ba49',
   'dart_webdev_rev': '75417c09181c97786d9539a662834bed9d2f1e77',
   'dart_webkit_inspection_protocol_rev': '32fffa53df3f54005c742ddf4f859fb585a6b254',
   'dart_yaml_edit_rev': 'd605cce3946828253a97f4b3de1a43260b6edf3b',
@@ -307,7 +307,7 @@ deps = {
    Var('chromium_git') + '/external/github.com/google/flatbuffers' + '@' + '0a80646371179f8a7a5c1f42c31ee1d44dcf6709',
 
   'src/flutter/third_party/icu':
-   Var('chromium_git') + '/chromium/deps/icu.git' + '@' + '43953f57b037778a1b8005564afabe214834f7bd',
+   Var('chromium_git') + '/chromium/deps/icu.git' + '@' + '9408c6fd4a39e6fef0e1c4077602e1c83b15f3fb',
 
    'src/flutter/third_party/gtest-parallel':
    Var('chromium_git') + '/external/github.com/google/gtest-parallel' + '@' + '38191e2733d7cbaeaef6a3f1a942ddeb38a2ad14',
@@ -365,7 +365,7 @@ deps = {
    Var('dart_git') + '/browser_launcher.git' + '@' + Var('dart_browser_launcher_rev'),
 
   'src/flutter/third_party/dart/third_party/pkg/cli_util':
-   Var('dart_git') + '/cli_util.git@64192706344d0598784bebe1abc4a9bfc2608de0',
+   Var('dart_git') + '/cli_util.git@6a0bb9292ea4bb2c9e547af03da4c9948f9556a1',
 
   'src/flutter/third_party/dart/third_party/pkg/clock':
    Var('dart_git') + '/clock.git' + '@' + Var('dart_clock_rev'),
@@ -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@5e8de164057dd5f7f34eee0ad443dc2f59c60c1c',
+   Var('dart_git') + '/dartdoc.git@1d005239cbe30bac643d7471c6bae5166dc75c8b',
 
   'src/flutter/third_party/dart/third_party/pkg/file':
    Var('dart_git') + '/external/github.com/google/file.dart@855831c242a17c2dee163828d52710d9043c7c8d',
@@ -401,7 +401,7 @@ deps = {
    Var('dart_git') + '/html.git@0da420ca1e196cda54ede476d0d8d3ecf55375ef',
 
   'src/flutter/third_party/dart/third_party/pkg/http':
-   Var('dart_git') + '/http.git@4178b67e7970ff02926e79649db5ab473b46cf30',
+   Var('dart_git') + '/http.git@757438e938ebe81f4b130e6372897b5f977615a6',
 
   'src/flutter/third_party/dart/third_party/pkg/http_multi_server':
    Var('dart_git') + '/http_multi_server.git@8348be1bf8fd17881e2643086e68c9d2b28dd9ce',
@@ -434,7 +434,7 @@ deps = {
    Var('dart_git') + '/mockito.git@eb4d1daa20c105c94ac29689c1975f0850fa18f2',
 
   'src/flutter/third_party/dart/third_party/pkg/native':
-   Var('dart_git') + '/native.git@bc0a10865b5b7b0c5444581b77728fc20bffedb8',
+   Var('dart_git') + '/native.git@b01a3f3ef5e3a219fefb182d4cfc41d2895f32ca',
 
   'src/flutter/third_party/dart/third_party/pkg/package_config':
    Var('dart_git') + '/package_config.git@f0b72567d85b827aa0f53991fe8a4a8bf36eb479',
@@ -470,7 +470,7 @@ deps = {
    Var('dart_git') + '/sse.git@52d042ff9ab2d0e5bc26805d74a03077a67861e1',
 
   'src/flutter/third_party/dart/third_party/pkg/stack_trace':
-   Var('dart_git') + '/stack_trace.git@4fd3e2a2dc6611febf4cfb9197ebf9e60fc6a34d',
+   Var('dart_git') + '/stack_trace.git@090d3d186c085fdb913fe5350c666f8d0bd0f60f',
 
   'src/flutter/third_party/dart/third_party/pkg/stream_channel':
    Var('dart_git') + '/stream_channel.git@28a65331aa2d66a5e953205aa462bcdb1e240a5b',
@@ -485,7 +485,7 @@ deps = {
    Var('dart_git') + '/term_glyph.git@38a158f55006cf30942c928171ea601ee5e0308f',
 
   'src/flutter/third_party/dart/third_party/pkg/test':
-   Var('dart_git') + '/test.git@14f9b3ec7e06f987dd70bb1f47267462ce218048',
+   Var('dart_git') + '/test.git@2c2ac49de0e9d6ea9744c6e7990d5730806410c0',
 
   'src/flutter/third_party/dart/third_party/pkg/test_reflective_loader':
    Var('dart_git') + '/test_reflective_loader.git@6e648863b39aab8d0204e769d25805eea9db0ac4',
@@ -503,7 +503,7 @@ deps = {
    Var('dart_git') + '/web.git' + '@' + Var('dart_web_rev'),
 
   'src/flutter/third_party/dart/third_party/pkg/web_socket_channel':
-   Var('dart_git') + '/web_socket_channel.git@8e95ea75302180af075295f7dd7ffe922e26f789',
+   Var('dart_git') + '/web_socket_channel.git@0e1d6e2eb5a0bfd62e45b772ac7107d796176cf6',
 
   'src/flutter/third_party/dart/third_party/pkg/webdev':
    Var('dart_git') + '/webdev.git' + '@' + Var('dart_webdev_rev'),
@@ -792,7 +792,7 @@ deps = {
      'dep_type': 'cipd',
    },
 
-  'src/third_party/java/openjdk': {
+  'src/flutter/third_party/java/openjdk': {
      'packages': [
        {
         'package': 'flutter/java/openjdk/${{platform}}',
@@ -969,7 +969,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/linux-amd64',
-        'version': '0e47sje8wkJ08sGJ6FlfWO7Z3CT5g0sEMI2gYD5KCD8C'
+        'version': 'C_ze_BbJWtfB9GdOAJ8adc80nF1Yxh7jJp68b9hCxxMC'
        }
      ],
      'condition': 'download_fuchsia_deps and not download_fuchsia_sdk',

From d1a92b4367a42ad1c508f1f59acbceaa4cc1dbdd Mon Sep 17 00:00:00 2001
From: Matan Lurey <matan@lurey.org>
Date: Wed, 17 Jul 2024 12:48:17 -0700
Subject: [PATCH 21/27] ++

---
 DEPS | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/DEPS b/DEPS
index 025f391ab915b..bcecca3616355 100644
--- 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': '5efad82d5387047afc91e1b598834d284c72a33a',
+  'skia_revision': 'ddf045505cb9a61bf90fd404f663d88254ef7553',
 
   # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
   # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
@@ -56,15 +56,15 @@ 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': 'd679a4c98193700a649ff17216e23083c6661e7f',
+  'dart_revision': 'fb546f313557602aa828d3121501a58ffd251e0e',
 
   # 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': '654ee6e2504f11fb0e982a2cf276bafa750f694b',
-  'dart_boringssl_gen_rev': 'fef055e8d2749b82c79c8f043be1cbe5e8e4b40c',
-  'dart_boringssl_rev': '2db0eb3f96a5756298dcd7f9319e56a98585bd10',
-  'dart_browser_launcher_rev': 'fe7ffa13ba59ec6f7d56256f79059344555fdaf2',
-  'dart_clock_rev': '6e43768a0b135a0d36fc886907b70c4bf27117e6',
+  'dart_boringssl_gen_rev': '9c7294fd58261a79794f5afaa26598cf1442ad20',
+  'dart_boringssl_rev': 'd24a38200fef19150eef00cad35b138936c08767',
+  'dart_browser_launcher_rev': '60126904a26b761d29b4f2d76292ff3c089160de',
+  'dart_clock_rev': 'ad428ea8b75fa0d7ba629791552d40478745c54a',
   'dart_collection_rev': '0c1f829c29da1d63488be774f430b2035a565d6f',
   'dart_devtools_rev': 'e77d6ce142b7bc737af3652f5727e449e84b7b03',
   'dart_libprotobuf_rev': '24487dd1045c7f3d64a21f38a3f0c06cc4cf2edb',
@@ -72,9 +72,9 @@ vars = {
   'dart_protobuf_gn_rev': 'ca669f79945418f6229e4fef89b666b2a88cbb10',
   'dart_protobuf_rev': 'ccf104dbc36929c0f8708285d5f3a8fae206343e',
   'dart_pub_rev': 'ea4a1c854690d3abceb92c8cc2c6454470f9d5a7',
-  'dart_tools_rev': '6a07a1625f57c4b5844e26e51d30de0444a84763',
+  'dart_tools_rev': '43a8582a85d2220b5f1ca8383d97587792085b36',
   'dart_watcher_rev': '0484625589d8512b36a7ad898a6cc6351d24c556',
-  'dart_web_rev': 'e89fe49d8a86845e49686b4578c56b67bdd7ba49',
+  'dart_web_rev': 'e4c4d8126466e28dc137890b8f999da59bdedddd',
   'dart_webdev_rev': '75417c09181c97786d9539a662834bed9d2f1e77',
   'dart_webkit_inspection_protocol_rev': '32fffa53df3f54005c742ddf4f859fb585a6b254',
   'dart_yaml_edit_rev': 'd605cce3946828253a97f4b3de1a43260b6edf3b',
@@ -307,7 +307,7 @@ deps = {
    Var('chromium_git') + '/external/github.com/google/flatbuffers' + '@' + '0a80646371179f8a7a5c1f42c31ee1d44dcf6709',
 
   'src/flutter/third_party/icu':
-   Var('chromium_git') + '/chromium/deps/icu.git' + '@' + '9408c6fd4a39e6fef0e1c4077602e1c83b15f3fb',
+   Var('chromium_git') + '/chromium/deps/icu.git' + '@' + '43953f57b037778a1b8005564afabe214834f7bd',
 
    'src/flutter/third_party/gtest-parallel':
    Var('chromium_git') + '/external/github.com/google/gtest-parallel' + '@' + '38191e2733d7cbaeaef6a3f1a942ddeb38a2ad14',
@@ -365,7 +365,7 @@ deps = {
    Var('dart_git') + '/browser_launcher.git' + '@' + Var('dart_browser_launcher_rev'),
 
   'src/flutter/third_party/dart/third_party/pkg/cli_util':
-   Var('dart_git') + '/cli_util.git@6a0bb9292ea4bb2c9e547af03da4c9948f9556a1',
+   Var('dart_git') + '/cli_util.git@64192706344d0598784bebe1abc4a9bfc2608de0',
 
   'src/flutter/third_party/dart/third_party/pkg/clock':
    Var('dart_git') + '/clock.git' + '@' + Var('dart_clock_rev'),
@@ -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@1d005239cbe30bac643d7471c6bae5166dc75c8b',
+   Var('dart_git') + '/dartdoc.git@5e8de164057dd5f7f34eee0ad443dc2f59c60c1c',
 
   'src/flutter/third_party/dart/third_party/pkg/file':
    Var('dart_git') + '/external/github.com/google/file.dart@855831c242a17c2dee163828d52710d9043c7c8d',
@@ -401,7 +401,7 @@ deps = {
    Var('dart_git') + '/html.git@0da420ca1e196cda54ede476d0d8d3ecf55375ef',
 
   'src/flutter/third_party/dart/third_party/pkg/http':
-   Var('dart_git') + '/http.git@757438e938ebe81f4b130e6372897b5f977615a6',
+   Var('dart_git') + '/http.git@4178b67e7970ff02926e79649db5ab473b46cf30',
 
   'src/flutter/third_party/dart/third_party/pkg/http_multi_server':
    Var('dart_git') + '/http_multi_server.git@8348be1bf8fd17881e2643086e68c9d2b28dd9ce',
@@ -434,7 +434,7 @@ deps = {
    Var('dart_git') + '/mockito.git@eb4d1daa20c105c94ac29689c1975f0850fa18f2',
 
   'src/flutter/third_party/dart/third_party/pkg/native':
-   Var('dart_git') + '/native.git@b01a3f3ef5e3a219fefb182d4cfc41d2895f32ca',
+   Var('dart_git') + '/native.git@bc0a10865b5b7b0c5444581b77728fc20bffedb8',
 
   'src/flutter/third_party/dart/third_party/pkg/package_config':
    Var('dart_git') + '/package_config.git@f0b72567d85b827aa0f53991fe8a4a8bf36eb479',
@@ -470,7 +470,7 @@ deps = {
    Var('dart_git') + '/sse.git@52d042ff9ab2d0e5bc26805d74a03077a67861e1',
 
   'src/flutter/third_party/dart/third_party/pkg/stack_trace':
-   Var('dart_git') + '/stack_trace.git@090d3d186c085fdb913fe5350c666f8d0bd0f60f',
+   Var('dart_git') + '/stack_trace.git@4fd3e2a2dc6611febf4cfb9197ebf9e60fc6a34d',
 
   'src/flutter/third_party/dart/third_party/pkg/stream_channel':
    Var('dart_git') + '/stream_channel.git@28a65331aa2d66a5e953205aa462bcdb1e240a5b',
@@ -485,7 +485,7 @@ deps = {
    Var('dart_git') + '/term_glyph.git@38a158f55006cf30942c928171ea601ee5e0308f',
 
   'src/flutter/third_party/dart/third_party/pkg/test':
-   Var('dart_git') + '/test.git@2c2ac49de0e9d6ea9744c6e7990d5730806410c0',
+   Var('dart_git') + '/test.git@14f9b3ec7e06f987dd70bb1f47267462ce218048',
 
   'src/flutter/third_party/dart/third_party/pkg/test_reflective_loader':
    Var('dart_git') + '/test_reflective_loader.git@6e648863b39aab8d0204e769d25805eea9db0ac4',
@@ -503,7 +503,7 @@ deps = {
    Var('dart_git') + '/web.git' + '@' + Var('dart_web_rev'),
 
   'src/flutter/third_party/dart/third_party/pkg/web_socket_channel':
-   Var('dart_git') + '/web_socket_channel.git@0e1d6e2eb5a0bfd62e45b772ac7107d796176cf6',
+   Var('dart_git') + '/web_socket_channel.git@8e95ea75302180af075295f7dd7ffe922e26f789',
 
   'src/flutter/third_party/dart/third_party/pkg/webdev':
    Var('dart_git') + '/webdev.git' + '@' + Var('dart_webdev_rev'),
@@ -792,7 +792,7 @@ deps = {
      'dep_type': 'cipd',
    },
 
-  'src/flutter/third_party/java/openjdk': {
+  'src/third_party/java/openjdk': {
      'packages': [
        {
         'package': 'flutter/java/openjdk/${{platform}}',
@@ -969,7 +969,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/linux-amd64',
-        'version': 'C_ze_BbJWtfB9GdOAJ8adc80nF1Yxh7jJp68b9hCxxMC'
+        'version': '0e47sje8wkJ08sGJ6FlfWO7Z3CT5g0sEMI2gYD5KCD8C'
        }
      ],
      'condition': 'download_fuchsia_deps and not download_fuchsia_sdk',

From d4fa1df6a4fbbb4a4f9c9a0754c2a3d9801e6c5d Mon Sep 17 00:00:00 2001
From: Matan Lurey <matan@lurey.org>
Date: Wed, 17 Jul 2024 12:48:57 -0700
Subject: [PATCH 22/27] ++

---
 DEPS | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/DEPS b/DEPS
index bcecca3616355..025f391ab915b 100644
--- 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': 'ddf045505cb9a61bf90fd404f663d88254ef7553',
+  'skia_revision': '5efad82d5387047afc91e1b598834d284c72a33a',
 
   # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
   # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
@@ -56,15 +56,15 @@ 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': 'fb546f313557602aa828d3121501a58ffd251e0e',
+  'dart_revision': 'd679a4c98193700a649ff17216e23083c6661e7f',
 
   # 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': '654ee6e2504f11fb0e982a2cf276bafa750f694b',
-  'dart_boringssl_gen_rev': '9c7294fd58261a79794f5afaa26598cf1442ad20',
-  'dart_boringssl_rev': 'd24a38200fef19150eef00cad35b138936c08767',
-  'dart_browser_launcher_rev': '60126904a26b761d29b4f2d76292ff3c089160de',
-  'dart_clock_rev': 'ad428ea8b75fa0d7ba629791552d40478745c54a',
+  'dart_boringssl_gen_rev': 'fef055e8d2749b82c79c8f043be1cbe5e8e4b40c',
+  'dart_boringssl_rev': '2db0eb3f96a5756298dcd7f9319e56a98585bd10',
+  'dart_browser_launcher_rev': 'fe7ffa13ba59ec6f7d56256f79059344555fdaf2',
+  'dart_clock_rev': '6e43768a0b135a0d36fc886907b70c4bf27117e6',
   'dart_collection_rev': '0c1f829c29da1d63488be774f430b2035a565d6f',
   'dart_devtools_rev': 'e77d6ce142b7bc737af3652f5727e449e84b7b03',
   'dart_libprotobuf_rev': '24487dd1045c7f3d64a21f38a3f0c06cc4cf2edb',
@@ -72,9 +72,9 @@ vars = {
   'dart_protobuf_gn_rev': 'ca669f79945418f6229e4fef89b666b2a88cbb10',
   'dart_protobuf_rev': 'ccf104dbc36929c0f8708285d5f3a8fae206343e',
   'dart_pub_rev': 'ea4a1c854690d3abceb92c8cc2c6454470f9d5a7',
-  'dart_tools_rev': '43a8582a85d2220b5f1ca8383d97587792085b36',
+  'dart_tools_rev': '6a07a1625f57c4b5844e26e51d30de0444a84763',
   'dart_watcher_rev': '0484625589d8512b36a7ad898a6cc6351d24c556',
-  'dart_web_rev': 'e4c4d8126466e28dc137890b8f999da59bdedddd',
+  'dart_web_rev': 'e89fe49d8a86845e49686b4578c56b67bdd7ba49',
   'dart_webdev_rev': '75417c09181c97786d9539a662834bed9d2f1e77',
   'dart_webkit_inspection_protocol_rev': '32fffa53df3f54005c742ddf4f859fb585a6b254',
   'dart_yaml_edit_rev': 'd605cce3946828253a97f4b3de1a43260b6edf3b',
@@ -307,7 +307,7 @@ deps = {
    Var('chromium_git') + '/external/github.com/google/flatbuffers' + '@' + '0a80646371179f8a7a5c1f42c31ee1d44dcf6709',
 
   'src/flutter/third_party/icu':
-   Var('chromium_git') + '/chromium/deps/icu.git' + '@' + '43953f57b037778a1b8005564afabe214834f7bd',
+   Var('chromium_git') + '/chromium/deps/icu.git' + '@' + '9408c6fd4a39e6fef0e1c4077602e1c83b15f3fb',
 
    'src/flutter/third_party/gtest-parallel':
    Var('chromium_git') + '/external/github.com/google/gtest-parallel' + '@' + '38191e2733d7cbaeaef6a3f1a942ddeb38a2ad14',
@@ -365,7 +365,7 @@ deps = {
    Var('dart_git') + '/browser_launcher.git' + '@' + Var('dart_browser_launcher_rev'),
 
   'src/flutter/third_party/dart/third_party/pkg/cli_util':
-   Var('dart_git') + '/cli_util.git@64192706344d0598784bebe1abc4a9bfc2608de0',
+   Var('dart_git') + '/cli_util.git@6a0bb9292ea4bb2c9e547af03da4c9948f9556a1',
 
   'src/flutter/third_party/dart/third_party/pkg/clock':
    Var('dart_git') + '/clock.git' + '@' + Var('dart_clock_rev'),
@@ -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@5e8de164057dd5f7f34eee0ad443dc2f59c60c1c',
+   Var('dart_git') + '/dartdoc.git@1d005239cbe30bac643d7471c6bae5166dc75c8b',
 
   'src/flutter/third_party/dart/third_party/pkg/file':
    Var('dart_git') + '/external/github.com/google/file.dart@855831c242a17c2dee163828d52710d9043c7c8d',
@@ -401,7 +401,7 @@ deps = {
    Var('dart_git') + '/html.git@0da420ca1e196cda54ede476d0d8d3ecf55375ef',
 
   'src/flutter/third_party/dart/third_party/pkg/http':
-   Var('dart_git') + '/http.git@4178b67e7970ff02926e79649db5ab473b46cf30',
+   Var('dart_git') + '/http.git@757438e938ebe81f4b130e6372897b5f977615a6',
 
   'src/flutter/third_party/dart/third_party/pkg/http_multi_server':
    Var('dart_git') + '/http_multi_server.git@8348be1bf8fd17881e2643086e68c9d2b28dd9ce',
@@ -434,7 +434,7 @@ deps = {
    Var('dart_git') + '/mockito.git@eb4d1daa20c105c94ac29689c1975f0850fa18f2',
 
   'src/flutter/third_party/dart/third_party/pkg/native':
-   Var('dart_git') + '/native.git@bc0a10865b5b7b0c5444581b77728fc20bffedb8',
+   Var('dart_git') + '/native.git@b01a3f3ef5e3a219fefb182d4cfc41d2895f32ca',
 
   'src/flutter/third_party/dart/third_party/pkg/package_config':
    Var('dart_git') + '/package_config.git@f0b72567d85b827aa0f53991fe8a4a8bf36eb479',
@@ -470,7 +470,7 @@ deps = {
    Var('dart_git') + '/sse.git@52d042ff9ab2d0e5bc26805d74a03077a67861e1',
 
   'src/flutter/third_party/dart/third_party/pkg/stack_trace':
-   Var('dart_git') + '/stack_trace.git@4fd3e2a2dc6611febf4cfb9197ebf9e60fc6a34d',
+   Var('dart_git') + '/stack_trace.git@090d3d186c085fdb913fe5350c666f8d0bd0f60f',
 
   'src/flutter/third_party/dart/third_party/pkg/stream_channel':
    Var('dart_git') + '/stream_channel.git@28a65331aa2d66a5e953205aa462bcdb1e240a5b',
@@ -485,7 +485,7 @@ deps = {
    Var('dart_git') + '/term_glyph.git@38a158f55006cf30942c928171ea601ee5e0308f',
 
   'src/flutter/third_party/dart/third_party/pkg/test':
-   Var('dart_git') + '/test.git@14f9b3ec7e06f987dd70bb1f47267462ce218048',
+   Var('dart_git') + '/test.git@2c2ac49de0e9d6ea9744c6e7990d5730806410c0',
 
   'src/flutter/third_party/dart/third_party/pkg/test_reflective_loader':
    Var('dart_git') + '/test_reflective_loader.git@6e648863b39aab8d0204e769d25805eea9db0ac4',
@@ -503,7 +503,7 @@ deps = {
    Var('dart_git') + '/web.git' + '@' + Var('dart_web_rev'),
 
   'src/flutter/third_party/dart/third_party/pkg/web_socket_channel':
-   Var('dart_git') + '/web_socket_channel.git@8e95ea75302180af075295f7dd7ffe922e26f789',
+   Var('dart_git') + '/web_socket_channel.git@0e1d6e2eb5a0bfd62e45b772ac7107d796176cf6',
 
   'src/flutter/third_party/dart/third_party/pkg/webdev':
    Var('dart_git') + '/webdev.git' + '@' + Var('dart_webdev_rev'),
@@ -792,7 +792,7 @@ deps = {
      'dep_type': 'cipd',
    },
 
-  'src/third_party/java/openjdk': {
+  'src/flutter/third_party/java/openjdk': {
      'packages': [
        {
         'package': 'flutter/java/openjdk/${{platform}}',
@@ -969,7 +969,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/linux-amd64',
-        'version': '0e47sje8wkJ08sGJ6FlfWO7Z3CT5g0sEMI2gYD5KCD8C'
+        'version': 'C_ze_BbJWtfB9GdOAJ8adc80nF1Yxh7jJp68b9hCxxMC'
        }
      ],
      'condition': 'download_fuchsia_deps and not download_fuchsia_sdk',

From e0c31a8d5ee8f2964e4f3089029332d3b72e7b83 Mon Sep 17 00:00:00 2001
From: Matan Lurey <matan@lurey.org>
Date: Wed, 17 Jul 2024 13:07:09 -0700
Subject: [PATCH 23/27] ++

---
 ci/licenses_golden/excluded_files | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ci/licenses_golden/excluded_files b/ci/licenses_golden/excluded_files
index c33ed59bac3fd..5968a671eb808 100644
--- a/ci/licenses_golden/excluded_files
+++ b/ci/licenses_golden/excluded_files
@@ -12,6 +12,7 @@
 ../../../flutter/.ci.yaml
 ../../../flutter/.clang-format
 ../../../flutter/.clang-tidy
+../../../flutter/.dart_tool
 ../../../flutter/.git
 ../../../flutter/.gitattributes
 ../../../flutter/.github
@@ -253,6 +254,8 @@
 ../../../flutter/lib/web_ui/pubspec.yaml
 ../../../flutter/lib/web_ui/test
 ../../../flutter/prebuilts
+../../../flutter/pubspec.lock
+../../../flutter/pubspec.yaml
 ../../../flutter/runtime/dart_isolate_unittests.cc
 ../../../flutter/runtime/dart_lifecycle_unittests.cc
 ../../../flutter/runtime/dart_plugin_registrant_unittests.cc

From 784b9d8a66170eb38d6b5b189faa114b0fe8e4b8 Mon Sep 17 00:00:00 2001
From: Matan Lurey <matan@lurey.org>
Date: Wed, 17 Jul 2024 13:37:20 -0700
Subject: [PATCH 24/27] Exempt a folder.

---
 tools/clang_tidy/test/header_filter_regex_test.dart | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/clang_tidy/test/header_filter_regex_test.dart b/tools/clang_tidy/test/header_filter_regex_test.dart
index 21db03162d6ec..a84fc2284dc6b 100644
--- a/tools/clang_tidy/test/header_filter_regex_test.dart
+++ b/tools/clang_tidy/test/header_filter_regex_test.dart
@@ -36,6 +36,7 @@ void main() {
   test('contains every root directory in the regex', () {
     // These are a list of directories that should _not_ be included.
     const Set<String> intentionallyOmitted = <String>{
+      '.dart_tool',
       '.git',
       '.github',
       'build_overrides',

From 77f04a89560b6692171fc1edd01181bc634d42ba Mon Sep 17 00:00:00 2001
From: Matan Lurey <matan@lurey.org>
Date: Wed, 17 Jul 2024 14:56:54 -0700
Subject: [PATCH 25/27] Add // ignores for
 https://github.com/flutter/flutter/issues/151917.

---
 lib/ui/channel_buffers.dart     |  2 ++
 lib/ui/compositing.dart         |  2 ++
 lib/ui/experiments/scene.dart   | 25 +++++++++++++++++++++++++
 lib/ui/key.dart                 |  4 ++++
 lib/ui/painting.dart            |  2 ++
 lib/ui/platform_dispatcher.dart |  2 ++
 lib/ui/semantics.dart           |  8 ++++++++
 7 files changed, 45 insertions(+)

diff --git a/lib/ui/channel_buffers.dart b/lib/ui/channel_buffers.dart
index 4c0d16a6c5ffd..2ff1758e82e4c 100644
--- a/lib/ui/channel_buffers.dart
+++ b/lib/ui/channel_buffers.dart
@@ -400,6 +400,8 @@ class ChannelBuffers {
   @Native<Void Function(Handle, Bool)>(symbol: 'PlatformConfigurationNativeApi::SendChannelUpdate')
   external static void _sendChannelUpdate(String name, bool listening);
 
+  // TODO(matanlurey): have original authors document; see https://github.com/flutter/flutter/issues/151917.
+  // ignore: public_member_api_docs
   void sendChannelUpdate(String name, {required bool listening}) => _sendChannelUpdate(name, listening);
 
   /// Deprecated. Migrate to [setListener] instead.
diff --git a/lib/ui/compositing.dart b/lib/ui/compositing.dart
index 3e887cf53039e..da23f53f06043 100644
--- a/lib/ui/compositing.dart
+++ b/lib/ui/compositing.dart
@@ -246,6 +246,8 @@ class ShaderMaskEngineLayer extends _EngineLayerWrapper {
 /// This does not apply when using the `dart:ui` API directly, without using the
 /// Flutter framework bindings, `flutter_test` framework, et al.
 abstract class SceneBuilder {
+  // TODO(matanlurey): have original authors document; see https://github.com/flutter/flutter/issues/151917.
+  // ignore: public_member_api_docs
   factory SceneBuilder() = _NativeSceneBuilder;
 
   /// Pushes a transform operation onto the operation stack.
diff --git a/lib/ui/experiments/scene.dart b/lib/ui/experiments/scene.dart
index 34fbe6358560e..cdab6557fc98b 100644
--- a/lib/ui/experiments/scene.dart
+++ b/lib/ui/experiments/scene.dart
@@ -50,24 +50,34 @@ base class SceneNode extends NativeFieldWrapperClass1 {
     return result;
   }
 
+  // TODO(matanlurey): have original authors document; see https://github.com/flutter/flutter/issues/151917.
+  // ignore: public_member_api_docs
   static SceneNodeValue fromTransform(Float64List matrix4) {
     final SceneNode sceneNode = SceneNode._create();
     sceneNode._initFromTransform(matrix4);
     return SceneNodeValue.fromValue(sceneNode);
   }
 
+  // TODO(matanlurey): have original authors document; see https://github.com/flutter/flutter/issues/151917.
+  // ignore: public_member_api_docs
   void addChild(SceneNode sceneNode) {
     _addChild(sceneNode);
   }
 
+  // TODO(matanlurey): have original authors document; see https://github.com/flutter/flutter/issues/151917.
+  // ignore: public_member_api_docs
   void setTransform(Float64List matrix4) {
     _setTransform(matrix4);
   }
 
+  // TODO(matanlurey): have original authors document; see https://github.com/flutter/flutter/issues/151917.
+  // ignore: public_member_api_docs
   void setAnimationState(String animationName, bool playing, bool loop, double weight, double timeScale) {
     _setAnimationState(animationName, playing, loop, weight, timeScale);
   }
 
+  // TODO(matanlurey): have original authors document; see https://github.com/flutter/flutter/issues/151917.
+  // ignore: public_member_api_docs
   void seekAnimation(String animationName, double time) {
     _seekAnimation(animationName, time);
   }
@@ -126,17 +136,24 @@ base class SceneNode extends NativeFieldWrapperClass1 {
 
   /// Returns a fresh instance of [SceneShader].
   SceneShader sceneShader() => SceneShader._(this, debugName: _debugName);
+
 }
 
+// TODO(matanlurey): have original authors document; see https://github.com/flutter/flutter/issues/151917.
+// ignore: public_member_api_docs
 class SceneNodeValue {
   SceneNodeValue._(this._future, this._value) {
     _future?.then((SceneNode result) => _value = result);
   }
 
+  // TODO(matanlurey): have original authors document; see https://github.com/flutter/flutter/issues/151917.
+  // ignore: public_member_api_docs
   static SceneNodeValue fromFuture(Future<SceneNode> future) {
     return SceneNodeValue._(future, null);
   }
 
+  // TODO(matanlurey): have original authors document; see https://github.com/flutter/flutter/issues/151917.
+  // ignore: public_member_api_docs
   static SceneNodeValue fromValue(SceneNode value) {
     return SceneNodeValue._(null, value);
   }
@@ -144,14 +161,20 @@ class SceneNodeValue {
   final Future<SceneNode>? _future;
   SceneNode? _value;
 
+  // TODO(matanlurey): have original authors document; see https://github.com/flutter/flutter/issues/151917.
+  // ignore: public_member_api_docs
   bool get isComplete {
     return _value != null;
   }
 
+  // TODO(matanlurey): have original authors document; see https://github.com/flutter/flutter/issues/151917.
+  // ignore: public_member_api_docs
   Future<SceneNode>? get future {
     return _future;
   }
 
+  // TODO(matanlurey): have original authors document; see https://github.com/flutter/flutter/issues/151917.
+  // ignore: public_member_api_docs
   SceneNode? get value {
     return _value;
   }
@@ -186,6 +209,8 @@ base class SceneShader extends Shader {
   // ignore: unused_field
   final String? _debugName;
 
+  // TODO(matanlurey): have original authors document; see https://github.com/flutter/flutter/issues/151917.
+  // ignore: public_member_api_docs
   void setCameraTransform(Float64List matrix4) {
     _setCameraTransform(matrix4);
   }
diff --git a/lib/ui/key.dart b/lib/ui/key.dart
index 25eab4ac94754..1ea37200849a2 100644
--- a/lib/ui/key.dart
+++ b/lib/ui/key.dart
@@ -16,6 +16,8 @@ enum KeyEventType {
   /// The key is held, causing a repeated key input.
   repeat;
 
+    // TODO(matanlurey): have original authors document; see https://github.com/flutter/flutter/issues/151917.
+  // ignore: public_member_api_docs
   String get label {
     return switch (this) {
       down => 'Key Down',
@@ -46,6 +48,8 @@ enum KeyEventDeviceType {
   /// The device is a device connected to an HDMI bus.
   hdmi;
 
+  // TODO(matanlurey): have original authors document; see https://github.com/flutter/flutter/issues/151917.
+  // ignore: public_member_api_docs
   String get label {
     return switch (this) {
       keyboard => 'Keyboard',
diff --git a/lib/ui/painting.dart b/lib/ui/painting.dart
index dc3050f4f5ca4..cba1b0a33b86f 100644
--- a/lib/ui/painting.dart
+++ b/lib/ui/painting.dart
@@ -2598,6 +2598,8 @@ base class _NativeEngineLayer extends NativeFieldWrapperClass1 implements Engine
 /// Paths can be drawn on canvases using [Canvas.drawPath], and can
 /// used to create clip regions using [Canvas.clipPath].
 abstract class Path {
+  // TODO(matanlurey): have original authors document; see https://github.com/flutter/flutter/issues/151917.
+  // ignore: public_member_api_docs
   factory Path() = _NativePath;
 
   /// Creates a copy of another [Path].
diff --git a/lib/ui/platform_dispatcher.dart b/lib/ui/platform_dispatcher.dart
index 4b07bdb711aec..3b9bfaeecdc61 100644
--- a/lib/ui/platform_dispatcher.dart
+++ b/lib/ui/platform_dispatcher.dart
@@ -2195,6 +2195,8 @@ class ViewConstraints {
 /// [DisplayFeatureState.postureHalfOpened]. For [DisplayFeatureType.cutout],
 /// the state is not used and has the [DisplayFeatureState.unknown] value.
 class DisplayFeature {
+  // TODO(matanlurey): have original authors document; see https://github.com/flutter/flutter/issues/151917.
+  // ignore: public_member_api_docs
   const DisplayFeature({
     required this.bounds,
     required this.type,
diff --git a/lib/ui/semantics.dart b/lib/ui/semantics.dart
index 6da1f4d2d0556..d408625df7ef7 100644
--- a/lib/ui/semantics.dart
+++ b/lib/ui/semantics.dart
@@ -284,8 +284,12 @@ class SemanticsAction {
     _kFocusIndex: focus,
   };
 
+  // TODO(matanlurey): have original authors document; see https://github.com/flutter/flutter/issues/151917.
+  // ignore: public_member_api_docs
   static List<SemanticsAction> get values => _kActionById.values.toList(growable: false);
 
+  // TODO(matanlurey): have original authors document; see https://github.com/flutter/flutter/issues/151917.
+  // ignore: public_member_api_docs
   static SemanticsAction? fromIndex(int index) => _kActionById[index];
 
   @override
@@ -638,8 +642,12 @@ class SemanticsFlag {
     _kIsExpandedIndex: isExpanded,
   };
 
+  // TODO(matanlurey): have original authors document; see https://github.com/flutter/flutter/issues/151917.
+  // ignore: public_member_api_docs
   static List<SemanticsFlag> get values => _kFlagById.values.toList(growable: false);
 
+  // TODO(matanlurey): have original authors document; see https://github.com/flutter/flutter/issues/151917.
+  // ignore: public_member_api_docs
   static SemanticsFlag? fromIndex(int index) => _kFlagById[index];
 
   @override

From da0d11844d1bc4475335aa59375e30cb33ae73c2 Mon Sep 17 00:00:00 2001
From: Matan Lurey <matan@lurey.org>
Date: Wed, 17 Jul 2024 16:06:20 -0700
Subject: [PATCH 26/27] More lintos.

---
 tools/engine_tool/pubspec.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/engine_tool/pubspec.yaml b/tools/engine_tool/pubspec.yaml
index 1b71b9b688bc2..f752846118a4f 100644
--- a/tools/engine_tool/pubspec.yaml
+++ b/tools/engine_tool/pubspec.yaml
@@ -22,3 +22,7 @@ dependencies:
   path: any
   platform: any
   process_runner: any
+
+dev_dependencies:
+  litetest: any
+  process_fakes: any

From 9ee12d0b26c1a06425ffc31e15b4c2fa4673c0b2 Mon Sep 17 00:00:00 2001
From: Matan Lurey <matan@lurey.org>
Date: Thu, 18 Jul 2024 08:30:37 -0700
Subject: [PATCH 27/27] ++

---
 tools/pub_get_offline.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/pub_get_offline.py b/tools/pub_get_offline.py
index cc748141037ba..9da5137d72104 100644
--- a/tools/pub_get_offline.py
+++ b/tools/pub_get_offline.py
@@ -16,7 +16,7 @@
 
 THIS_DIR = os.path.abspath(os.path.dirname(__file__))
 sys.path += [os.path.join(THIS_DIR, '..', 'third_party', 'pyyaml', 'lib3')]
-import yaml  # type: ignore
+import yaml  # pylint: disable=import-error, wrong-import-position
 
 SRC_ROOT = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 ENGINE_DIR = os.path.join(SRC_ROOT, 'flutter')