Skip to content

Conversation

@jmagman
Copy link
Member

@jmagman jmagman commented Nov 15, 2024

Fixes #158951

Pre-launch Checklist

If you need help, consider asking for advice on the #hackers-new channel on Discord.

@jmagman jmagman marked this pull request as ready for review November 15, 2024 00:40
@reidbaker reidbaker requested a review from a team November 15, 2024 15:13
@reidbaker reidbaker added the autosubmit Merge PR when tree becomes green via auto submit App label Nov 15, 2024
@auto-submit auto-submit bot merged commit c4c8f6d into flutter:master Nov 15, 2024
@auto-submit auto-submit bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Nov 15, 2024
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Nov 15, 2024
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Nov 15, 2024
auto-submit bot pushed a commit to flutter/packages that referenced this pull request Nov 15, 2024
Roll Flutter from ed553d1 to 0e2d55e (40 revisions)

flutter/flutter@ed553d1...0e2d55e

2024-11-15 engine-flutter-autoroll@skia.org Roll Packages from b9ac917 to b164be3 (4 revisions) (flutter/flutter#158986)
2024-11-15 magder@google.com Label PRs with gradle and Android paths "platform-android" (flutter/flutter#158970)
2024-11-15 kustermann@google.com Fix code asset copying logic in native asset code (flutter/flutter#158984)
2024-11-15 kustermann@google.com Fix duplicate work in native assets release builds (flutter/flutter#158980)
2024-11-15 matanlurey@users.noreply.github.com Stop generate both `.kts` and non-`.kts` gradle files for a test project. (flutter/flutter#158965)
2024-11-15 matanlurey@users.noreply.github.com Further skip `native_assets_test`(s) that runs `flutter build apk`. (flutter/flutter#158966)
2024-11-15 49699333+dependabot[bot]@users.noreply.github.com Bump actions/checkout from 4.2.1 to 4.2.2 (flutter/flutter#157473)
2024-11-15 matanlurey@users.noreply.github.com Try running historically flaky tests first to make `flutter build apk` health tests time out more often? (flutter/flutter#158967)
2024-11-15 bkonyi@google.com [ tool ] Don't throw StateError when DDS fails to start (flutter/flutter#158744)
2024-11-14 katelovett@google.com Create merge_queue.md (flutter/flutter#158959)
2024-11-14 fluttergithubbot@gmail.com Marks Mac_x64 hot_mode_dev_cycle_macos_target__benchmark to be flaky (flutter/flutter#158569)
2024-11-14 fluttergithubbot@gmail.com Marks Mac_arm64 mac_desktop_impeller to be unflaky (flutter/flutter#158564)
2024-11-14 gengesa@gmail.com [gen_l10n] When localizing a message, prefer placeholder definitions defined by the current locale rather than the template locale (flutter/flutter#153459)
2024-11-14 august.oberhauser@swissinfo.ch feat: Include web 1.x.x in plugin template (flutter/flutter#156947)
2024-11-14 andrewrkolos@gmail.com hide members where possible (flutter/flutter#158492)
2024-11-14 andrewrkolos@gmail.com Move platform-specific log-reading implementation details from `ResidentRunner`/`FlutterDevice` to `DeviceLogReader` implementations (flutter/flutter#156181)
2024-11-14 98221114+Neutrino2711@users.noreply.github.com Updated document to clarify Clip Behaviour (flutter/flutter#157719)
2024-11-14 bkonyi@google.com Enable --verbose for android_plugin_skip_unsupported_test tests (flutter/flutter#158933)
2024-11-14 engine-flutter-autoroll@skia.org Roll Packages from 26e123a to b9ac917 (5 revisions) (flutter/flutter#158938)
2024-11-14 43054281+camsim99@users.noreply.github.com Add `dev_dependency` attribute to plugins in `.flutter-plugins-dependencies` (flutter/flutter#158009)
2024-11-14 matanlurey@users.noreply.github.com No longer pass `--verbose` to implicit `pub` calls when `flutter --verbose` is set. (flutter/flutter#158898)
2024-11-14 stuartmorgan@google.com Update triage flow chart for SVG packages (flutter/flutter#158670)
2024-11-14 bruno.leroux@gmail.com Add one MenuAnchor alignment test (flutter/flutter#158915)
2024-11-14 32538273+ValentinVignal@users.noreply.github.com Reland Add test for dynamic_content_color.0.dart (flutter/flutter#158547)
2024-11-14 engine-flutter-autoroll@skia.org Roll Flutter Engine from e97b148e796d to 619804c0fbb7 (1 revision) (flutter/flutter#158905)
2024-11-14 engine-flutter-autoroll@skia.org Roll Flutter Engine from 82940a9aa714 to e97b148e796d (1 revision) (flutter/flutter#158901)
2024-11-14 matanlurey@users.noreply.github.com Move explicit package dependencies to a feature flag (flutter/flutter#158016)
2024-11-14 matanlurey@users.noreply.github.com Try with `bringup: true` debugging why `flutter build apk` often times out. (flutter/flutter#158895)
2024-11-14 rexios@rexios.dev Add constraint options to `SearchAnchor` suggestions builder (flutter/flutter#148856)
2024-11-14 50643541+Mairramer@users.noreply.github.com Adjusts the Hindi TimeOfDayFormat to display in a LTR orientation in localizations. (flutter/flutter#157998)
2024-11-14 38378650+hgraceb@users.noreply.github.com Fix update order of SliverAppBar (flutter/flutter#158159)
2024-11-13 42980667+srivats22@users.noreply.github.com #154792 - CupertinoActionSheetAction cursor doesn't change to clickable on desktop (flutter/flutter#158470)
2024-11-13 58190796+MitchellGoodwin@users.noreply.github.com Adds a skip message for analyzer (flutter/flutter#158890)
2024-11-13 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Marks Mac_arm64_ios hot_mode_dev_cycle_ios__benchmark to be flaky (#158242)" (flutter/flutter#158891)
2024-11-13 737941+loic-sharma@users.noreply.github.com [SwiftPM] Move the logic for SwiftPM enablement to the platform project (flutter/flutter#158213)
2024-11-13 matanlurey@users.noreply.github.com Temporarily skip flutter build apk for native_assets tests. (flutter/flutter#158880)
2024-11-13 me@alestiago.com docs: include Human Interface haptic information in HapticFeedback (flutter/flutter#158587)
2024-11-13 engine-flutter-autoroll@skia.org Roll Flutter Engine from db3e5af2ca22 to 82940a9aa714 (2 revisions) (flutter/flutter#158799)
2024-11-13 matanlurey@users.noreply.github.com Stream the output of `flutter build` for debugging. (flutter/flutter#158757)
2024-11-13 nate.w5687@gmail.com "Fix failing checks" wiki page for new contributors (flutter/flutter#154629)

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/flutter-packages
Please CC dit@google.com,stuartmorgan@google.com on the revert to ensure that a human
is aware of the problem.
...
github-merge-queue bot pushed a commit that referenced this pull request Nov 19, 2024
…9166)

Label PRs that touch any `*android*` files in flutter_tool with
`platform-android`. In particular this should catch the template android
directories.

Labeler log:
https://github.com/flutter/flutter/actions/runs/11921551623/job/33225914301?pr=159166#step:2:240

<details>

<summary>Included files</summary>

```
$ git ls-files 'packages/flutter_tools/*android**'
packages/flutter_tools/ide_templates/intellij/dev/manual_tests/android.iml.copy.tmpl
packages/flutter_tools/ide_templates/intellij/examples/flutter_gallery/android.iml.copy.tmpl
packages/flutter_tools/ide_templates/intellij/examples/hello_world/android.iml.copy.tmpl
packages/flutter_tools/ide_templates/intellij/examples/platform_channel/android.iml.copy.tmpl
packages/flutter_tools/ide_templates/intellij/examples/platform_view/android.iml.copy.tmpl
packages/flutter_tools/ide_templates/intellij/examples/stocks/android.iml.copy.tmpl
packages/flutter_tools/lib/src/android/README.md
packages/flutter_tools/lib/src/android/adb.dart
packages/flutter_tools/lib/src/android/android.dart
packages/flutter_tools/lib/src/android/android_builder.dart
packages/flutter_tools/lib/src/android/android_console.dart
packages/flutter_tools/lib/src/android/android_device.dart
packages/flutter_tools/lib/src/android/android_device_discovery.dart
packages/flutter_tools/lib/src/android/android_emulator.dart
packages/flutter_tools/lib/src/android/android_sdk.dart
packages/flutter_tools/lib/src/android/android_studio.dart
packages/flutter_tools/lib/src/android/android_studio_validator.dart
packages/flutter_tools/lib/src/android/android_workflow.dart
packages/flutter_tools/lib/src/android/application_package.dart
packages/flutter_tools/lib/src/android/build_validation.dart
packages/flutter_tools/lib/src/android/deferred_components_gen_snapshot_validator.dart
packages/flutter_tools/lib/src/android/deferred_components_prebuild_validator.dart
packages/flutter_tools/lib/src/android/deferred_components_validator.dart
packages/flutter_tools/lib/src/android/gradle.dart
packages/flutter_tools/lib/src/android/gradle_errors.dart
packages/flutter_tools/lib/src/android/gradle_utils.dart
packages/flutter_tools/lib/src/android/java.dart
packages/flutter_tools/lib/src/android/migrations/android_studio_java_gradle_conflict_migration.dart
packages/flutter_tools/lib/src/android/migrations/cmake_android_16k_pages_migration.dart
packages/flutter_tools/lib/src/android/migrations/min_sdk_version_migration.dart
packages/flutter_tools/lib/src/android/migrations/multidex_removal_migration.dart
packages/flutter_tools/lib/src/android/migrations/top_level_gradle_build_file_migration.dart
packages/flutter_tools/lib/src/build_system/targets/android.dart
packages/flutter_tools/lib/src/commands/android_analyze.dart
packages/flutter_tools/lib/src/isolated/native_assets/android/native_assets.dart
packages/flutter_tools/templates/app_shared/android-java.tmpl/app/build.gradle.kts.tmpl
packages/flutter_tools/templates/app_shared/android-java.tmpl/app/src/main/java/androidIdentifier/MainActivity.java.tmpl
packages/flutter_tools/templates/app_shared/android-java.tmpl/build.gradle.kts.tmpl
packages/flutter_tools/templates/app_shared/android-java.tmpl/projectName_android.iml.tmpl
packages/flutter_tools/templates/app_shared/android-kotlin.tmpl/app/build.gradle.kts.tmpl
packages/flutter_tools/templates/app_shared/android-kotlin.tmpl/app/src/main/kotlin/androidIdentifier/MainActivity.kt.tmpl
packages/flutter_tools/templates/app_shared/android-kotlin.tmpl/build.gradle.kts.tmpl
packages/flutter_tools/templates/app_shared/android-kotlin.tmpl/projectName_android.iml.tmpl
packages/flutter_tools/templates/app_shared/android.tmpl/.gitignore
packages/flutter_tools/templates/app_shared/android.tmpl/app/src/debug/AndroidManifest.xml.tmpl
packages/flutter_tools/templates/app_shared/android.tmpl/app/src/main/AndroidManifest.xml.tmpl
packages/flutter_tools/templates/app_shared/android.tmpl/app/src/main/res/drawable-v21/launch_background.xml
packages/flutter_tools/templates/app_shared/android.tmpl/app/src/main/res/drawable/launch_background.xml
packages/flutter_tools/templates/app_shared/android.tmpl/app/src/main/res/mipmap-hdpi/ic_launcher.png
packages/flutter_tools/templates/app_shared/android.tmpl/app/src/main/res/mipmap-mdpi/ic_launcher.png
packages/flutter_tools/templates/app_shared/android.tmpl/app/src/main/res/mipmap-xhdpi/ic_launcher.png
packages/flutter_tools/templates/app_shared/android.tmpl/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
packages/flutter_tools/templates/app_shared/android.tmpl/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
packages/flutter_tools/templates/app_shared/android.tmpl/app/src/main/res/values-night/styles.xml
packages/flutter_tools/templates/app_shared/android.tmpl/app/src/main/res/values/styles.xml
packages/flutter_tools/templates/app_shared/android.tmpl/app/src/profile/AndroidManifest.xml.tmpl
packages/flutter_tools/templates/app_shared/android.tmpl/gradle.properties.tmpl
packages/flutter_tools/templates/app_shared/android.tmpl/gradle/wrapper/gradle-wrapper.properties.tmpl
packages/flutter_tools/templates/app_shared/android.tmpl/settings.gradle.kts.tmpl
packages/flutter_tools/templates/module/android/deferred_component/build.gradle.tmpl
packages/flutter_tools/templates/module/android/deferred_component/src/main/AndroidManifest.xml.tmpl
packages/flutter_tools/templates/module/android/gradle/build.gradle.tmpl
packages/flutter_tools/templates/module/android/gradle/gradle.properties.tmpl
packages/flutter_tools/templates/module/android/gradle/settings.gradle.tmpl
packages/flutter_tools/templates/module/android/gradle/src/main/AndroidManifest.xml.tmpl
packages/flutter_tools/templates/module/android/host_app_common/app.tmpl/build.gradle.tmpl
packages/flutter_tools/templates/module/android/host_app_common/app.tmpl/src/main/AndroidManifest.xml.tmpl
packages/flutter_tools/templates/module/android/host_app_common/app.tmpl/src/main/java/androidIdentifier/host/MainActivity.java.tmpl
packages/flutter_tools/templates/module/android/host_app_common/app.tmpl/src/main/res/drawable/launch_background.xml
packages/flutter_tools/templates/module/android/host_app_common/app.tmpl/src/main/res/mipmap-hdpi/ic_launcher.png
packages/flutter_tools/templates/module/android/host_app_common/app.tmpl/src/main/res/values/styles.xml
packages/flutter_tools/templates/module/android/host_app_editable/settings.gradle.copy.tmpl
packages/flutter_tools/templates/module/android/host_app_ephemeral/settings.gradle.copy.tmpl
packages/flutter_tools/templates/module/android/library_new_embedding/Flutter.tmpl/build.gradle.tmpl
packages/flutter_tools/templates/module/android/library_new_embedding/Flutter.tmpl/flutter.iml.copy.tmpl
packages/flutter_tools/templates/module/android/library_new_embedding/Flutter.tmpl/src/main/AndroidManifest.xml.tmpl
packages/flutter_tools/templates/module/android/library_new_embedding/include_flutter.groovy.copy.tmpl
packages/flutter_tools/templates/module/android/library_new_embedding/settings.gradle.copy.tmpl
packages/flutter_tools/templates/module/common/projectName_android.iml.tmpl
packages/flutter_tools/templates/plugin/android-java.tmpl/build.gradle.tmpl
packages/flutter_tools/templates/plugin/android-java.tmpl/projectName_android.iml.tmpl
packages/flutter_tools/templates/plugin/android-java.tmpl/src/main/java/androidIdentifier/pluginClass.java.tmpl
packages/flutter_tools/templates/plugin/android-java.tmpl/src/test/java/androidIdentifier/pluginClassTest.java.tmpl
packages/flutter_tools/templates/plugin/android-kotlin.tmpl/build.gradle.tmpl
packages/flutter_tools/templates/plugin/android-kotlin.tmpl/projectName_android.iml.tmpl
packages/flutter_tools/templates/plugin/android-kotlin.tmpl/src/main/kotlin/androidIdentifier/pluginClass.kt.tmpl
packages/flutter_tools/templates/plugin/android-kotlin.tmpl/src/test/kotlin/androidIdentifier/pluginClassTest.kt.tmpl
packages/flutter_tools/templates/plugin/android.tmpl/.gitignore
packages/flutter_tools/templates/plugin/android.tmpl/settings.gradle.tmpl
packages/flutter_tools/templates/plugin/android.tmpl/src/main/AndroidManifest.xml.tmpl
packages/flutter_tools/templates/plugin_ffi/android.tmpl/build.gradle.tmpl
packages/flutter_tools/templates/plugin_ffi/android.tmpl/projectName_android.iml.tmpl
packages/flutter_tools/templates/plugin_shared/android.tmpl/.gitignore
packages/flutter_tools/templates/plugin_shared/android.tmpl/settings.gradle.tmpl
packages/flutter_tools/templates/plugin_shared/android.tmpl/src/main/AndroidManifest.xml.tmpl
packages/flutter_tools/test/android_java11_integration.shard/android_dependency_version_checking_test.dart
packages/flutter_tools/test/android_preview_integration.shard/README.md
packages/flutter_tools/test/android_preview_integration.shard/flutter_build_preview_sdk_test.dart
packages/flutter_tools/test/commands.shard/hermetic/android_analyze_test.dart
packages/flutter_tools/test/general.shard/android/adb_log_reader_test.dart
packages/flutter_tools/test/general.shard/android/android_device_discovery_test.dart
packages/flutter_tools/test/general.shard/android/android_device_port_forwarder_test.dart
packages/flutter_tools/test/general.shard/android/android_device_start_test.dart
packages/flutter_tools/test/general.shard/android/android_device_test.dart
packages/flutter_tools/test/general.shard/android/android_emulator_test.dart
packages/flutter_tools/test/general.shard/android/android_gradle_builder_test.dart
packages/flutter_tools/test/general.shard/android/android_install_test.dart
packages/flutter_tools/test/general.shard/android/android_project_migration_test.dart
packages/flutter_tools/test/general.shard/android/android_sdk_test.dart
packages/flutter_tools/test/general.shard/android/android_studio_test.dart
packages/flutter_tools/test/general.shard/android/android_studio_validator_test.dart
packages/flutter_tools/test/general.shard/android/android_workflow_test.dart
packages/flutter_tools/test/general.shard/android/build_validation_test.dart
packages/flutter_tools/test/general.shard/android/deferred_components_gen_snapshot_validator_test.dart
packages/flutter_tools/test/general.shard/android/deferred_components_prebuild_validator_test.dart
packages/flutter_tools/test/general.shard/android/gradle_errors_test.dart
packages/flutter_tools/test/general.shard/android/gradle_find_bundle_test.dart
packages/flutter_tools/test/general.shard/android/gradle_test.dart
packages/flutter_tools/test/general.shard/android/gradle_utils_test.dart
packages/flutter_tools/test/general.shard/android/java_test.dart
packages/flutter_tools/test/general.shard/android/migration/cmake_android_16k_pages_migration_test.dart
packages/flutter_tools/test/general.shard/android/template_test.dart
packages/flutter_tools/test/general.shard/android_plugin_test.dart
packages/flutter_tools/test/general.shard/build_system/targets/android_test.dart
packages/flutter_tools/test/general.shard/isolated/android/native_assets_test.dart
packages/flutter_tools/test/integration.shard/android_e2e_api_test.dart
packages/flutter_tools/test/integration.shard/android_gradle_daemon_cache_test.dart
packages/flutter_tools/test/integration.shard/android_gradle_deprecated_plugin_apply_test.dart
packages/flutter_tools/test/integration.shard/android_gradle_flutter_source_path_test.dart
packages/flutter_tools/test/integration.shard/android_gradle_java_version_test.dart
packages/flutter_tools/test/integration.shard/android_gradle_legacy_flutter_plugins_strings_in_comments_test.dart
packages/flutter_tools/test/integration.shard/android_gradle_outputs_app_link_settings_test.dart
packages/flutter_tools/test/integration.shard/android_gradle_print_build_variants_test.dart
packages/flutter_tools/test/integration.shard/android_plugin_compilesdkversion_mismatch_test.dart
packages/flutter_tools/test/integration.shard/android_plugin_example_app_build_test.dart
packages/flutter_tools/test/integration.shard/android_plugin_ndkversion_mismatch_test.dart
packages/flutter_tools/test/integration.shard/android_plugin_new_output_dir_test.dart
packages/flutter_tools/test/integration.shard/android_plugin_skip_unsupported_test.dart
packages/flutter_tools/test/integration.shard/flutter_build_android_app_project_builddir_test.dart
packages/flutter_tools/test/integration.shard/gradle_non_android_plugin_test.dart
packages/flutter_tools/test/src/android_common.dart
```

</details>

Expand #158970

## Pre-launch Checklist

- [x] I read the [Contributor Guide] and followed the process outlined
there for submitting PRs.
- [x] I read the [Tree Hygiene] wiki page, which explains my
responsibilities.
- [x] I read and followed the [Flutter Style Guide], including [Features
we expect every widget to implement].
- [x] I signed the [CLA].
- [ ] I listed at least one issue that this PR fixes in the description
above.
- [x] I updated/added relevant documentation (doc comments with `///`).
- [x] I added new tests to check the change I am making, or this PR is
[test-exempt].
- [x] I followed the [breaking change policy] and added [Data Driven
Fixes] where supported.
- [x] All existing and new tests are passing.

If you need help, consider asking for advice on the #hackers-new channel
on [Discord].

<!-- Links -->
[Contributor Guide]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview
[Tree Hygiene]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md
[test-exempt]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#tests
[Flutter Style Guide]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md
[Features we expect every widget to implement]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#features-we-expect-every-widget-to-implement
[CLA]: https://cla.developers.google.com/
[flutter/tests]: https://github.com/flutter/tests
[breaking change policy]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#handling-breaking-changes
[Discord]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Chat.md
[Data Driven Fixes]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Data-driven-Fixes.md
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 12, 2025
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 13, 2025
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 13, 2025
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Mar 6, 2025
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Mar 7, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Label PRs with gradle and Android paths "platform-android"

2 participants