Skip to content

Commit c4effbc

Browse files
authored
Merge branch 'master' into fix-web-rtl-platform-view
2 parents da90a2d + 2381790 commit c4effbc

500 files changed

Lines changed: 23463 additions & 5866 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.

‎.ci.yaml‎

Lines changed: 106 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -3904,6 +3904,9 @@ targets:
39043904
recipe: devicelab/devicelab_drone
39053905
timeout: 60
39063906
properties:
3907+
# Pin to macOS 26 due to benchmark differing while fleet is split between macOS 15 and 26.
3908+
# See https://github.com/flutter/flutter/issues/194809.
3909+
os: Mac-26.6 # TODO(flutter/flutter#192579): Delete this after all bots are upgraded to macOS 26.
39073910
task_name: basic_material_app_macos__compile
39083911

39093912
- name: Mac_arm64 build_ios_framework_module_test
@@ -3930,7 +3933,6 @@ targets:
39303933
recipe: flutter/flutter_drone
39313934
presubmit: false # Rely on Mac_arm build_tests in presubmit.
39323935
enabled_branches:
3933-
- beta # TODO(flutter/flutter#189295): Remove after 3.48.0-0.1.pre is released.
39343936
- stable # TODO(flutter/flutter#189295): Delete this builder after 3.50 is released.
39353937
timeout: 60
39363938
properties:
@@ -3953,7 +3955,6 @@ targets:
39533955
recipe: flutter/flutter_drone
39543956
presubmit: false # Rely on Mac_arm build_tests in presubmit.
39553957
enabled_branches:
3956-
- beta # TODO(flutter/flutter#189295): Remove after 3.48.0-0.1.pre is released.
39573958
- stable # TODO(flutter/flutter#189295): Delete this builder after 3.50 is released.
39583959
timeout: 60
39593960
properties:
@@ -3976,7 +3977,6 @@ targets:
39763977
recipe: flutter/flutter_drone
39773978
presubmit: false # Rely on Mac_arm build_tests in presubmit.
39783979
enabled_branches:
3979-
- beta # TODO(flutter/flutter#189295): Remove after 3.48.0-0.1.pre is released.
39803980
- stable # TODO(flutter/flutter#189295): Delete this builder after 3.50 is released.
39813981
timeout: 60
39823982
properties:
@@ -3999,7 +3999,6 @@ targets:
39993999
recipe: flutter/flutter_drone
40004000
presubmit: false # Rely on Mac_arm build_tests in presubmit.
40014001
enabled_branches:
4002-
- beta # TODO(flutter/flutter#189295): Remove after 3.48.0-0.1.pre is released.
40034002
- stable # TODO(flutter/flutter#189295): Delete this builder after 3.50 is released.
40044003
timeout: 60
40054004
properties:
@@ -4022,7 +4021,6 @@ targets:
40224021
recipe: flutter/flutter_drone
40234022
presubmit: false # Rely on Mac_arm build_tests in presubmit.
40244023
enabled_branches:
4025-
- beta # TODO(flutter/flutter#189295): Remove after 3.48.0-0.1.pre is released.
40264024
- stable # TODO(flutter/flutter#189295): Delete this builder after 3.50 is released.
40274025
timeout: 60
40284026
properties:
@@ -4332,7 +4330,6 @@ targets:
43324330
recipe: flutter/flutter_drone
43334331
timeout: 60
43344332
enabled_branches:
4335-
- beta # TODO(flutter/flutter#189295): Remove after 3.48.0-0.1.pre is released.
43364333
- stable # TODO(flutter/flutter#189295): Delete this builder after 3.50 is released.
43374334
properties:
43384335
dependencies: >-
@@ -4649,7 +4646,6 @@ targets:
46494646
recipe: devicelab/devicelab_drone
46504647
timeout: 60
46514648
enabled_branches:
4652-
- beta # TODO(flutter/flutter#189295): Remove after 3.48.0-0.1.pre is released.
46534649
- stable # TODO(flutter/flutter#189295): Delete this builder after 3.50 is released.
46544650
properties:
46554651
dependencies: >-
@@ -4792,7 +4788,6 @@ targets:
47924788
recipe: flutter/flutter_drone
47934789
timeout: 60
47944790
enabled_branches:
4795-
- beta # TODO(flutter/flutter#189295): Remove after 3.48.0-0.1.pre is released.
47964791
- stable # TODO(flutter/flutter#189295): Delete this builder after 3.50 is released.
47974792
properties:
47984793
dependencies: >-
@@ -4815,7 +4810,6 @@ targets:
48154810
recipe: flutter/flutter_drone
48164811
timeout: 60
48174812
enabled_branches:
4818-
- beta # TODO(flutter/flutter#189302): Remove after 3.48.0-0.1.pre is released.
48194813
- stable # TODO(flutter/flutter#189302): Delete this builder after 3.50 is released.
48204814
properties:
48214815
dependencies: >-
@@ -5108,7 +5102,6 @@ targets:
51085102
recipe: flutter/flutter_drone
51095103
timeout: 60
51105104
enabled_branches:
5111-
- beta # TODO(flutter/flutter#189295): Remove after 3.48.0-0.1.pre is released.
51125105
- stable # TODO(flutter/flutter#189295): Delete this builder after 3.50 is released.
51135106
properties:
51145107
add_recipes_cq: "true"
@@ -5254,7 +5247,6 @@ targets:
52545247
recipe: devicelab/devicelab_drone
52555248
presubmit: false
52565249
enabled_branches:
5257-
- beta # TODO(flutter/flutter#189295): Remove after 3.48.0-0.1.pre is released.
52585250
- stable # TODO(flutter/flutter#189295): Delete this builder after 3.50 is released.
52595251
timeout: 60
52605252
properties:
@@ -5287,7 +5279,6 @@ targets:
52875279
recipe: devicelab/devicelab_drone
52885280
presubmit: false
52895281
enabled_branches:
5290-
- beta # TODO(flutter/flutter#189295): Remove after 3.48.0-0.1.pre is released.
52915282
- stable # TODO(flutter/flutter#189295): Delete this builder after 3.50 is released.
52925283
timeout: 60
52935284
properties:
@@ -5340,7 +5331,6 @@ targets:
53405331
recipe: devicelab/devicelab_drone
53415332
presubmit: false
53425333
enabled_branches:
5343-
- beta # TODO(flutter/flutter#189295): Remove after 3.48.0-0.1.pre is released.
53445334
- stable # TODO(flutter/flutter#189295): Delete this builder after 3.50 is released.
53455335
runIf:
53465336
- .ci.yaml
@@ -5373,7 +5363,6 @@ targets:
53735363
recipe: devicelab/devicelab_drone
53745364
presubmit: false
53755365
enabled_branches:
5376-
- beta # TODO(flutter/flutter#189295): Remove after 3.48.0-0.1.pre is released.
53775366
- stable # TODO(flutter/flutter#189295): Delete this builder after 3.50 is released.
53785367
runIf:
53795368
- .ci.yaml
@@ -5583,7 +5572,6 @@ targets:
55835572
recipe: devicelab/devicelab_drone
55845573
timeout: 60
55855574
enabled_branches:
5586-
- beta # TODO(flutter/flutter#189295): Remove after 3.48.0-0.1.pre is released.
55875575
- stable # TODO(flutter/flutter#189295): Delete this builder after 3.50 is released.
55885576
properties:
55895577
dependencies: >-
@@ -5621,7 +5609,6 @@ targets:
56215609
recipe: devicelab/devicelab_drone
56225610
presubmit: false
56235611
enabled_branches:
5624-
- beta # TODO(flutter/flutter#189295): Remove after 3.48.0-0.1.pre is released.
56255612
- stable # TODO(flutter/flutter#189295): Delete this builder after 3.50 is released.
56265613
timeout: 60
56275614
properties:
@@ -5696,7 +5683,6 @@ targets:
56965683
recipe: devicelab/devicelab_drone
56975684
presubmit: false
56985685
enabled_branches:
5699-
- beta # TODO(flutter/flutter#189295): Remove after 3.48.0-0.1.pre is released.
57005686
- stable # TODO(flutter/flutter#189295): Delete this builder after 3.50 is released.
57015687
timeout: 60
57025688
properties:
@@ -5758,7 +5744,6 @@ targets:
57585744
recipe: devicelab/devicelab_drone
57595745
presubmit: false
57605746
enabled_branches:
5761-
- beta # TODO(flutter/flutter#189295): Remove after 3.48.0-0.1.pre is released.
57625747
- stable # TODO(flutter/flutter#189295): Delete this builder after 3.50 is released.
57635748
timeout: 60
57645749
properties:
@@ -5836,15 +5821,6 @@ targets:
58365821
["devicelab", "ios", "mac"]
58375822
task_name: new_gallery_ios__transition_perf
58385823

