Merge branch 'master' into improve-api

Author: srawlins

.github/workflows/build.yaml

@@ -36,9 +36,9 @@ jobs:
         os: [ubuntu-latest, windows-latest]
     steps:
       - name: git clone
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
       - name: Load Cached Flutter SDK
-        uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf
+        uses: actions/cache@a7833574556fa59680c1b7cb190c1735db73ebf0
         with:
           path: |
             ./tool/flutter-sdk
@@ -57,11 +57,11 @@ jobs:
       fail-fast: false
     steps:
       - name: Clone Flutter DevTools
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
         with:
           ref: "${{ github.event.pull_request.head.sha }}"
       - name: Load Cached Flutter SDK
-        uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf
+        uses: actions/cache@a7833574556fa59680c1b7cb190c1735db73ebf0
         with:
           path: |
             ./tool/flutter-sdk
@@ -97,9 +97,9 @@ jobs:
         os: [ubuntu-latest, windows-latest]
     steps:
       - name: git clone
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
       - name: Load Cached Flutter SDK
-        uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf
+        uses: actions/cache@a7833574556fa59680c1b7cb190c1735db73ebf0
         with:
           path: |
             ./tool/flutter-sdk
@@ -119,9 +119,9 @@ jobs:
         os: [ubuntu-latest, windows-latest]
     steps:
       - name: git clone
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
       - name: Load Cached Flutter SDK
-        uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf
+        uses: actions/cache@a7833574556fa59680c1b7cb190c1735db73ebf0
         with:
           path: |
             ./tool/flutter-sdk
@@ -144,9 +144,9 @@ jobs:
         os: [ubuntu-latest, windows-latest]
     steps:
       - name: git clone
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
       - name: Load Cached Flutter SDK
-        uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf
+        uses: actions/cache@a7833574556fa59680c1b7cb190c1735db73ebf0
         with:
           path: |
             ./tool/flutter-sdk
@@ -171,9 +171,9 @@ jobs:
 
     steps:
       - name: git clone
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
       - name: Load Cached Flutter SDK
-        uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf
+        uses: actions/cache@a7833574556fa59680c1b7cb190c1735db73ebf0
         with:
           path: |
             ./tool/flutter-sdk
@@ -186,7 +186,7 @@ jobs:
         run: ./tool/ci/bots.sh
 
       - name: Upload Golden Failure Artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         if: failure()
         with:
           name: golden_image_failures.${{ matrix.bot }}
@@ -243,9 +243,9 @@ jobs:
             shard: 3/3
     steps:
       - name: git clone
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
       - name: Load Cached Flutter SDK
-        uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf
+        uses: actions/cache@a7833574556fa59680c1b7cb190c1735db73ebf0
         with:
           path: |
             ./tool/flutter-sdk
@@ -259,7 +259,7 @@ jobs:
         run: ./tool/ci/bots.sh
 
       - name: Upload Golden Failure Artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         if: failure()
         with:
           name: golden_image_failures.${{ matrix.bot }}
@@ -277,9 +277,9 @@ jobs:
         os: [ubuntu-latest, windows-latest]
     steps:
       - name: git clone
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
       - name: Load Cached Flutter SDK
-        uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf
+        uses: actions/cache@a7833574556fa59680c1b7cb190c1735db73ebf0
         with:
           path: |
             ./tool/flutter-sdk
@@ -298,9 +298,9 @@ jobs:
       fail-fast: false
     steps:
       - name: git clone
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
       - name: Load Cached Flutter SDK
-        uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf
+        uses: actions/cache@a7833574556fa59680c1b7cb190c1735db73ebf0
         with:
           path: |
             ./tool/flutter-sdk
@@ -316,9 +316,9 @@ jobs:
       fail-fast: false
     steps:
       - name: git clone
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
       - name: Load Cached Flutter SDK
