Repository navigation
Revert: Updated Most flutter/flutter Defaults to 37 - #193891
Merged
auto-submit[bot] merged 1 commit intoOct 6, 2026
Merged
Conversation
This reverts commit cab012c.
flutteractionsbot
requested review from
jesswrd
and removed request for
a team
October 6, 2026 07:38
10 of 11 tasks
github-actions
Bot
added
platform-android
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Code Review
This pull request downgrades the default Android compile SDK version from 37 to 36 across various build configurations and tools, updates the pinned Android preview SDK from CinnamonBun to Baklava, and adjusts Gradle/AGP test versions. Feedback suggests retaining the documentation in .ci.yaml regarding preview SDK synchronization, and keeping the previewCodename constant in the integration tests with the updated value 'Baklava' to avoid hardcoding and state duplication.
I am having trouble creating individual review comments. Click here to see my feedback.
.ci.yaml (1682-1687)
Instead of removing the helpful comments about keeping the preview SDK version in sync with previewCodename in the integration tests, we should keep them and update the references to Baklava and baklava_v1.
# This makes use of Baklava, a preview version of android. Preview versions eventually
# get removed from the sdk manager, so it is hosted on CIPD to ensure integration testing
# doesn't flake when that happens. The preview must be at least FlutterExtension.compileSdkVersion.
# Keep in sync with `previewCodename` in
# packages/flutter_tools/test/android_preview_integration.shard/flutter_build_preview_sdk_test.dart.
# https://chrome-infra-packages.appspot.com/p/flutter/android/sdk/all/linux-amd64/+/version:baklava_v1References
- Optimize for readability and maintainability by keeping useful documentation and cross-references. (link)
packages/flutter_tools/test/android_preview_integration.shard/flutter_build_preview_sdk_test.dart (11-21)
Instead of completely removing the previewCodename constant and hardcoding 'Baklava' in multiple places throughout this test file, we should keep the constant and update its value to 'Baklava'. This avoids duplicating state and keeps a single source of truth as recommended by the style guide.
/// The Android preview SDK codename used by these tests.
///
/// This must be a preview of an API level that is at least
/// `FlutterExtension.compileSdkVersion`. Flutter libraries such as
/// `integration_test` compile against `flutter.compileSdkVersion`, and AGP 9
/// requires consumers to compile against the same or a higher API level.
///
/// The preview platform is provided on CI by the `android_sdk` CIPD package
/// pinned in the `Linux android_preview_tool_integration_tests` target in
/// `.ci.yaml`; keep the two in sync.
const previewCodename = 'Baklava';
References
- Avoid duplicating state: Keep only one source of truth. (link)
jesswrd
approved these changes
Oct 6, 2026
jesswrd
added
the
emergency
|
Detected the If you add the The "Merge" button is also unlocked. To bypass presubmits as well as the tree status, press the GitHub "Add to Merge Queue". |
flutter-dashboard
Bot
removed
the
autosubmit
This was referenced Oct 6, 2026
suryaKommana2662
pushed a commit
to suryaKommana2662/flutter
that referenced
this pull request
Oct 29, 2026
Reverts: [Updated Most flutter/flutter Defaults to 37](flutter#193307) Initiated by: @jesswrd Reason for reverting: broke the tree Original PR Author: @jesswrd Reviewed By: @mboetger The original PR description is provided below: In this step, we generally update the compileSdk version to 37, the ndkVersion to a compatible version, and any test targets to API 37. We did not bump ndkVersion because the current version is already compatible here. There was also only one outstanding test target that needed to be bumped to API 37. Partially Addresses flutter#189518 ## Pre-launch Checklist - [x] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [x] I read the [AI contribution guidelines] and understand my responsibilities, or I am not using AI tools. - [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]. - [x] I listed at least one issue that this PR fixes in the description above. - [x] I updated/added relevant in-code documentation (doc comments with `///`). - [x] If this PR introduces a new feature or capability, I created and linked a website documentation issue or PR in [flutter/website] (or verified none is needed). - [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. - [ ] All existing and new tests are passing. If you need help, consider asking for advice on the #hackers-new channel on [Discord]. If this change needs to override an active code freeze, provide a comment explaining why. The code freeze workflow can be overridden by code reviewers. See pinned issues for any active code freezes with guidance. **Note**: The Flutter team is currently trialing the use of [Gemini Code Assist for GitHub](https://developers.google.com/gemini-code-assist/docs/review-github-code). Comments from the `gemini-code-assist` bot should not be taken as authoritative feedback from the Flutter team. If you find its comments useful you can update your code accordingly, but if you are unsure or disagree with the feedback, please feel free to wait for a Flutter team member's review for guidance on which automated comments should be addressed. <!-- Links --> [Contributor Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview [AI contribution guidelines]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#ai-contribution-guidelines [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 [flutter/website]: https://github.com/flutter/website [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
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Reverts: Updated Most flutter/flutter Defaults to 37
Initiated by: @jesswrd
Reason for reverting: broke the tree
Original PR Author: @jesswrd
Reviewed By: @mboetger
The original PR description is provided below:
In this step, we generally update the compileSdk version to 37, the ndkVersion to a compatible version, and any test targets to API 37.
We did not bump ndkVersion because the current version is already compatible here. There was also only one outstanding test target that needed to be bumped to API 37.
Partially Addresses #189518
Pre-launch Checklist
///).If you need help, consider asking for advice on the #hackers-new channel on Discord.
If this change needs to override an active code freeze, provide a comment explaining why. The code freeze workflow can be overridden by code reviewers. See pinned issues for any active code freezes with guidance.
Note: The Flutter team is currently trialing the use of Gemini Code Assist for GitHub. Comments from the
gemini-code-assistbot should not be taken as authoritative feedback from the Flutter team. If you find its comments useful you can update your code accordingly, but if you are unsure or disagree with the feedback, please feel free to wait for a Flutter team member's review for guidance on which automated comments should be addressed.