Merge branch 'master' into network_offline_data_improvements

Author: hrajwade96

.github/workflows/build.yaml

@@ -36,7 +36,7 @@ jobs:
         os: [ubuntu-latest, windows-latest]
     steps:
       - name: git clone
-        uses: actions/checkout@85e6279cec87321a52edac9c87bce653a07cf6c2
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
       - name: Load Cached Flutter SDK
         uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf
         with:
@@ -57,7 +57,7 @@ jobs:
       fail-fast: false
     steps:
       - name: Clone Flutter DevTools
-        uses: actions/checkout@85e6279cec87321a52edac9c87bce653a07cf6c2
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
         with:
           ref: "${{ github.event.pull_request.head.sha }}"
       - name: Load Cached Flutter SDK
@@ -74,7 +74,7 @@ jobs:
           wget -qO- https://dcm.dev/pgp-key.public | sudo gpg --dearmor -o /usr/share/keyrings/dcm.gpg
           echo 'deb [signed-by=/usr/share/keyrings/dcm.gpg arch=amd64] https://dcm.dev/debian stable main' | sudo tee /etc/apt/sources.list.d/dart_stable.list
           sudo apt-get update
-          sudo apt-get install dcm=1.24.2-1 # To avoid errors add `-1` (build number) to the version
+          sudo apt-get install dcm=1.30.0-1 # To avoid errors add `-1` (build number) to the version
           sudo chmod +x /usr/bin/dcm
           echo "$(dcm --version)"
       - name: Setup Dart SDK
@@ -97,7 +97,7 @@ jobs:
         os: [ubuntu-latest, windows-latest]
     steps:
       - name: git clone
-        uses: actions/checkout@85e6279cec87321a52edac9c87bce653a07cf6c2
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
       - name: Load Cached Flutter SDK
         uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf
         with:
@@ -119,7 +119,7 @@ jobs:
         os: [ubuntu-latest, windows-latest]
     steps:
       - name: git clone
-        uses: actions/checkout@85e6279cec87321a52edac9c87bce653a07cf6c2
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
       - name: Load Cached Flutter SDK
         uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf
         with:
@@ -144,7 +144,7 @@ jobs:
         os: [ubuntu-latest, windows-latest]
     steps:
       - name: git clone
-        uses: actions/checkout@85e6279cec87321a52edac9c87bce653a07cf6c2
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
       - name: Load Cached Flutter SDK
         uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf
         with:
@@ -171,7 +171,7 @@ jobs:
 
     steps:
       - name: git clone
-        uses: actions/checkout@85e6279cec87321a52edac9c87bce653a07cf6c2
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
       - name: Load Cached Flutter SDK
         uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf
         with:
@@ -205,7 +205,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-latest, windows-latest]
+        # TODO(https://github.com/flutter/devtools/issues/9357): Re-enable tests on windows-latest.
+        os: [macos-latest]
         # Consider running integration tests in ddc mode, too.
         bot: [integration_dart2js]
         device: [flutter, flutter-web, dart-cli]
@@ -242,7 +243,7 @@ jobs:
             shard: 3/3
     steps:
       - name: git clone
-        uses: actions/checkout@85e6279cec87321a52edac9c87bce653a07cf6c2
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
       - name: Load Cached Flutter SDK
         uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf
         with:
@@ -276,7 +277,7 @@ jobs:
         os: [ubuntu-latest, windows-latest]
     steps:
       - name: git clone
-        uses: actions/checkout@85e6279cec87321a52edac9c87bce653a07cf6c2
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
       - name: Load Cached Flutter SDK
         uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf
         with:
@@ -297,7 +298,7 @@ jobs:
       fail-fast: false
     steps:
       - name: git clone
-        uses: actions/checkout@85e6279cec87321a52edac9c87bce653a07cf6c2
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
       - name: Load Cached Flutter SDK
         uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf
         with:
@@ -315,7 +316,7 @@ jobs:
       fail-fast: false
     steps:
       - name: git clone
-        uses: actions/checkout@85e6279cec87321a52edac9c87bce653a07cf6c2
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
       - name: Load Cached Flutter SDK
         uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf
         with:
