Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reapply "Bump everything to Android 21" (#51056) #51070

Merged
merged 1 commit into from
Feb 29, 2024

Conversation

dnfield
Copy link
Contributor

@dnfield dnfield commented Feb 28, 2024

This reverts commit c9381fb.

Reverted in #51056 because it caused failures in the framework. No changes, but framework test has been updated to use an actual robolectric implementation to avoid those failures.

This should not land until flutter/flutter#144348 has landed in the framework.

@gaaclarke @johnmccutchan fyi

Copy link
Member

@gmackall gmackall left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

RSLGTM

@@ -47,6 +47,7 @@
<src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterImageView.java" />
<src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/KeyData.java" />
<src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterActivityLaunchConfigs.java" />
<src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/renderer/SurfaceTextureSurfaceProducer.java" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not a blocker but do you know if there is a better way for us to be linting than manually including each source file? Were these files just forgotten, and therefore not having linting enforced?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually it looks like the inclusion is not "manual", we have a script for it, but still people need to run the script? And if they don't do that when adding new files, we won't enforce linting in ci? Is that correct?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The script runs on CI - this only got updated because I ran it locally.

@dnfield dnfield merged commit 1f24eaa into flutter:main Feb 29, 2024
25 checks passed
@dnfield dnfield deleted the android_21 branch February 29, 2024 17:00
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Feb 29, 2024
auto-submit bot pushed a commit to flutter/flutter that referenced this pull request Feb 29, 2024
…144405)

flutter/engine@7b3ef43...1f24eaa

2024-02-29 dnfield@google.com Reapply "Bump everything to Android 21" (#51056) (flutter/engine#51070)
2024-02-29 737941+loic-sharma@users.noreply.github.com [Windows] Add view ID runner APIs (flutter/engine#51020)

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/flutter-engine-flutter-autoroll
Please CC aaclarke@google.com,rmistry@google.com,zra@google.com on the revert to ensure that a human
is aware of the problem.

To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose

To report a problem with the AutoRoller itself, please file a bug:
https://issues.skia.org/issues/new?component=1389291&template=1850622

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
@dnfield dnfield mentioned this pull request Mar 4, 2024
auto-submit bot pushed a commit that referenced this pull request Mar 4, 2024
This was introduced in #51070 - my grepping for `LOLLIPOP` was too aggressive, and apparently the linter didn't catch this. I think it's just a bug in the linter.

Fixes b/327717572, because Google internal tests caught this.
XilaiZhang pushed a commit to XilaiZhang/engine that referenced this pull request Mar 5, 2024
This was introduced in flutter#51070 - my grepping for `LOLLIPOP` was too aggressive, and apparently the linter didn't catch this. I think it's just a bug in the linter.

Fixes b/327717572, because Google internal tests caught this.
auto-submit bot pushed a commit that referenced this pull request Mar 5, 2024
original description from Dan's pr:

This was introduced in #51070 - my grepping for `LOLLIPOP` was too aggressive, and apparently the linter didn't catch this. I think it's just a bug in the linter.

Fixes b/327717572, because Google internal tests caught this.
auto-submit bot pushed a commit that referenced this pull request Mar 8, 2024
…ON_CODES` (#51171)

Updates the linting script to ban the use of `VERSION_CODES`.

We currently have a mish-mash of using the integers, using `VERSION_CODES`, and even how we import the version codes. This makes it more confusing when doing things like #51070 - I think it is clearer to see `22` than `LOLLIPOP_MR1`.

I'd like to get LGTM (or at least no opinion) from all the requested reviewers here.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants