Skip to content

Conversation

@gmackall
Copy link
Member

@gmackall gmackall commented Jan 22, 2024

Policy per https://flutter.dev/go/android-dependency-versions.

#140913

Still a WIP while I clean up some error handling, remove some prints, and figure out a Java test (more difficult than the others because I believe we can only install one java version per ci shard).

Also it looks like there are errors that I need to fix when this checking is applied to a project that uses the old way of applying AGP/KGP using the top-level build.gradle file (instead of the new template way of applying them in the settings.gradle file). Done, this is why these lines exist in flutter.groovy. They just needed to be added

Pre-launch Checklist

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

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

@github-actions github-actions bot added the tool Affects the "flutter" command-line tool. See also t: labels. label Jan 22, 2024
@gmackall
Copy link
Member Author

The current shards that these tests get run on in ci are using Java 17, which is too new for the old gradle and AGP versions that need to be used for these tests. I'll need to get them on to a shard with java 11

Copy link
Contributor

Choose a reason for hiding this comment

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

I think adding a comment above main explaining why this is in the preview shard is good enough.

I think the primary audience is someone who later wants to know why when they changed the preview version this test started failing.

@gmackall gmackall added the autosubmit Merge PR when tree becomes green via auto submit App label Feb 7, 2024
@auto-submit auto-submit bot merged commit 337bc79 into flutter:master Feb 7, 2024
@vashworth vashworth added the revert Autorevert PR (with "Reason for revert:" comment) label Feb 7, 2024
auto-submit bot pushed a commit that referenced this pull request Feb 7, 2024
@auto-submit auto-submit bot removed the revert Autorevert PR (with "Reason for revert:" comment) label Feb 7, 2024
auto-submit bot added a commit that referenced this pull request Feb 7, 2024
…sions" (#143114)

Reverts #142000

Initiated by: vashworth

Reason for reverting: Causing `Mac_pixel_7pro run_release_test` and `Mac_arm64_android run_debug_test_android` to fail: https://ci.chromium.org/ui/p/flutter/builders/prod/Mac_pixel_7pro%20run_release_test/539/overview
https://ci.chromium.org/ui/p/flutter/builders/prod/Mac_arm64_android%20run_debug_test_android/6682/overview

Original PR Author: gmackall

Reviewed By: {reidbaker, camsim99, bartekpacia}

This change reverts the following previous change:
Original Description:
Policy per https://flutter.dev/go/android-dependency-versions.

#140913

~Still a WIP while I clean up some error handling, remove some prints, and figure out a Java test (more difficult than the others because I believe we can only install one java version per ci shard).~