@@ -338,7 +339,7 @@ jobs:
 #          - test_dart2js
 #    steps:
 #      - name: git clone
-#        uses: actions/checkout@85e6279cec87321a52edac9c87bce653a07cf6c2
+#        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
 #
 #      - name: tool/ci/bots.sh
 #        env:
@@ -358,7 +359,7 @@ jobs:
 #          - integration_dart2js
 #    steps:
 #      - name: git clone
-#        uses: actions/checkout@85e6279cec87321a52edac9c87bce653a07cf6c2
+#        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
 #      - name: tool/ci/bots.sh
 #        env:
 #          BOT: ${{ matrix.bot }}

.github/workflows/daily-dev-bump.yaml

@@ -37,7 +37,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: git clone devtools
-        uses: actions/checkout@85e6279cec87321a52edac9c87bce653a07cf6c2
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
         with:
           ref: master
 

.github/workflows/flutter-candidate-update.yaml

@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: git clone devtools
-        uses: actions/checkout@85e6279cec87321a52edac9c87bce653a07cf6c2
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
         with:
           ref: master
 

.github/workflows/flutter-prep.yaml

@@ -35,7 +35,7 @@ jobs:
       # TODO(https://github.com/flutter/devtools/issues/5729) Consider caching DevTools so that we
       # don't check it out again is subsequent workflows.
       - name: Checkout DevTools (default)
-        uses: actions/checkout@85e6279cec87321a52edac9c87bce653a07cf6c2
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
 
       - name: Get Latest Flutter Candidate
         id: flutter-candidate

.github/workflows/workflow-bot-cleanup.yaml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Sparse checkout of the repository
-        uses: actions/checkout@85e6279cec87321a52edac9c87bce653a07cf6c2
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
         with:
           sparse-checkout: |
             README.md

.gitignore

@@ -39,6 +39,9 @@ DEPENDENCIES.md
 **/logs/**
 *.stager_app.g.dart
 
+# Ignore Gemini logs
+**/.gemini/
+
 # Ignore VS code workspaces that may be configured per-user
 *.code-workspace
 

CONTRIBUTING.md

@@ -33,18 +33,6 @@ You can do this online, and it only takes a minute.
 
 2. Review the [DevTools style guide](STYLE.md), which uses a combination of Dart and Flutter best practices.
 