5839-
- name: Mac_ios new_gallery_skia_ios__transition_perf
5840-
recipe: devicelab/devicelab_drone
5841-
presubmit: false
5842-
timeout: 60
5843-
properties:
5844-
tags: >
5845-
["devicelab", "ios", "mac"]
5846-
task_name: new_gallery_skia_ios__transition_perf
5847-
58485824
- name: Mac platform_channel_sample_test_ios
58495825
recipe: devicelab/devicelab_drone
58505826
presubmit: false
@@ -5976,7 +5952,6 @@ targets:
59765952
recipe: devicelab/devicelab_drone
59775953
presubmit: false
59785954
enabled_branches:
5979-
- beta # TODO(flutter/flutter#189295): Remove after 3.48.0-0.1.pre is released.
59805955
- stable # TODO(flutter/flutter#189295): Delete this builder after 3.50 is released.
59815956
timeout: 60
59825957
properties:
@@ -6076,7 +6051,6 @@ targets:
60766051
recipe: devicelab/devicelab_drone
60776052
timeout: 60
60786053
enabled_branches:
6079-
- beta # TODO(flutter/flutter#189295): Remove after 3.48.0-0.1.pre is released.
60806054
- stable # TODO(flutter/flutter#189295): Delete this builder after 3.50 is released.
60816055
properties:
60826056
dependencies: >-
@@ -7820,7 +7794,6 @@ targets:
78207794
["devicelab", "hostonly", "mac"]
78217795
task_name: windowing_test_macos
78227796