~Also it looks like there are errors that I need to fix when this checking is applied to a project that uses the old way of applying AGP/KGP using the top-level `build.gradle` file (instead of the new template way of applying them in the `settings.gradle` file).~ Done, this is why [these lines exist](https://github.com/flutter/flutter/blob/9af6bae6b9a8d7a8a363467b834f52bfc64c9336/packages/flutter_tools/gradle/src/main/groovy/flutter.groovy#L72-L88) in `flutter.groovy`. They just needed to be added
@gmackall
Copy link
Member Author

gmackall commented Feb 7, 2024

Looks like this is because the two tests used a project with a gradle file that applied KGP after the Flutter Gradle Plugin:

plugins {
    id "com.android.application"
    id "dev.flutter.flutter-gradle-plugin"
    id "org.jetbrains.kotlin.android"
}

In the re-land, I'll

  1. change the test,
  2. add to the logs for the "can't find AGP/KGP" cases that this can be a potential cause,
  3. add a note in the templates that the ordering is important and shouldn't be changed.

@bartekpacia
Copy link
Member

I'm not in the loop but be aware of #141400

@gmackall
Copy link
Member Author

gmackall commented Feb 7, 2024

I'm not in the loop but be aware of #141400

Thanks for the heads up! Tested with both ids and we are able to get the version in both cases

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 8, 2024
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 8, 2024
auto-submit bot pushed a commit to flutter/packages that referenced this pull request Feb 8, 2024
Roll Flutter from 8431cae to eb5d0a4 (33 revisions)

flutter/flutter@8431cae...eb5d0a4

2024-02-08 [email protected] Roll Packages from e4ea6bf to 29d8cc0 (5 revisions) (flutter/flutter#143161)
2024-02-08 [email protected] Roll Flutter Engine from 6d524588c0f9 to f53fbd8393ce (1 revision) (flutter/flutter#143160)
2024-02-08 [email protected] Roll Flutter Engine from 22e1241e9823 to 6d524588c0f9 (3 revisions) (flutter/flutter#143147)
2024-02-08 [email protected] Roll Flutter Engine from 084bd0b8f5ac to 22e1241e9823 (1 revision) (flutter/flutter#143140)
2024-02-08 [email protected] Roll Flutter Engine from 104804aa374e to 084bd0b8f5ac (1 revision) (flutter/flutter#143139)
2024-02-08 [email protected] Roll Flutter Engine from 45137ea6ba29 to 104804aa374e (1 revision) (flutter/flutter#143138)
2024-02-08 [email protected] Pass along web renderer into debugging options in the test command. (flutter/flutter#143128)
2024-02-08 [email protected] Roll Flutter Engine from 4ea7bd07328b to 45137ea6ba29 (2 revisions) (flutter/flutter#143135)
2024-02-08 [email protected] Roll Flutter Engine from 322a461dc74f to 4ea7bd07328b (2 revisions) (flutter/flutter#143131)
2024-02-07 [email protected] Add a unit test for `NavigationRail` (flutter/flutter#143108)
2024-02-07 [email protected] Roll Flutter Engine from b1ba9f329f76 to 322a461dc74f (2 revisions) (flutter/flutter#143123)
2024-02-07 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Improve build output for all platforms" (flutter/flutter#143125)
2024-02-07 [email protected] Roll Flutter Engine from e4a5acc14b44 to b1ba9f329f76 (2 revisions) (flutter/flutter#143120)
2024-02-07 [email protected] Improve build output for all platforms (flutter/flutter#128236)
2024-02-07 [email protected] Roll Flutter Engine from 19ae46afed69 to e4a5acc14b44 (7 revisions) (flutter/flutter#143112)
2024-02-07 [email protected] Fixed cursor blinking during selection. (flutter/flutter#141380)
2024-02-07 [email protected] Remove Cirrus check for web test concurrency (flutter/flutter#143046)
2024-02-07 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Enforce a policy on supported Gradle, Java, AGP, and KGP versions" (flutter/flutter#143114)
2024-02-07 [email protected] Enforce a policy on supported Gradle, Java, AGP, and KGP versions (flutter/flutter#142000)
2024-02-07 [email protected] Fix inputs and outputs for `WebReleaseBundle` (flutter/flutter#143023)
2024-02-07 [email protected] Various improvements to text-editing-related documentation. (flutter/flutter#142561)
2024-02-07 [email protected] Revert "Add `SingleChildScrollView` for `NavigationRail`" (flutter/flutter#143097)
2024-02-07 [email protected] Restore log dumps for gradle OOM crashes, and set a value for `MaxMetaspaceSize` (flutter/flutter#143085)
2024-02-07 [email protected] Move Mac_build_test flutter_gallery__transition_perf_e2e_ios out of staging (flutter/flutter#142987)
2024-02-07 [email protected] Roll Flutter Engine from fafd8e55eb4b to 19ae46afed69 (1 revision) (flutter/flutter#143094)
2024-02-07 [email protected] Add a test for the isAvailableForEnvironment logic (flutter/flutter#142251)
2024-02-07 [email protected] Add the number of mismatched pixels to golden tests output (flutter/flutter#142975)
2024-02-07 [email protected] Add indexInParent to SemanticsNode debug information (flutter/flutter#142826)
2024-02-07 [email protected] Remove unused devicelab task gradle_non_android_plugin_test (flutter/flutter#142742)
2024-02-07 [email protected] Make generate_gradle_lockfiles also write the gradle wrapper file (flutter/flutter#142329)
2024-02-07 [email protected] Roll Flutter Engine from 6807342305e4 to fafd8e55eb4b (1 revision) (flutter/flutter#143086)
2024-02-07 [email protected] Remove redundant `rootDirectoryPath` parameter in `DevFS::update` (flutter/flutter#143034)
2024-02-07 [email protected] Handle transitions to AppLifecycleState.detached in lifecycle state generation (flutter/flutter#142523)

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 [email protected],[email protected],[email protected] on the revert to ensure that a human
is aware of the problem.

To file a bug in Packages: 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:
...
auto-submit bot pushed a commit that referenced this pull request Feb 8, 2024
…rsions (#143132)

Re land of #142000. 
Differences:
1. Fixed the test that was failing in postsubmit. The reason was that the Flutter Gradle Plugin was being applied after KGP in that test, so we couldn't find the KGP version. This caused a log, and the test expects no logs. I moved FGP to after KGP
2. Added to the logs for when we can't find AGP. Change is from
>  "Warning: unable to detect project AGP version. Skipping version checking."

to 
> ~"Warning: unable to detect project AGP version. Skipping version checking. \nThis may be because you have applied the Flutter Gradle Plugin after AGP."~

update: the above is wrong, changed to 
> "Warning: unable to detect project KGP version. Skipping version checking. \nThis may be because you have applied AGP after the Flutter Gradle Plugin."

3. Added a note to the app-level build.gradle templates that FGP must go last
> // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugin.
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 14, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

autosubmit Merge PR when tree becomes green via auto submit App tool Affects the "flutter" command-line tool. See also t: labels.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants