Skip to content

Commit ebf74e1

Browse files
zijiehe-google-comzijiehe-google-com
authored
Merge branch 'flutter:master' into master
2 parents 4d437d2 + 6ec7ae3 commit ebf74e1

File tree

138 files changed

+2669
-609
lines changed

Some content is hidden

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

138 files changed

+2669
-609
lines changed

‎.ci.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -585,7 +585,9 @@ targets:
585585
shard: customer_testing
586586
tags: >
587587
["framework", "hostonly", "shard", "linux"]
588-
test_timeout_secs: "2700" # Allows 45 minutes (up from 30 default)
588+
# TODO(flutter/flutter#164140): Reduce timeout once customer
589+
# tests are sharded.
590+
test_timeout_secs: "3600" # Allows 60 minutes (up from 30 default)
589591

590592
- name: Linux docs_publish
591593
recipe: flutter/docs

‎.github/dependabot.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ updates:
1717
- "team"
1818
- "team-infra"
1919
- "autosubmit"
20+
# Updating patch versions for "github-actions" is too chatty.
21+
# See https://github.com/flutter/flutter/issues/158350.
2022
ignore:
21-
- dependency-name: "codecov/codecov-action"
23+
- dependency-name: "*"
2224
update-types: ["version-update:semver-patch"]

‎.github/workflows/coverage.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- name: ./bin/flutter test --coverage
2424
run: pushd packages/flutter;../../bin/flutter test --coverage -j 1;popd
2525
- name: upload coverage
26-
uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3
26+
uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574
2727
with:
2828
files: packages/flutter/coverage/lcov.info
2929
verbose: true

‎AUTHORS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,3 +132,4 @@ dy0gu <[email protected]>
132132
Albert Wolszon <[email protected]>
133133
Mohammed Chahboun <[email protected]>
134134
Abdessalem Mohellebi <[email protected]>
135+
Jin Jeongsu <[email protected]>

‎DEPS‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ vars = {
1414
'flutter_git': 'https://flutter.googlesource.com',
1515
'skia_git': 'https://skia.googlesource.com',
1616
'llvm_git': 'https://llvm.googlesource.com',
17-
'skia_revision': 'fdd97386193e601e28e14ecd557178df69fb2bb6',
17+
'skia_revision': 'c16b145749d44524b7d5b096c1ec5229c7bcb16a',
1818

1919
# WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
2020
# See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
@@ -56,12 +56,12 @@ vars = {
5656
# Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS
5757
# You can use //tools/dart/create_updated_flutter_deps.py to produce
5858
# updated revision list of existing dependencies.
59-
'dart_revision': '7fa5901bd8a308e20cb84c3dd57f079ebcc9b0ee',
59+
'dart_revision': 'b8292dfeaa67cd79e9dbbec71d3bd2daf6720568',
6060

6161
# WARNING: DO NOT EDIT MANUALLY
6262
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
6363
'dart_binaryen_rev': '3f6831c0bd147ae1ae0ab1d9187d37bce7cca38b',
64-
'dart_boringssl_rev': 'daa03aac8d88f67c8b8d293ebc11d57f61ca6f8a',
64+
'dart_boringssl_rev': '0c59e9e55bdaadadf49f3c092b097e72cd4b39cc',
6565
'dart_core_rev': '0b2bd3fcd7f3e082f4cc9b14c19ffa93894b85ae',
6666
'dart_devtools_rev': 'b38abb81337b10c4b675d418e50f82a5fe6a894d',
6767
'dart_http_rev': '900da9fe7d576caa4882053cf26d3a70bd3106e0',
@@ -310,7 +310,7 @@ deps = {
310310
Var('dart_git') + '/dart_style.git@21de99ec0ff8ace4d946a746fb427fffd6afa535',
311311

312312
'engine/src/flutter/third_party/dart/third_party/pkg/dartdoc':
313-
Var('dart_git') + '/dartdoc.git@34561d6ebf5fa89ca1f93b981de96a75ff573562',
313+
Var('dart_git') + '/dartdoc.git@f0d2276e57c96717e625964ea0385a30f2237e62',
314314

315315
'engine/src/flutter/third_party/dart/third_party/pkg/http':
316316
Var('dart_git') + '/http.git' + '@' + Var('dart_http_rev'),
@@ -337,7 +337,7 @@ deps = {
337337
Var('dart_git') + '/external/github.com/simolus3/tar.git@5a1ea943e70cdf3fa5e1102cdbb9418bd9b4b81a',
338338

339339
'engine/src/flutter/third_party/dart/third_party/pkg/test':
340-
Var('dart_git') + '/test.git@a833663e56b6182f8372180f5c95d1c01b531150',
340+
Var('dart_git') + '/test.git@17609bf90c9d5ef47707f5796763629450382474',
341341

342342
'engine/src/flutter/third_party/dart/third_party/pkg/tools':
343343
Var('dart_git') + '/tools.git' + '@' + Var('dart_tools_rev'),
@@ -637,7 +637,7 @@ deps = {
637637
],
638638
'dep_type': 'cipd',
639639
},
640-
'engine/src/flutter/third_party/ninja': {
640+
'third_party/ninja': {
641641
'packages': [
642642
{
643643
'package': 'infra/3pp/tools/ninja/${{platform}}',

‎bin/internal/flutter_packages.version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
c44c2282aad10b3f30af83d2a87d4a3023c13882
1+
01d3d5c1dca374fb6d342c47a94c73f93d99fc73

‎buildtools/README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
This directory is a placeholder intended to make Flutter's source tree match the expectations of [depot_tools](https://www.chromium.org/developers/how-tos/depottools/), which is used to build the Flutter engine.

‎dev/automated_tests/pubspec.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ dependencies:
1515
platform: 3.1.6
1616
test: 1.25.15
1717

18-
_fe_analyzer_shared: 76.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
19-
analyzer: 6.11.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
18+
_fe_analyzer_shared: 80.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
19+
analyzer: 7.3.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
2020
args: 2.6.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
2121
async: 2.13.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
2222
boolean_selector: 2.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -65,7 +65,7 @@ dependencies:
6565
vector_math: 2.1.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
6666
vm_service: 15.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
6767
watcher: 1.1.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
68-
web: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
68+
web: 1.1.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
6969
web_socket: 0.1.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
7070
web_socket_channel: 3.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
7171
webkit_inspection_protocol: 1.2.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -76,4 +76,4 @@ flutter:
7676
assets:
7777
- icon/test.png
7878

79-
# PUBSPEC CHECKSUM: 34e9
79+
# PUBSPEC CHECKSUM: 1bb7

‎dev/benchmarks/complex_layout/pubspec.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ dev_dependencies:
4343
integration_test:
4444
sdk: flutter
4545

46-
_fe_analyzer_shared: 76.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
47-
analyzer: 6.11.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
46+
_fe_analyzer_shared: 80.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
47+
analyzer: 7.3.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
4848
args: 2.6.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
4949
clock: 1.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
5050
convert: 3.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -75,7 +75,7 @@ dev_dependencies:
7575
test_core: 0.6.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
7676
typed_data: 1.4.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
7777
watcher: 1.1.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
78-
web: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
78+
web: 1.1.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
7979
web_socket: 0.1.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
8080
web_socket_channel: 3.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
8181
webkit_inspection_protocol: 1.2.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -87,4 +87,4 @@ flutter:
8787
- packages/flutter_gallery_assets/people/square/ali.png
8888
- packages/flutter_gallery_assets/places/india_chettinad_silk_maker.png
8989

90-
# PUBSPEC CHECKSUM: 2ebd
90+
# PUBSPEC CHECKSUM: 688b

‎dev/benchmarks/macrobenchmarks/pubspec.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ dependencies:
1818
# flutter update-packages --force-upgrade
1919
flutter_gallery_assets: 1.0.2
2020

21-
web: 1.1.0
21+
web: 1.1.1
2222

2323
async: 2.13.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
2424
boolean_selector: 2.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -50,8 +50,8 @@ dev_dependencies:
5050
integration_test:
5151
sdk: flutter
5252

53-
_fe_analyzer_shared: 76.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
54-
analyzer: 6.11.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
53+
_fe_analyzer_shared: 80.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
54+
analyzer: 7.3.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
5555
args: 2.6.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
5656
convert: 3.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
5757
coverage: 1.11.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -214,4 +214,4 @@ flutter:
214214
fonts:
215215
- asset: packages/flutter_gallery_assets/fonts/GalleryIcons.ttf
216216

217-
# PUBSPEC CHECKSUM: 2ebd
217+
# PUBSPEC CHECKSUM: 688b

0 commit comments

Comments
 (0)