-## Table of contents
-1. [Developing for DevTools](#developing-for-devtools)
-	- [Set up your DevTools environment](#set-up-your-devtools-environment)
-	- [Workflow for making changes](#workflow-for-making-changes)
-	- [Keeping your fork in sync](#keeping-your-fork-in-sync)
-2. [Running and debugging DevTools](#running-and-debugging-devtools)
-    - [Frontend only (most common)](#frontend-only-most-common)
-    - [Frontend + DevTools server](#frontend--devtools-server)
-    - [DevTools + VS Code integration](#devtools--vs-code-integration-ide-embedded-devtools-experience)
-3. [Testing for DevTools](#testing-for-devtools)
-4. [Appendix](#appendix)
-
 ## Developing for DevTools
 
 ### Set up your DevTools environment
@@ -100,9 +88,9 @@ of launch configurations for running and debugging DevTools:
 
 ### Workflow for making changes
 
-1. Change your local Flutter SDK to the latest flutter candidate branch:
+1. Ensure your local Flutter SDK, DevTools dependencies, and generated code are up-to-date:
 	```sh
-	dt update-flutter-sdk --update-on-path
+	dt sync --update-on-path
 	```
 	> Warning: this will delete any local changes in your Flutter SDK you checked out from git.
 
@@ -111,23 +99,18 @@ of launch configurations for running and debugging DevTools:
 	git checkout -b myBranch
 	```
 
-3. Ensure your branch, dependencies, and generated code are up-to-date:
-	```sh
-	dt sync
-	```
-
-4. Implement your changes, and commit to your branch:
+3. Implement your changes, and commit to your branch:
 	```sh
 	git commit -m “description”
 	```
 	If your improvement is user-facing, [document it](packages/devtools_app/release_notes/README.md) in the same PR.
 
-5. Push to your branch to GitHub:
+4. Push to your branch to GitHub:
 	```sh
 	git push origin myBranch
 	```
 
-6. Navigate to the [Pull Requests](https://github.com/flutter/devtools/pulls) tab in the main
+5. Navigate to the [Pull Requests](https://github.com/flutter/devtools/pulls) tab in the main
 [DevTools repo](https://github.com/flutter/devtools). You should see a popup to create a pull
 request from the branch in your cloned repo to the DevTools `master` branch. Create a pull request.
 
@@ -137,9 +120,18 @@ request from the branch in your cloned repo to the DevTools `master` branch. Cre
 	```
 	dt sync
 	```
-	This will pull the latest code from the upstream DevTools, upgrade dependencies, and perform code generation.
-
-- If you want to upgrade dependencies and re-generate code (like mocks), but do not want to merge `upstream/master`, instead run
+	This command will:
+	- pull the latest code from the upstream DevTools master branch
+	- update `tool/flutter-sdk`	to the Flutter version DevTools is built and tested
+	with on the CI
+	- upgrade dependencies
+	- perform code generation
+
+	Optionally, pass the `--update-on-path` flag to also update your local Flutter SDK
+	git checkout along with the `tool/flutter-sdk`. 
+
+- If you want to upgrade dependencies and re-generate code (like mocks), but do
+not want to merge `upstream/master` or update your Flutter SDK version, instead run
 	```
 	dt generate-code --upgrade
 	```
@@ -160,133 +152,14 @@ request from the branch in your cloned repo to the DevTools `master` branch. Cre
 
 ## Running and debugging DevTools
 
-There are a few different environments that you may need to run DevTools in. After running DevTools
-in one of the environments below, connect to a test application to debug DevTools runtime tooling
-(the majority of DevTools tools). See the
-[Connect DevTools to a test application](#connect-devtools-to-a-test-application) section below.
-
-### Frontend only (most common)
-
-Most of the time, you will not need to run DevTools with the DevTools server to test your changes.
-You can run DevTools in debug mode as either a Flutter web or Flutter desktop app.
-
-> Note: though DevTools is shipped as a Flutter Web app, we recommend developing as a Flutter
-Desktop app whenever possible for a more efficient development workflow. Please see the
-[running on Flutter desktop](#running-devtools-on-flutter-desktop) section below for instructions.
-
-- To run DevTools as a Flutter web app **from VS Code**, run with the **devtools** configuration and the "Chrome" device
-	- To run with experiments enabled, run from VS Code with the **devtools + experiments** configuration
-- To run DevTools as a Flutter web app **from the command line**, run `flutter run -d chrome`
-	- To run with experiments enabled, add the flag `--dart-define=enable_experiments=true`
-
-### Frontend + DevTools server
-
-To develop with a workflow that exercises the DevTools server <==> DevTools client connection,
-you will need to perform the following set up steps (first time only).
-
-1. Clone the [Dart SDK](https://github.com/dart-lang/sdk) fron GitHub.
-2. The `LOCAL_DART_SDK` environment variable needs to point to this path: `export LOCAL_DART_SDK=/path/to/dart/sdk`
-
-If you are also developing server side code (e.g. the `devtools_shared` package), you will need to add a
-dependency override to `sdk/pkg/dds/pubspec.yaml`.
-
-```yaml
-dependency_overrides:
-  devtools_shared:
-    path: relative/path/to/devtools/packages/devtools_shared
-```
-
-Then you can run DevTools with the server by running the following from anywhere under the `devtools/` directory:
-1. To run the DevTools web app in release mode, served with the DevTools server (this emulates the production environment):
-	```
-	dt serve
-	```
-2. To run the DevTools web app in debug mode, with full debugging support, and with a connection to a live DevTools server:
-	```sh
-	dt run
-	```
-
-Option 2 is useful for a quicker development cycle. The DevTools build time will be faster, and you will be
-able to connect the DevTools web app to an IDE or another DevTools instance for debugging purposes.
-
-To see the full list of arguments available for either command, please pass the `-h` flag.
-
-### IDE-embedded DevTools experience
-
-#### DevTools + VS Code integration
-
-To test the integration with VS Code, you can set up the Dart VS Code extension to run DevTools
-and the server from your local source code. Follow the
-[Frontend + DevTools server](#frontend--devtools-server) setup instructions above, and make sure
-you have version v3.47 or newer of the Dart extension for VS Code.
-
-Open your VS Code settings (Run the **Preferences: Open User Settings (JSON)** command from the
-command palette (`F1`)) and add the following to your settings:
-
-```js
-"dart.customDevTools": {
-	"path": "/absolute/path/to/devtools",
-	"env": {
-		"LOCAL_DART_SDK": "/absolute/path/to/sdk"
-		// Path to the Flutter SDK that will be used to build DevTools. This may
-		// be the path to the included Flutter SDK under the tool/ directory or
-		// the path to your local Flutter SDK git checkout.
-		"FLUTTER_ROOT": "/absolute/path/to/devtools/tool/flutter-sdk"
-	},
-	"args": [
-		// Arguments that will be passed along to the `dt serve` command.
-    ],
-},
-```
-
-This instructs VS Code to run the `dt serve` command instead of running `dart devtools`.
-You must set the `LOCAL_DART_SDK` and `FLUTTER_ROOT` env variables correctly for the script to work.
-
-Next, restart VS Code (or run the **Developer: Reload Window** command from the command palette (`F1`))
-and DevTools will be run from your local source code. After making any code changes to DevTools or the
-server, you will need to re-run the **Developer: Reload Window** command to rebuild and restart the server.
-
-#### DevTools + IntelliJ integration
-
-Follow instructions in the Flutter-IntelliJ repo's `CONTRIBUTING` guide: [#developing-with-local-devtools](https://github.com/flutter/flutter-intellij/blob/master/CONTRIBUTING.md#developing-with-local-devtools)
+Please see [DEBUGGING.md]() for guidance on running and debugging DevTools.
 
 ## Testing for DevTools
 
-Please see [TESTING.md](TESTING.md) for guidance on running and writing tests.
+Please see [TESTING.md]() for guidance on running and writing tests.
 
 ## Appendix
 
-### Connect DevTools to a test application
-
-For working on most DevTools tools, a connection to a running Dart or Flutter app is required. Run any Dart or Flutter app of your choice to
-connect it to DevTools. Consider running [veggieseasons](https://github.com/flutter/samples/tree/main/veggieseasons) or another Flutter sample since those apps have plenty of interesting
-code to debug.
-1. Run your Dart or Flutter app.
-	> Note: some DevTools features may be unavailable depending on the test app platform (Flutter native, Flutter web, Dart CLI, etc.) or run mode
-	(debug, profile) you choose.
-2. Copy the URI printed to the command line (you will use this URI to connect to DevTools).
-
-	```
-	"A Dart VM Service on iPhone 14 Pro Max is available at: <copy-this-uri>"
-	```
-3. Paste this URI into the connect dialog in DevTools and click "Connect".
-
-	![Connect dialog example](_markdown_images/connect_dialog_example.png)
-
-### Running DevTools on Flutter Desktop
-
-For a faster development cycle with hot reload, you can run DevTools on Flutter desktop. Some DevTools
-features only work on the web, like the embedded Perfetto trace viewer, DevTools extensions, or WASM support,
-but the limitations on the desktop app are few.
-
-To run DevTools with the desktop embedder, you can run `flutter run -d macos` from `devtools/packages/devtools_app`,
-or you can run DevTools from your IDE with the `macOS` device selected.
-
-If this fails, you may need to run `flutter create .` from `devtools/packages/devtools_app` to generate
-the updated files for your platform. If you want to run DevTools on Flutter desktop for Windows or Linux,
-you will need to generate the files for this platform using the `flutter create .` command, and then run using
-`flutter run -d <windows or linux>`.
-
 ### Enable and activate DCM (Dart Code Metrics)
 
 Enabling and activating DCM is optional. When you open a PR, the CI bots will show you any DCM warnings introduced