Skip to content

Commit afdea78

Browse files
Merge branch 'master' into fix/network-hot-restart
2 parents 08e070f + 4362d64 commit afdea78

177 files changed

Lines changed: 2960 additions & 2785 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/build.yaml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
os: [ubuntu-latest, windows-latest]
3737
steps:
3838
- name: git clone
39-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
39+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0
4040
- name: Load Cached Flutter SDK
4141
uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7
4242
with:
@@ -57,7 +57,7 @@ jobs:
5757
fail-fast: false
5858
steps:
5959
- name: Clone Flutter DevTools
60-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
60+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0
6161
with:
6262
ref: "${{ github.event.pull_request.head.sha }}"
6363
- name: Load Cached Flutter SDK
@@ -74,7 +74,7 @@ jobs:
7474
wget -qO- https://dcm.dev/pgp-key.public | sudo gpg --dearmor -o /usr/share/keyrings/dcm.gpg
7575
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
7676
sudo apt-get update
77-
sudo apt-get install dcm=1.36.0-1 # To avoid errors add `-1` (build number) to the version
77+
sudo apt-get install dcm=1.38.1-1 # To avoid errors add `-1` (build number) to the version
7878
sudo chmod +x /usr/bin/dcm
7979
echo "$(dcm --version)"
8080
- name: Setup Dart SDK
@@ -97,7 +97,7 @@ jobs:
9797
os: [ubuntu-latest, windows-latest]
9898
steps:
9999
- name: git clone
100-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
100+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0
101101
- name: Load Cached Flutter SDK
102102
uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7
103103
with:
@@ -119,7 +119,7 @@ jobs:
119119
os: [ubuntu-latest, windows-latest]
120120
steps:
121121
- name: git clone
122-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
122+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0
123123
- name: Load Cached Flutter SDK
124124
uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7
125125
with:
@@ -144,7 +144,7 @@ jobs:
144144
os: [ubuntu-latest, windows-latest]
145145
steps:
146146
- name: git clone
147-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
147+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0
148148
- name: Load Cached Flutter SDK
149149
uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7
150150
with:
@@ -171,7 +171,7 @@ jobs:
171171

172172
steps:
173173
- name: git clone
174-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
174+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0
175175
- name: Load Cached Flutter SDK
176176
uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7
177177
with:
@@ -243,7 +243,7 @@ jobs:
243243
shard: 3/3
244244
steps:
245245
- name: git clone
246-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
246+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0
247247
- name: Load Cached Flutter SDK
248248
uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7
249249
with:
@@ -277,7 +277,7 @@ jobs:
277277
os: [ubuntu-latest, windows-latest]
278278
steps:
279279
- name: git clone
280-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
280+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0
281281
- name: Load Cached Flutter SDK
282282
uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7
283283
with:
@@ -302,7 +302,7 @@ jobs:
302302
os: [ubuntu-latest, windows-latest]
303303
steps:
304304
- name: git clone
305-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
305+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0
306306
- name: Load Cached Flutter SDK
307307
uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7
308308
with:
@@ -323,7 +323,7 @@ jobs:
323323
fail-fast: false
324324
steps:
325325
- name: git clone
326-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
326+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0
327327
- name: Load Cached Flutter SDK
328328
uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7
329329
with:
@@ -341,7 +341,7 @@ jobs:
341341
fail-fast: false
342342
steps:
343343
- name: git clone
344-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
344+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0
345345
- name: Load Cached Flutter SDK
346346
uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7
347347
with:
@@ -364,7 +364,7 @@ jobs:
364364
# - test_dart2js
365365
# steps:
366366
# - name: git clone
367-
# uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
367+
# uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0
368368
#
369369
# - name: tool/ci/bots.sh
370370
# env:
@@ -384,7 +384,7 @@ jobs:
384384
# - integration_dart2js
385385
# steps:
386386
# - name: git clone
387-
# uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
387+
# uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0
388388
# - name: tool/ci/bots.sh
389389
# env:
390390
# BOT: ${{ matrix.bot }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
runs-on: ubuntu-latest
3838
steps:
3939
- name: git clone devtools
40-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
40+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0
4141
with:
4242
ref: master
4343

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
runs-on: ubuntu-latest
2222
steps:
2323
- name: git clone devtools
24-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
24+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0
2525
with:
2626
ref: master
2727

.github/workflows/flutter-prep.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
# TODO(https://github.com/flutter/devtools/issues/5729) Consider caching DevTools so that we
3636
# don't check it out again is subsequent workflows.
3737
- name: Checkout DevTools (default)
38-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
38+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0
3939

4040
- name: Get Latest Flutter Candidate
4141
id: flutter-candidate

.github/workflows/release-notes.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,9 @@ jobs:
2626
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2727
PULL_NUMBER: ${{steps.get-pull-request-number.outputs.PULL_REQUEST_NUMBER}}
2828
run: |
29-
FILES_RESPONSE=$(gh api /repos/$GITHUB_REPOSITORY/pulls/$PULL_NUMBER/files)
30-
echo "FILES_RESPONSE: $FILES_RESPONSE"
29+
FILES_RESPONSE=$(gh api --paginate /repos/$GITHUB_REPOSITORY/pulls/$PULL_NUMBER/files)
3130
32-
HAS_CHANGED_RELEASE_NOTES=$(echo $FILES_RESPONSE | jq '.[].filename' | jq -s '. | any(. == env.CURRENT_RELEASE_FILE_PATH)')
31+
HAS_CHANGED_RELEASE_NOTES=$(echo "$FILES_RESPONSE" | jq -r --arg path "$CURRENT_RELEASE_FILE_PATH" '[.[].filename == $path] | any')
3332
echo "HAS_CHANGED_RELEASE_NOTES=$HAS_CHANGED_RELEASE_NOTES" >> $GITHUB_OUTPUT
3433
3534
- name: Check Release Preparedness requirements

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717
steps:
1818
- name: Sparse checkout of the repository
19-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
19+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0
2020
with:
2121
sparse-checkout: |
2222
README.md

analysis_options.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,8 @@ dart_code_metrics:
186186
- avoid-explicit-type-declaration
187187
# - ban-name # TODO(polina-c): add configuration
188188
# - binary-expression-operand-order Some nice catches but too many false positives to enable.
189+
- dispose-class-fields
190+
- dispose-fields
189191
- double-literal-format
190192
# - format-comment TODO(jacobr): enable this one after fixing violations.
191193
# TODO(jacobr): enable member-ordering. This catches a bunch of real style

flutter-candidate.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3648ed5372a7baa2941539b457a3c804ca0afd86
1+
ad80825c24d770a19e33f67800fc0338a3b89ec7

packages/devtools_app/lib/devtools.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@
1010
/// Note: a regexp in the `dt update-version' command logic matches the constant
1111
/// declaration `const version =`. If you change the declaration you must also
1212
/// modify the regex in the `dt update-version' command logic.
13-
const version = '2.60.0-dev.0';
13+
const version = '2.61.0-dev.0';

packages/devtools_app/lib/src/app.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,7 @@ class DevToolsAppState extends State<DevToolsApp> with AutoDisposeMixin {
202202
FrameworkCore.dispose();
203203
// Workaround for https://github.com/flutter/flutter/issues/155265.
204204
removeTextFieldFocusFixHandler();
205+
routerDelegate.dispose();
205206
super.dispose();
206207
}
207208

0 commit comments

Comments
 (0)