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

[many] Remove dependency on kotlin-bom #7088

Merged
merged 17 commits into from
Aug 21, 2024

Conversation

gmackall
Copy link
Member

@gmackall gmackall commented Jul 9, 2024

This dependency seems to no longer be necessary. I expected this would be because the the androidx upgrade that landed recently fixed the problem (see theory), but it seems that the packages even build on stable successfully. Perhaps there have been updates to the underlying androidx libraries themselves that fix the conflict, and we updated the versions in plugins far enough? I'm unsure.

Updated for 3.24 release.

In a sense, fixes flutter/flutter#125062

Pre-launch Checklist

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

@gmackall
Copy link
Member Author

gmackall commented Jul 9, 2024

Expecting tests to fail on stable, will need to wait until stable contains flutter/engine#53592, aka contains flutter/flutter#150952. This should be 3.24. The tests seem to pass on stable as well?

Tested that the example app for each modified package builds on master still.

@flutter-dashboard
Copy link

It looks like this pull request may not have tests. Please make sure to add tests before merging. If you need an exemption to this rule, contact "@test-exemption-reviewer" in the #hackers channel in Chat (don't just cc them here, they won't see it! Use Discord!).

If you are not sure if you need tests, consider this rule of thumb: the purpose of a test is to make sure someone doesn't accidentally revert the fix. Ask yourself, is there anything in your PR that you feel it is important we not accidentally revert back to how it was before your fix?

Reviewers: Read the Tree Hygiene page and make sure this patch meets those guidelines before LGTMing.

@gmackall gmackall removed the waiting for stable update Can't be landed until functionality reaches the stable channel label Jul 9, 2024
@stuartmorgan
Copy link
Contributor

test-exempt: configuration change

Copy link
Contributor

@camsim99 camsim99 left a comment

Choose a reason for hiding this comment

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

Woohoo!

@stuartmorgan
Copy link
Contributor

stuartmorgan commented Jul 9, 2024

#3960 suggests that we weren't catching this problem in CI. Given that, are we confident that we would catch it now (i.e., that the green result here is actually telling us what we need to know)? Can we try manually re-creating (on stable) some things like what's described in that PR description?

@gmackall
Copy link
Member Author

gmackall commented Jul 9, 2024

#3960 suggests that we weren't catching this problem in CI. Given that, are we confident that we would catch it now (i.e., that the green result here is actually telling us what we need to know)? Can we try manually re-creating (on stable) some things like what's described in that PR description?

This is a good question, I'll try with a workflow similar to what I described in that PR for all the affected packages on stable.

If I had to guess why we didn't catch this in ci for camerax (and it really is a guess) it would be that the all_packages app maybe already had the workaround included in one of the packages, which fixed it for the app, and perhaps the camerax example was also depending on a plugin that had the fix (but only the example, not the plugin itself). Anyways I'll double check all the plugins.

@gmackall
Copy link
Member Author

gmackall commented Jul 9, 2024

Hmm okay, yeah the workflow described in the PR:

  1. flutter create sample
  2. Add a dependency on the locally changed plugin to the pubspec
  3. flutter build apk

Fails on stable, while succeeding on master. So this will indeed have to wait for the next stable. I'll also try to figure out why the all_packages/example apps aren't catching this in the meantime - I don't know why they wouldn't, but it's clear they aren't.

@gmackall gmackall marked this pull request as draft July 9, 2024 23:36
@gmackall gmackall added the waiting for stable update Can't be landed until functionality reaches the stable channel label Jul 9, 2024
Copy link
Contributor

@reidbaker reidbaker left a comment

Choose a reason for hiding this comment

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

approve % next stable being set at the minimum

@github-actions github-actions bot added the p: interactive_media_ads Plugin for IMA SDK label Aug 20, 2024
@gmackall gmackall marked this pull request as ready for review August 20, 2024 21:40
@gmackall gmackall removed the waiting for stable update Can't be landed until functionality reaches the stable channel label Aug 20, 2024
@gmackall
Copy link
Member Author

This should be ready for review again for any remaining reviewers that want to take a look.

@flutter-dashboard
Copy link

It looks like this pull request may not have tests. Please make sure to add tests before merging. If you need an exemption, contact "@test-exemption-reviewer" in the #hackers channel in Discord (don't just cc them here, they won't see it!).

If you are not sure if you need tests, consider this rule of thumb: the purpose of a test is to make sure someone doesn't accidentally revert the fix. Ask yourself, is there anything in your PR that you feel it is important we not accidentally revert back to how it was before your fix?

Reviewers: Read the Tree Hygiene page and make sure this patch meets those guidelines before LGTMing. The test exemption team is a small volunteer group, so all reviewers should feel empowered to ask for tests, without delegating that responsibility entirely to the test exemption group.

Copy link
Contributor

@stuartmorgan stuartmorgan left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Contributor

@bparrishMines bparrishMines left a comment

Choose a reason for hiding this comment

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

LGTM

@gmackall gmackall added the autosubmit Merge PR when tree becomes green via auto submit App label Aug 21, 2024
@auto-submit auto-submit bot merged commit c5d03ee into flutter:main Aug 21, 2024
76 checks passed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Aug 21, 2024
auto-submit bot pushed a commit to flutter/flutter that referenced this pull request Aug 21, 2024
flutter/packages@4e5d47e...c5d03ee

2024-08-21 [email protected] [many] Remove dependency on `kotlin-bom` (flutter/packages#7088)
2024-08-21 [email protected] Remove unnecessary breaks in default clauses of switch statements (flutter/packages#7462)

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-flutter-autoroll
Please CC [email protected],[email protected] 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
Buchimi pushed a commit to Buchimi/flutter that referenced this pull request Sep 2, 2024
flutter/packages@4e5d47e...c5d03ee

2024-08-21 [email protected] [many] Remove dependency on `kotlin-bom` (flutter/packages#7088)
2024-08-21 [email protected] Remove unnecessary breaks in default clauses of switch statements (flutter/packages#7462)

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-flutter-autoroll
Please CC [email protected],[email protected] 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
@reidbaker
Copy link
Contributor

@stuartmorgan
Copy link
Contributor

#7997 has some follow-up analysis on that failure.

@reidbaker
Copy link
Contributor

#7986 Updated the annotation version
The commits added in that patch version are listed here
https://android.googlesource.com/platform/frameworks/support/+log/2e6556166965445a8a129114765a3903c063735c..87b88ad088cc9b18d4ab75611fc8b74e8b01c24a/annotation
"Bump Kotlin Target of annotation, collection, and compose to 1.9"

FWIW flutter fix said to update the kotlin version to 1.9.

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.

[packages] Many androidx.* dependabot upgrades are failing due to same "duplicate class" exception
6 participants