Skip to content

Commit 671565f

Browse files
authored
Merge branch 'master' into impeller_blend_pixel_align
2 parents ec76295 + 07510ad commit 671565f

264 files changed

Lines changed: 8253 additions & 5411 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: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -211,10 +211,15 @@ platform_properties:
211211
{"dependency": "apple_signing", "version": "version:to_2027"}
212212
]
213213
device_type: none
214-
mac_model: "Macmini8,1"
214+
# Benchmarks are pinned to a single Mac model so that timing metrics are
215+
# comparable across runs. Macmini9,1 is the Apple Silicon (M1) Mac mini;
216+
# the Intel Macmini8,1 bots are being turned down
217+
# (https://flutter.dev/go/macos-intel-deprecation).
218+
mac_model: "Macmini9,1"
219+
cpu: arm64
215220
os: Mac-15.7
216221
tags: >
217-
["devicelab", "hostonly", "mac"]
222+
["devicelab", "hostonly", "mac", "arm64"]
218223
$flutter/osx_sdk : >-
219224
{
220225
"sdk_version": "17c52"
@@ -735,9 +740,9 @@ targets:
735740
- name: Linux flavors_test_linux
736741
recipe: devicelab/devicelab_drone
737742
presubmit: false
738-
bringup: true
739743
timeout: 60
740744
properties:
745+
xvfb: "1"
741746
dependencies: >-
742747
[
743748
{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
@@ -5362,13 +5367,12 @@ targets:
53625367
["devicelab", "ios", "mac"]
53635368
task_name: backdrop_filter_perf_ios__timeline_summary
53645369

5365-
- name: Mac_arm64_ios basic_material_app_ios__compile
5370+
- name: Mac_benchmark basic_material_app_ios__compile
53665371
recipe: devicelab/devicelab_drone
53675372
presubmit: false
5373+
bringup: true
53685374
timeout: 60
53695375
properties:
5370-
tags: >
5371-
["devicelab", "ios", "mac"]
53725376
task_name: basic_material_app_ios__compile
53735377

53745378
- name: Mac channels_integration_test_ios
@@ -5472,13 +5476,16 @@ targets:
54725476
["devicelab", "hostonly", "mac"]
54735477
task_name: flavors_test_ios
54745478

5475-
- name: Mac_arm64_ios flutter_gallery_ios__compile
5479+
- name: Mac_benchmark flutter_gallery_ios__compile
54765480
recipe: devicelab/devicelab_drone
54775481
presubmit: false
5482+
bringup: true
54785483
timeout: 60
54795484
properties:
5480-
tags: >
5481-
["devicelab", "ios", "mac", "arm64"]
5485+
dependencies: >-
5486+
[
5487+
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}
5488+
]
54825489
task_name: flutter_gallery_ios__compile
54835490

54845491
- name: Mac_ios flutter_gallery_ios__start_up
@@ -5499,22 +5506,20 @@ targets:
54995506
["devicelab", "ios", "mac"]
55005507
task_name: flutter_view_ios__start_up
55015508

5502-
- name: Mac_arm64_ios hello_world_ios__compile
5509+
- name: Mac_benchmark hello_world_ios__compile
55035510
recipe: devicelab/devicelab_drone
55045511
presubmit: false
5512+
bringup: true
55055513
timeout: 60
55065514
properties:
5507-
tags: >
5508-
["devicelab", "ios", "mac", "arm64"]
55095515
task_name: hello_world_ios__compile
55105516

5511-
- name: Mac_arm64_ios imitation_game_flutter
5517+
- name: Mac_benchmark imitation_game_flutter
55125518
recipe: devicelab/devicelab_drone
55135519
presubmit: false
5520+
bringup: true
55145521
timeout: 60
55155522
properties:
5516-
tags: >
5517-
["devicelab", "ios", "mac", "arm64"]
55185523
task_name: imitation_game_flutter__compile
55195524

55205525
- name: Mac_arm64_ios imitation_game_swiftui

‎CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,13 @@ Learn about what's new in this release in [the blog post](https://flutter.dev/bl
7575

7676
## Flutter 3.44 Changes
7777

78+
### [3.44.9](https://github.com/flutter/flutter/releases/tag/3.44.9)
79+
- [flutter/186366](https://github.com/flutter/flutter/issues/186366) When debugging an iOS app, if the app crashes, the Flutter CLI and tests that crash will hang.
80+
81+
### [3.44.8](https://github.com/flutter/flutter/releases/tag/3.44.8)
82+
- [flutter/188346](https://github.com/flutter/flutter/issues/188346) When building on macOS or iOS using the Xcode 27 toolchain, the build will fail due to a lipo verification error.
83+
- [flutter/184286](https://github.com/flutter/flutter/issues/184286) On some devices with vendor-modified Android 11 ROMs, `AccessibilityBridge.java` field fails to resolve.
84+
7885
### [3.44.7](https://github.com/flutter/flutter/releases/tag/3.44.7)
7986
- [flutter/188161](https://github.com/flutter/flutter/issues/188161) Fixes a resource leak that sometimes caused crashes when using external textures on some GPUs (such as Arm Mali).
8087

‎DEPS‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,22 +55,22 @@ 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': 'e2fcf6d538c8016561b2deb2e70573497f5d3af1',
58+
'dart_revision': '44f4a7000e229eaa32b90416786d0c580d6549ee',
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': '9926156a583cec3d22d521232b31c70fa9a87dc1',
63-
'dart_boringssl_rev': '8626998e7fdd6d779f37b7ba0b726631bbb76266',
63+
'dart_boringssl_rev': '1097261733d85c85147a5c96ff6ee835c90f5951',
6464
'dart_core_rev': '08e4022160c465780690c43ffdbce60812975d2c',
6565
'dart_devtools_rev': '98217413399f2d56838f0f7497a3ba48adf6f35c',
66-
'dart_ecosystem_rev': '1bdafd85bb97b331ddd683577f48a5dfa7f4cb49',
67-
'dart_http_rev': '35769ba4d7b8342385f19f1a7b7b904319b89a6a',
66+
'dart_ecosystem_rev': '16dca7ae5d3ff896a4db47e1ed6cd50f7ebbf115',
67+
'dart_http_rev': 'd8e8e9cd1ae6ed0f0339cfa0f47f92e837a786f5',
6868
'dart_i18n_rev': '1f5ea2fb2381bdf7bab054a43c0d69771f104561',
6969
'dart_perfetto_rev': '13ce0c9e13b0940d2476cd0cff2301708a9a2e2b',
7070
'dart_protobuf_rev': 'a73edc98c98fb25152aa3f12c1b9db91594c1369',
7171
'dart_pub_rev': '0382a52acba89ff0080d559bb22f4017962bbd1d',
7272
'dart_sync_http_rev': '6666fff944221891182e1f80bf56569338164d72',
73-
'dart_tools_rev': 'd22cfa54dc71cc9d9d38556e6e8c695741640113',
73+
'dart_tools_rev': '3614ce064ae452a15e83de3531236f5f89dfa526',
7474
'dart_vector_math_rev': 'cf3b5db7340d317dd3489e5a35434b408020a852',
7575
'dart_web_rev': 'e5c6c028da66688a2295557757850a1599ec392e',
7676
'dart_webdriver_rev': '8e5c611ea242efdc9f597a8a37c38a9c586120ee',
@@ -339,7 +339,7 @@ deps = {
339339
Var('dart_git') + '/dart_style.git@5a9534fad9ff2faba89596a70323d2b1f1bcf163',
340340

341341
'engine/src/flutter/third_party/dart/third_party/pkg/dartdoc':
342-
Var('dart_git') + '/dartdoc.git@df2f2cde6c18e2e613a262db05ecfe5806c40199',
342+
Var('dart_git') + '/dartdoc.git@c68debcb5636ba8d66210110092d39d5b06f8225',
343343

344344
'engine/src/flutter/third_party/dart/third_party/pkg/ecosystem':
345345
Var('dart_git') + '/ecosystem.git' + '@' + Var('dart_ecosystem_rev'),
@@ -354,7 +354,7 @@ deps = {
354354
Var('dart_git') + '/leak_tracker.git@f5620600a5ce1c44f65ddaa02001e200b096e14c',
355355

356356
'engine/src/flutter/third_party/dart/third_party/pkg/native':
357-
Var('dart_git') + '/native.git@a88aaafdd8d64082f6ea6708ee64a8c6ee7c7ebe',
357+
Var('dart_git') + '/native.git@f628b26f039c3824d83c352c489fd1a4496780d0',
358358

359359
'engine/src/flutter/third_party/dart/third_party/pkg/protobuf':
360360
Var('dart_git') + '/protobuf.git' + '@' + Var('dart_protobuf_rev'),
@@ -363,7 +363,7 @@ deps = {
363363
Var('dart_git') + '/pub.git' + '@' + Var('dart_pub_rev'),
364364

365365
'engine/src/flutter/third_party/dart/third_party/pkg/shelf':
366-
Var('dart_git') + '/shelf.git@f36dd68654814e0498c30b9f7ccc4bb0aa2bc118',
366+
Var('dart_git') + '/shelf.git@e5c8dc663bf1325ad8f997c4a2387923d37a90d9',
367367

368368
'engine/src/flutter/third_party/dart/third_party/pkg/sync_http':
369369
Var('dart_git') + '/sync_http.git' + '@' + Var('dart_sync_http_rev'),
@@ -372,7 +372,7 @@ deps = {
372372
Var('dart_git') + '/external/github.com/simolus3/tar.git@13479f7c2a18f499e840ad470cfcca8c579f6909',
373373

374374
'engine/src/flutter/third_party/dart/third_party/pkg/test':
375-
Var('dart_git') + '/test.git@c80d53dbd489d61e0481fc484cd6f9a3b53603fb',
375+
Var('dart_git') + '/test.git@9946c9551ddaffd6092c22372b7e146600aa3264',
376376

377377
'engine/src/flutter/third_party/dart/third_party/pkg/tools':
378378
Var('dart_git') + '/tools.git' + '@' + Var('dart_tools_rev'),
@@ -830,7 +830,7 @@ deps = {
830830
'packages': [
831831
{
832832
'package': 'fuchsia/sdk/core/linux-amd64',
833-
'version': 'zGeeR7JORNm-Un1vfYM7l_q7WlcrsIDjGGWBExsOLOkC'
833+
'version': 'CydvXJRmzBKJ5BaOVgkNKDMI2xg68EiGURmaOlPufyMC'
834834
}
835835
],
836836
'condition': 'download_fuchsia_deps and not download_fuchsia_sdk',

‎README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ editor plug-ins for both [Visual Studio Code] and [IntelliJ / Android Studio].
9292
Flutter provides [tens of thousands of packages][Flutter packages] to speed your
9393
development, regardless of your target platform. And accessing other native code
9494
is easy, with support for both FFI ([on Android][Android FFI], [on iOS][iOS FFI],
95-
[on macOS][macOS FFI], and [on Windows][Windows FFI]) as well as
95+
[on macOS][macOS FFI], [on Linux][Linux FFI], and [on Windows][Windows FFI]) as well as
9696
[platform-specific APIs][platform channels].
9797

9898
Flutter is a fully open-source project, and we welcome contributions.
@@ -121,6 +121,7 @@ Information on how to get started can be found in our
121121
[Android FFI]: https://docs.flutter.dev/platform-integration/android/c-interop
122122
[iOS FFI]: https://docs.flutter.dev/platform-integration/ios/c-interop
123123
[macOS FFI]: https://docs.flutter.dev/platform-integration/macos/c-interop
124+
[Linux FFI]: https://docs.flutter.dev/platform-integration/linux/building#integrate-with-linux
124125
[Windows FFI]: https://docs.flutter.dev/platform-integration/windows/building#integrating-with-windows
125126
[platform channels]: https://docs.flutter.dev/platform-integration/platform-channels
126127
[interop example]: https://github.com/flutter/flutter/tree/main/examples/platform_channel

‎TESTOWNERS‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
/dev/devicelab/bin/tasks/platform_views_hcpp_scroll_perf__timeline_summary.dart @jonahwilliams @flutter/engine
103103
/dev/devicelab/bin/tasks/platform_views_scroll_perf__timeline_summary.dart @jtmcdole @flutter/engine
104104
/dev/devicelab/bin/tasks/platform_views_scroll_perf_impeller__timeline_summary.dart @bdero @flutter/engine
105-
/dev/devicelab/bin/tasks/plugin_dependencies_test.dart @stuartmorgan-g @flutter/tool
105+
/dev/devicelab/bin/tasks/plugin_dependencies_test.dart @Piinks @flutter/plugin
106106
/dev/devicelab/bin/tasks/routing_test.dart @bkonyi @flutter/tool
107107
/dev/devicelab/bin/tasks/rrect_blur_perf__timeline_summary.dart @gaaclarke @flutter/engine
108108
/dev/devicelab/bin/tasks/shader_mask_cache_perf__e2e_summary.dart @flar @flutter/engine
@@ -165,7 +165,7 @@
165165
/dev/devicelab/bin/tasks/new_gallery_opengles_impeller__transition_perf.dart @gaaclarke @flutter/engine
166166
/dev/devicelab/bin/tasks/picture_cache_perf__timeline_summary.dart @jtmcdole @flutter/engine
167167
/dev/devicelab/bin/tasks/platform_channel_sample_test.dart @jtmcdole @flutter/engine
168-
/dev/devicelab/bin/tasks/platform_interaction_test.dart @stuartmorgan-g @flutter/plugin
168+
/dev/devicelab/bin/tasks/platform_interaction_test.dart @Piinks @flutter/plugin
169169
/dev/devicelab/bin/tasks/platform_view__start_up.dart @jtmcdole @flutter/engine
170170
/dev/devicelab/bin/tasks/run_release_test.dart @bkonyi @flutter/tool
171171
/dev/devicelab/bin/tasks/service_extensions_test.dart @bkonyi @flutter/tool
@@ -224,7 +224,7 @@
224224
/dev/devicelab/bin/tasks/platform_channel_sample_test_swift.dart @hellohuanlin @flutter/engine
225225
/dev/devicelab/bin/tasks/platform_channels_benchmarks_ios.dart @gaaclarke @flutter/engine
226226
/dev/devicelab/bin/tasks/platform_interaction_test_ios.dart @hellohuanlin @flutter/engine
227-
/dev/devicelab/bin/tasks/platform_view_ios__start_up.dart @stuartmorgan-g @flutter/plugin
227+
/dev/devicelab/bin/tasks/platform_view_ios__start_up.dart @hellohuanlin @flutter/ios
228228
/dev/devicelab/bin/tasks/platform_views_scroll_perf_ad_banners__timeline_summary.dart @hellohuanlin @flutter/engine
229229
/dev/devicelab/bin/tasks/platform_views_scroll_perf_bottom_ad_banner__timeline_summary.dart @hellohuanlin @flutter/engine
230230
/dev/devicelab/bin/tasks/platform_views_scroll_perf_ios__timeline_summary.dart @hellohuanlin @flutter/engine
@@ -258,7 +258,7 @@
258258
/dev/devicelab/bin/tasks/new_gallery_windows_skia__transition_perf.dart @gaaclarke @flutter/engine
259259
/dev/devicelab/bin/tasks/complex_layout_win_desktop__compile.dart @yaakovschectman @flutter/desktop
260260
/dev/devicelab/bin/tasks/complex_layout_win_desktop__start_up.dart @yaakovschectman @flutter/desktop
261-
/dev/devicelab/bin/tasks/dart_plugin_registry_test.dart @stuartmorgan-g @flutter/plugin
261+
/dev/devicelab/bin/tasks/dart_plugin_registry_test.dart @Piinks @flutter/plugin
262262
/dev/devicelab/bin/tasks/entrypoint_dart_registrant.dart @aaclarke @flutter/plugin
263263
/dev/devicelab/bin/tasks/flavors_test_linux.dart @robert-ancell @flutter/desktop
264264
/dev/devicelab/bin/tasks/flavors_test_macos.dart @vashworth @flutter/desktop
@@ -303,12 +303,12 @@
303303
/dev/devicelab/bin/tasks/platform_view_macos__start_up.dart @cbracken @flutter/desktop
304304
/dev/devicelab/bin/tasks/platform_view_macos_impeller__start_up.dart @loic-sharma @flutter/desktop
305305
/dev/devicelab/bin/tasks/platform_view_win_desktop__start_up.dart @yaakovschectman @flutter/desktop
306-
/dev/devicelab/bin/tasks/plugin_lint_mac.dart @stuartmorgan-g @flutter/plugin
307-
/dev/devicelab/bin/tasks/plugin_test_android_standard.dart @stuartmorgan-g @flutter/plugin
308-
/dev/devicelab/bin/tasks/plugin_test_android_variants.dart @stuartmorgan-g @flutter/plugin
309-
/dev/devicelab/bin/tasks/plugin_test_ios.dart @stuartmorgan-g @flutter/ios
310-
/dev/devicelab/bin/tasks/plugin_test_darwin.dart @stuartmorgan-g @flutter/ios
311-
/dev/devicelab/bin/tasks/plugin_test_linux.dart @stuartmorgan-g @flutter/desktop
306+
/dev/devicelab/bin/tasks/plugin_lint_mac.dart @vashworth @flutter/ios
307+
/dev/devicelab/bin/tasks/plugin_test_android_standard.dart @mboetger @flutter/android
308+
/dev/devicelab/bin/tasks/plugin_test_android_variants.dart @mboetger @flutter/android
309+
/dev/devicelab/bin/tasks/plugin_test_ios.dart @vashworth @flutter/ios
310+
/dev/devicelab/bin/tasks/plugin_test_darwin.dart @vashworth @flutter/ios
311+
/dev/devicelab/bin/tasks/plugin_test_linux.dart @robert-ancell @flutter/desktop
312312
/dev/devicelab/bin/tasks/plugin_test_macos.dart @vashworth @flutter/desktop
313313
/dev/devicelab/bin/tasks/plugin_test_windows.dart @loic-sharma @flutter/desktop
314314
/dev/devicelab/bin/tasks/run_debug_test_android.dart @camsim99 @flutter/android
@@ -382,7 +382,7 @@
382382
# docs @justinmc @flutter/framework
383383
# snippets @justinmc @flutter/framework
384384
# flutter_packaging @christopherfujino @flutter/infra
385-
# flutter_plugins @stuartmorgan-g @flutter/plugin
385+
# flutter_plugins @Piinks @flutter/plugin
386386
# framework_tests @justinmc @flutter/framework
387387
# fuchsia_precache @bkonyi @flutter/tool
388388
# realm_checker @eyebrowsoffire @flutter/tool

‎dev/benchmarks/multiple_flutters/android/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44

55
// Top-level build file where you can add configuration options common to all sub-projects/modules.
66
buildscript {
7-
ext.kotlin_version = "2.2.20"
7+
ext.kotlin_version = "2.4.0"
88
repositories {
99
google()
1010
mavenCentral()
1111
}
1212
dependencies {
13-
classpath 'com.android.tools.build:gradle:8.11.1'
13+
classpath 'com.android.tools.build:gradle:9.1.0'
1414
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1515

1616
// Do not place your application dependencies here; they belong

‎dev/benchmarks/multiple_flutters/android/gradle.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,4 @@ org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m
1717
android.useAndroidX=true
1818
# Kotlin code style for this project: "official" or "obsolete":
1919
kotlin.code.style=official
20+
android.newDsl=false
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Mon Feb 24 15:28:21 EST 2025
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

‎dev/devicelab/bin/tasks/android_java17_dependency_smoke_tests.dart‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ List<VersionTuple> versionTuples = <VersionTuple>[
2222
// TODO(jesswon): Separate max known once there exists a newer one: https://github.com/flutter/flutter/issues/189112.
2323
VersionTuple(agpVersion: '9.1.0', gradleVersion: '9.3.1', kotlinVersion: '2.4.0'),
2424
/* Others */
25-
VersionTuple(agpVersion: '8.11.1', gradleVersion: '8.14', kotlinVersion: '2.2.20'),
2625
VersionTuple(agpVersion: '8.12.0', gradleVersion: '8.14', kotlinVersion: '2.2.20'),
2726
]; // Max length is 7 entries until this test is split See https://github.com/flutter/flutter/issues/167495.
2827

‎dev/devicelab/bin/tasks/build_android_host_app_with_module_aar.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ Future<void> main() async {
452452
// Pre AGP 8.3
453453
ModuleTest(gradleVersion: '8.4', agpVersion: Version.parse('8.2.1')).call,
454454
// Post AGP 8.3 + rc candidates can work
455-
ModuleTest(gradleVersion: '8.13-rc-1', agpVersion: Version.parse('8.8.1')).call,
455+
ModuleTest(gradleVersion: '9.3.1', agpVersion: Version.parse('9.1.0')).call,
456456
]),
457457
);
458458
}

0 commit comments

Comments
 (0)