7823-
78247797
- name: Windows flutter_tool_startup__windows
78257798
recipe: devicelab/devicelab_drone
78267799
presubmit: false
@@ -7913,3 +7886,106 @@ targets:
79137886
["framework", "hostonly", "shard", "windows"]
79147887
drone_dimensions:
79157888
- os=Windows
7889+
7890+
- name: Linux_pixel_7pro handshake_check_test_android
7891+
recipe: devicelab/devicelab_drone
7892+
bringup: true
7893+
timeout: 60
7894+
properties:
7895+
tags: >
7896+
["devicelab", "android", "linux", "pixel", "7pro"]
7897+
task_name: handshake_check_test_android
7898+
7899+
- name: Linux_mokey handshake_check_test_android
7900+
recipe: devicelab/devicelab_drone
7901+
bringup: true
7902+
timeout: 60
7903+
properties:
7904+
tags: >
7905+
["devicelab", "android", "linux", "mokey"]
7906+
task_name: handshake_check_test_android
7907+
7908+
- name: Linux_galaxy_s24 handshake_check_test_android
7909+
recipe: devicelab/devicelab_drone
7910+
bringup: true
7911+
timeout: 60
7912+
properties:
7913+
tags: >
7914+
["devicelab", "android", "linux", "samsung", "s24"]
7915+
task_name: handshake_check_test_android
7916+
7917+
- name: Mac_mokey handshake_check_test_android
7918+
recipe: devicelab/devicelab_drone
7919+
bringup: true
7920+
timeout: 60
7921+
enabled_branches:
7922+
- stable # TODO(flutter/flutter#189295): Delete this builder after 3.50 is released.
7923+
properties:
7924+
tags: >
7925+
["devicelab", "android", "mac", "mokey"]
7926+
task_name: handshake_check_test_android
7927+
7928+
- name: Mac_arm64_mokey handshake_check_test_android
7929+
recipe: devicelab/devicelab_drone
7930+
bringup: true
7931+
timeout: 60
7932+
properties:
7933+
tags: >
7934+
["devicelab", "android", "mac", "arm64", "mokey"]
7935+
task_name: handshake_check_test_android
7936+
7937+
- name: Windows_mokey handshake_check_test_android
7938+
recipe: devicelab/devicelab_drone
7939+
bringup: true
7940+
timeout: 60
7941+
properties:
7942+
tags: >
7943+
["devicelab", "android", "windows", "mokey"]
7944+
task_name: handshake_check_test_android
7945+
7946+
- name: Mac_ios handshake_check_test_ios
7947+
recipe: devicelab/devicelab_drone
7948+
bringup: true
7949+
timeout: 60
7950+
properties:
7951+
tags: >
7952+
["devicelab", "ios", "mac"]
7953+
task_name: handshake_check_test_ios
7954+
7955+
- name: Linux handshake_check_test_linux
7956+
recipe: devicelab/devicelab_drone
7957+
bringup: true
7958+
timeout: 60
7959+
properties:
7960+
xvfb: "1"
7961+
dependencies: >-
7962+
[
7963+
{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
7964+
{"dependency": "cmake", "version": "build_id:8787856497187628321"},
7965+
{"dependency": "ninja", "version": "version:1.9.0"}
7966+
]
7967+
tags: >
7968+
["devicelab", "hostonly", "linux"]
7969+
task_name: handshake_check_test_linux
7970+
7971+
- name: Mac handshake_check_test_macos
7972+
recipe: devicelab/devicelab_drone
7973+
bringup: true
7974+
timeout: 60
7975+
properties:
7976+
tags: >
7977+
["devicelab", "hostonly", "mac"]
7978+
task_name: handshake_check_test_macos
7979+
7980+
- name: Windows handshake_check_test_windows
7981+
recipe: devicelab/devicelab_drone
7982+
bringup: true
7983+
timeout: 60
7984+
properties:
7985+
dependencies: >-
7986+
[
7987+
{"dependency": "vs_build", "version": "version:vs2019"}
7988+
]
7989+
tags: >
7990+
["devicelab", "hostonly", "windows"]
7991+
task_name: handshake_check_test_windows

‎CHANGELOG.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,15 @@ docs/releases/Hotfix-Documentation-Best-Practices.md
3232

3333
## Flutter 3.47 Changes
3434

35+
### [3.47.8](https://github.com/flutter/flutter/releases/tag/3.47.8)
36+
#### Security advisory [GHSA-frr6-h895-5pxp](https://github.com/dart-lang/sdk/security/advisories/GHSA-frr6-h895-5pxp):
37+
- [dart/568000](https://dart-review.googlesource.com/c/sdk/+/568000) Updates BoringSSL in the Dart runtime (3.13.7) to block compromised eMudhra intermediate CA certificates.
38+
- [dart/64696](https://github.com/dart-lang/sdk/pull/64696) Updates `dart:io` on Android 14+ to use the updatable Conscrypt APEX root certificate store.
39+
- Developers shipping Android, Windows, or Linux applications should upgrade to Flutter 3.47.8 and rebuild their apps.
40+
---
41+
- [flutter/190235](https://github.com/flutter/flutter/issues/190235) When running flutter pub get or building desktop apps with existing or broken plugin symlink entries, flutter_tools no longer crashes with a PathExistsException.
42+
- [flutter/192934](https://github.com/flutter/flutter/issues/192934) When dumping the focus tree or layer tree from flutter run on any platform before the UI isolate finishes initializing or after teardown, flutter_tools crashed with a null check operator exception.
43+
3544
### [3.47.7](https://github.com/flutter/flutter/releases/tag/3.47.7)
3645
- [flutter/182604](https://github.com/flutter/flutter/issues/182604) When an OverlayPortal is displayed on iOS, accessibility frames are shrunk by the device pixel ratio and anchored to the top-left, so VoiceOver focus and XCUITest taps miss the visible controls.
3746
- [flutter/100946](https://github.com/flutter/flutter/issues/100946) When using VoiceOver on iOS with a ReorderableListView, Semantics focus is incorrectly shifted to the top left of the screen.

‎DEPS‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ vars = {
1515
'skia_git': 'https://skia.googlesource.com',
1616
'llvm_git': 'https://llvm.googlesource.com',
1717
'dart_ai_rev': '9c96bfe5f091c9451eff5b59c9bffeb2e806b875',
18-
'skia_revision': 'b667731938d8a0921e543a04bfa01a5ecb7950f6',
18+
'skia_revision': 'ab9b798555a6cc38e7adeacb86ca6a99c5be5819',
1919

2020
# Do not download the Emscripten SDK by default.
2121
# This prevents us from downloading the Emscripten toolchain for builds
@@ -55,13 +55,13 @@ vars = {
5555
# updated revision list of existing dependencies. You will need to
5656
# gclient sync before and after update deps to ensure all deps are updated.
5757
# updated revision list of existing dependencies.
58-
'dart_revision': '6664730e1868c45f99f6fc0639ce73259be55074',
58+
'dart_revision': '65fc979759ca82d3f750fb644fd00f963d47e111',
5959

6060
# WARNING: DO NOT EDIT MANUALLY
6161
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
6262
'dart_binaryen_rev': 'a631c1445ced72a905b3303b26f148fc706647dd',
63-
'dart_boringssl_rev': '5b83e5d1abf0ae0033ae52ab579d906b67633b2c',
64-
'dart_core_rev': '72e71ca01b4d50902f84741470cd5dea0cd5a0fa',
63+
'dart_boringssl_rev': 'c7eb007fd10627f1abb41a3e368b85e24cd20af9',
64+
'dart_core_rev': '04da6763aa399607ddd1778ef9318a05276cbc01',
6565
'dart_devtools_rev': '85f945ac99379d64d4df6f67d9b011e4cc418e7e',
6666
'dart_ecosystem_rev': '0ab0cfd2f092d09eb20081f81b5e75cb50611b40',
6767
'dart_http_rev': 'a8a24a0385156e259f817212767709703204d289',
@@ -304,7 +304,7 @@ deps = {
304304
Var('chromium_git') + '/external/github.com/google/re2' + '@' + 'c84a140c93352cdabbfb547c531be34515b12228',
305305

306306
'engine/src/flutter/third_party/brotli':
307-
Var('skia_git') + '/external/github.com/google/brotli.git' + '@' + '350100a5bb9d9671aca85213b2ec7a70a361b0cd',
307+
Var('skia_git') + '/external/github.com/google/brotli.git' + '@' + 'db24a98aed38a16de78cc05ca15cdd8dc2a0d92d',
308308

309309
'engine/src/flutter/third_party/yapf':
310310
Var('flutter_git') + '/third_party/yapf' + '@' + '212c5b5ad8e172d2d914ae454c121c89cccbcb35',

‎TESTOWNERS‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,6 @@
222222
/dev/devicelab/bin/tasks/native_assets_ios.dart @dcharkes @flutter/ios
223223
/dev/devicelab/bin/tasks/native_platform_view_ui_tests_ios.dart @hellohuanlin @flutter/ios
224224
/dev/devicelab/bin/tasks/new_gallery_ios__transition_perf.dart @jtmcdole @flutter/engine
225-
/dev/devicelab/bin/tasks/new_gallery_skia_ios__transition_perf.dart @jtmcdole @flutter/engine
226225
/dev/devicelab/bin/tasks/platform_channel_sample_test_ios.dart @hellohuanlin @flutter/engine
227226
/dev/devicelab/bin/tasks/platform_channel_sample_test_swift.dart @hellohuanlin @flutter/engine
228227
/dev/devicelab/bin/tasks/platform_channels_benchmarks_ios.dart @gaaclarke @flutter/engine
@@ -280,6 +279,11 @@
280279
/dev/devicelab/bin/tasks/gradle_plugin_bundle_test.dart @gmackall @flutter/plugin
281280
/dev/devicelab/bin/tasks/gradle_plugin_fat_apk_test.dart @gmackall @flutter/plugin
282281
/dev/devicelab/bin/tasks/gradle_plugin_light_apk_test.dart @gmackall @flutter/plugin
282+
/dev/devicelab/bin/tasks/handshake_check_test_android.dart @vashworth @flutter/android
283+
/dev/devicelab/bin/tasks/handshake_check_test_ios.dart @vashworth @flutter/ios
284+
/dev/devicelab/bin/tasks/handshake_check_test_linux.dart @vashworth @flutter/desktop
285+
/dev/devicelab/bin/tasks/handshake_check_test_macos.dart @vashworth @flutter/desktop
286+
/dev/devicelab/bin/tasks/handshake_check_test_windows.dart @vashworth @flutter/desktop
283287
/dev/devicelab/bin/tasks/hello_world_impeller_ios_sdfs.dart @gaaclarke @flutter/engine
284288
/dev/devicelab/bin/tasks/hello_world_impeller_linux.dart @gaaclarke @flutter/desktop
285289
/dev/devicelab/bin/tasks/hello_world_impeller_macos_sdfs.dart @b-luk @flutter/desktop
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
618afba3141906e80f6cae71abb9be16826f4bde
1+
a8549ae8080b70a087f0eb7faee991fc12113dd9

0 commit comments

Comments
 (0)