-        uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf
+        uses: actions/cache@a7833574556fa59680c1b7cb190c1735db73ebf0
         with:
           path: |
             ./tool/flutter-sdk
@@ -339,7 +339,7 @@ jobs:
 #          - test_dart2js
 #    steps:
 #      - name: git clone
-#        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
+#        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
 #
 #      - name: tool/ci/bots.sh
 #        env:
@@ -359,7 +359,7 @@ jobs:
 #          - integration_dart2js
 #    steps:
 #      - name: git clone
-#        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
+#        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
 #      - name: tool/ci/bots.sh
 #        env:
 #          BOT: ${{ matrix.bot }}

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

@@ -37,12 +37,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: git clone devtools
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
         with:
           ref: master
 
       - name: Load Cached Flutter SDK
-        uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf
+        uses: actions/cache@a7833574556fa59680c1b7cb190c1735db73ebf0
         with:
           path: |
             ./tool/flutter-sdk

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

@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: git clone devtools
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
         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@08c6903cd8c0fde910a37f88322edcfb5dd907a8
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
 
       - name: Get Latest Flutter Candidate
         id: flutter-candidate
@@ -45,7 +45,7 @@ jobs:
 
       - name: Load Cached Flutter SDK
         id: cache-flutter
-        uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf
+        uses: actions/cache@a7833574556fa59680c1b7cb190c1735db73ebf0
         with:
           path: |
             ./tool/flutter-sdk

.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@08c6903cd8c0fde910a37f88322edcfb5dd907a8
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
         with:
           sparse-checkout: |
             README.md

.gitignore

@@ -4,7 +4,10 @@
 .dart_tool/
 .packages
 .pub/
-pubspec.lock
+
+# Exclude pubspec.lock files in tests and example fixtures.
+packages/devtools_app/test/**/pubspec.lock
+packages/devtools_extensions/example/**/pubspec.lock
 
 .idea/
 .data_dir/

.vscode/settings.json

@@ -2,4 +2,7 @@
     // Set current working directory to devtools_app.
     "terminal.integrated.cwd": "packages/devtools_app",
     "dart.showTodos": false,
+    "dart.analysisExcludedFolders": [
+        "tool/flutter-sdk"
+    ]
 }

.vscode/tasks.json

@@ -5,7 +5,7 @@
 			"label": "Start DTD on Port 8500",
 			"detail": "Starts a DTD instance running on port 8500",
 			"type": "shell",
-			"command": "${workspaceFolder}/../tool/flutter-sdk/bin/cache/dart-sdk/bin/dart",
+			"command": "${workspaceFolder}/tool/flutter-sdk/bin/cache/dart-sdk/bin/dart",
 			"args": [
 				"tooling-daemon",
 				"--disable-service-auth-codes",

flutter-candidate.txt

@@ -1 +1 @@
-c63c6b08a7114517575bcf3e45275ec7a9f4e87f
+71348e7b2b1b64e425fa0a3733f27d2b94ca7847

packages/devtools_app/integration_test/test/live_connection/memory_screen_helpers.dart

@@ -3,9 +3,9 @@
 // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 
 import 'package:devtools_app/devtools_app.dart';
+import 'package:devtools_app/src/framework/scaffold/bottom_pane.dart';
 import 'package:devtools_app/src/screens/memory/panes/control/widgets/primary_controls.dart';
 import 'package:devtools_app/src/screens/memory/panes/diff/widgets/snapshot_list.dart';
-import 'package:devtools_app/src/shared/console/widgets/console_pane.dart';
 import 'package:devtools_test/helpers.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
@@ -45,7 +45,7 @@ Future<void> prepareMemoryUI(
     // but not too big to make classes in snapshot hidden.
     const dragDistance = -320.0;
     await tester.drag(
-      find.byType(ConsolePaneHeader),
+      find.byKey(BottomPane.splitterKey),
       const Offset(0, dragDistance),
     );
     await tester.pumpAndSettle();