Skip to content

Commit 4e6ebfc

Browse files
dkwingsmtdkwingsmt
authored
Merge branch 'master' into handle#6537-AnimatedSwitcher
2 parents 4cf1aa4 + 4b5de7d commit 4e6ebfc

546 files changed

Lines changed: 26506 additions & 7348 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: 138 additions & 106 deletions
Large diffs are not rendered by default.

‎CHANGELOG.md‎

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

3333
## Flutter 3.38 Changes
3434

35+
### [3.38.6](https://github.com/flutter/flutter/releases/tag/3.38.6)
36+
37+
- [flutter/179139](https://github.com/flutter/flutter/issues/179139) - `flutter widget-preview start` creates new cached build artifacts on each run, resulting in increasing disk usage after each run.
38+
- [flutter/178896](https://github.com/flutter/flutter/issues/178896) - Apps crash during launch on Windows when run from paths containing non-ASCII characters.
39+
- [flutter/176943](https://github.com/flutter/flutter/issues/176943) - Configuration changes to run tests on macOS 15 or 15.7.2 for Flutter's CI.
40+
- [flutter/179914](https://github.com/flutter/flutter/issues/179914) - Flutter Android apps that upgrade to AGP 9.0.0 require migration steps.
41+
- [flutter/175099](https://github.com/flutter/flutter/issues/175099) - When WebViews are scrolled on iOS 26, they become unclickable.
42+
- [flutter/175074](https://github.com/flutter/flutter/issues/175074) - When the virtual keyboard is closed on Android web, the area behind it remains blank and the app only draws in the area that used to be above the keyboard.
43+
- [flutter/180381](https://github.com/flutter/flutter/issues/180381) - Apps crash on Android when enabling accessibility, hiding a platform view, and pulling out the top curtain.
44+
3545
### [3.38.5](https://github.com/flutter/flutter/releases/tag/3.38.5)
3646

3747
- [flutter/179700](https://github.com/flutter/flutter/issues/179700) Update dart to 3.10.4.

‎CODEOWNERS‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
# The following files define an Application Binary Interface (ABI) that must maintain
1919
# both forward and backward compatibility. Changes should be heavily
2020
# scrutinized as mistakes are irreversible.
21-
/engine/src/flutter/shell/platform/embedder/embedder.h @chinmaygarde @loic-sharma
22-
/engine/src/flutter/shell/platform/embedder/tests/embedder_frozen.h @chinmaygarde @loic-sharma
21+
/engine/src/flutter/shell/platform/embedder/embedder.h @loic-sharma
22+
/engine/src/flutter/shell/platform/embedder/tests/embedder_frozen.h @loic-sharma
2323

2424
# Android team - keep this synced with .github/labeler.yml's team-android section.
2525
/docs/platform/android/** @flutter/android-reviewers

‎DEPS‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ vars = {
1515
'flutter_git': 'https://flutter.googlesource.com',
1616
'skia_git': 'https://skia.googlesource.com',
1717
'llvm_git': 'https://llvm.googlesource.com',
18-
'skia_revision': 'fe2be289c9fe0df17c94ae1006dc64b01c2735ed',
18+
'skia_revision': 'd42a43daa6cfdeda7ddfbbe60645b5e13887c4d9',
1919

2020
# WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
2121
# See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
@@ -59,15 +59,15 @@ vars = {
5959
# updated revision list of existing dependencies. You will need to
6060
# gclient sync before and after update deps to ensure all deps are updated.
6161
# updated revision list of existing dependencies.
62-
'dart_revision': '6b5a8543c5db6d7f2e57878dfbe4fdfc7fc336f5',
62+
'dart_revision': '87fbfd5381b6f577116ca4b6877c6318b9689eab',
6363

6464
# WARNING: DO NOT EDIT MANUALLY
6565
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
66-
'dart_ai_rev': '4eb2446144a8af374e08da8d3c743dcce129f87f',
66+
'dart_ai_rev': 'a3a196bf4773c7a7a9f93b6798232fb0d8220bc3',
6767
'dart_binaryen_rev': '6ec7b5f9c615d3b224c67ae221d6812c8f8e1a96',
68-
'dart_boringssl_rev': '529a943d9842a006c98be5993d208679667fbbdf',
68+
'dart_boringssl_rev': '78ab2c2774bccbd29ec217fd071e6ee63bde6bb1',
6969
'dart_core_rev': 'cbb485437c61d37753bcc98818beca54d5b38f69',
70-
'dart_devtools_rev': 'bac6843cce3c98d8794a7cce796faaa8860cc00f',
70+
'dart_devtools_rev': 'b9d7fc1a4119b3d214a77939f9d75b0c0b25d36a',
7171
'dart_ecosystem_rev': 'eac66d93142907b39f2271647c111f36ff3365b9',
7272
'dart_http_rev': 'a22386e9c390290c916d1c53a3d3c1447ec120ce',
7373
'dart_i18n_rev': 'dd8a792a8492370a594706c8304d2eb8db844d7a',
@@ -77,7 +77,7 @@ vars = {
7777
'dart_protobuf_rev': '9e30258e0aa6a6430ee36c84b75308a9702fde42',
7878
'dart_pub_rev': 'b21ac685bc64f6e81050ec0093aa83543d66e2fd',
7979
'dart_sync_http_rev': '6666fff944221891182e1f80bf56569338164d72',
80-
'dart_tools_rev': 'da3c459288410c003a84dbf28564a9bf7ca8091e',
80+
'dart_tools_rev': '87270e60a5c92f127acb29d6e0dbc2d920c3f669',
8181
'dart_vector_math_rev': '70a9a2cb610d040b247f3ca2cd70a94c1c6f6f23',
8282
'dart_web_rev': '35fc98dd8f9da175ed0a2dcf246299e922e1e1e2',
8383
'dart_webdev_rev': '234e44c2ba0aa6cee5a36026538ca89457bf0d55',
@@ -205,7 +205,7 @@ vars = {
205205
# The version / instance id of the cipd:chromium/fuchsia/test-scripts which
206206
# will be used altogether with fuchsia-sdk to setup the build / test
207207
# environment.
208-
'fuchsia_test_scripts_version': 'MHF-UAfO6sVKqSEYknqkl3nsdAQmODJNHF-pYBSpRzgC',
208+
'fuchsia_test_scripts_version': 'nR2ESa1Gd8yPcWo063yCqGBh6aAsLcwhgsRPFU0I0v0C',
209209

210210
# The version / instance id of the cipd:chromium/fuchsia/gn-sdk which will be
211211
# used altogether with fuchsia-sdk to generate gn based build rules.
@@ -302,7 +302,7 @@ deps = {
302302
Var('chromium_git') + '/external/github.com/WebAssembly/binaryen.git' + '@' + Var('dart_binaryen_rev'),
303303

304304
'engine/src/flutter/third_party/dart/third_party/devtools':
305-
{'dep_type': 'cipd', 'packages': [{'package': 'dart/third_party/flutter/devtools', 'version': 'git_revision:bac6843cce3c98d8794a7cce796faaa8860cc00f'}]},
305+
{'dep_type': 'cipd', 'packages': [{'package': 'dart/third_party/flutter/devtools', 'version': 'git_revision:b9d7fc1a4119b3d214a77939f9d75b0c0b25d36a'}]},
306306

307307
'engine/src/flutter/third_party/dart/third_party/perfetto/src':
308308
Var('android_git') + '/platform/external/perfetto' + '@' + Var('dart_perfetto_rev'),
@@ -332,7 +332,7 @@ deps = {
332332
Var('dart_git') + '/leak_tracker.git@f5620600a5ce1c44f65ddaa02001e200b096e14c',
333333

334334
'engine/src/flutter/third_party/dart/third_party/pkg/native':
335-
Var('dart_git') + '/native.git@93039d7ef0b71cd01567e00e6b5be90a3e7d0668',
335+
Var('dart_git') + '/native.git@4bed1ed249b22f9a447b96bcaf4b546ce0e70319',
336336

337337
'engine/src/flutter/third_party/dart/third_party/pkg/protobuf':
338338
Var('dart_git') + '/protobuf.git' + '@' + Var('dart_protobuf_rev'),
@@ -350,7 +350,7 @@ deps = {
350350
Var('dart_git') + '/external/github.com/simolus3/tar.git@13479f7c2a18f499e840ad470cfcca8c579f6909',
351351

352352
'engine/src/flutter/third_party/dart/third_party/pkg/test':
353-
Var('dart_git') + '/test.git@c15153b9618afc4c5e8a43bac43339de130c2149',
353+
Var('dart_git') + '/test.git@f95c0f5c10fa9af35014117cb00ec17d2a117265',
354354

355355
'engine/src/flutter/third_party/dart/third_party/pkg/tools':
356356
Var('dart_git') + '/tools.git' + '@' + Var('dart_tools_rev'),
@@ -615,7 +615,7 @@ deps = {
615615
'packages': [
616616
{
617617
'package': 'flutter/android/sdk/all/${{platform}}',
618-
'version': 'version:36v6unmodified'
618+
'version': 'version:36v8unmodified'
619619
}
620620
],
621621
'condition': 'download_android_deps',
@@ -810,7 +810,7 @@ deps = {
810810
'packages': [
811811
{
812812
'package': 'fuchsia/sdk/core/linux-amd64',
813-
'version': 'oe10epXkqGnv21AbZjYHeoU0UkaCP2qISImP8lYnMt0C'
813+
'version': 'VYeyMPe1lyCtlcl-VWGpiFxFCVdWtFnCPcmZqIsCkI4C'
814814
}
815815
],
816816
'condition': 'download_fuchsia_deps and not download_fuchsia_sdk',

‎bin/internal/flutter_packages.version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6f392aaa748f838674c2aeec3308a1da40437068
1+
51fe1d98ca008cc00c06a5ffcb0db7579c9ff4d0

‎bin/internal/update_dart_sdk.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,9 @@ if [ ! -f "$ENGINE_STAMP" ] || [ "$ENGINE_VERSION" != `cat "$ENGINE_STAMP"` ]; t
8989
x86_64)
9090
ARCH="x64"
9191
;;
92+
riscv64)
93+
ARCH="riscv64"
94+
;;
9295
*)
9396
ARCH="arm64"
9497
;;

‎dev/bots/analyze.dart‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -288,6 +288,14 @@ Future<void> run(List<String> arguments) async {
288288
// Ensure integration test files are up-to-date with the app template.
289289
printProgress('Up to date integration test template files...');
290290
await verifyIntegrationTestTemplateFiles(flutterRoot);
291+
292+
// Check for cross-library imports in tests. For example,
293+
// widget library tests should not import the Material library.
294+
printProgress('Cross-import test validation...');
295+
await runCommand(dart, <String>[
296+
'--enable-asserts',
297+
path.join(flutterRoot, 'dev', 'bots', 'check_tests_cross_imports.dart'),
298+
], workingDirectory: flutterRoot);
291299
}
292300

293301
// TESTS

0 commit comments

Comments
 (0)