Skip to content

[image_picker] Upgrade androidx.activity to 1.7.0 and add a dependency on kotlin-bom to align kotlin transitive dependencies #3968

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 3 commits into from
May 17, 2023
Merged

[image_picker] Upgrade androidx.activity to 1.7.0 and add a dependency on kotlin-bom to align kotlin transitive dependencies #3968

merged 3 commits into from
May 17, 2023

Conversation

gmackall
Copy link
Member

@gmackall gmackall commented May 11, 2023 •
edited
Loading

Taking over #3536
bumps androidx.activity:activity to 1.7.0
Adds a workaround to fix duplicate class failures described here flutter/flutter#125062.

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 relevant style guides and ran the auto-formatter. (Unlike the flutter/flutter repo, the flutter/packages repo does use dart format.)
  • I signed the CLA.
  • The title of the PR starts with the name of the package surrounded by square brackets, e.g. [shared_preferences]
  • I listed at least one issue that this PR fixes in the description above.
  • I updated pubspec.yaml with an appropriate new version according to the pub versioning philosophy, or this PR is exempt from version changes.
  • I updated CHANGELOG.md to add a description of the change, following repository CHANGELOG style.
  • 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.

@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 Hixie on the #hackers channel in Chat (don't just cc him here, he won't see it! He's on 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 mentioned this pull request May 11, 2023
Closed
11 tasks
@tarrinneal tarrinneal requested a review from stuartmorgan-g May 11, 2023 18:05
tarrinneal
tarrinneal approved these changes May 11, 2023
View reviewed changes
packages/image_picker/image_picker_android/android/build.gradle
implementation 'androidx.activity:activity:1.7.0'
// org.jetbrains.kotlin:kotlin-bom artifact purpose is to align kotlin stdlib and related code versions.
// See: https://youtrack.jetbrains.com/issue/KT-55297/kotlin-stdlib-should-declare-constraints-on-kotlin-stdlib-jdk8-and-kotlin-stdlib-jdk7
implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.10"))
Copy link
Contributor

Choose a reason for hiding this comment

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

if this is meant to be temporary, can you add a TODO here?

Copy link
Member Author

Choose a reason for hiding this comment

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

This fix is in a couple of places at this point, so I'll add discussion about when this can be removed to the tracking issue
flutter/flutter#125062

@stuartmorgan-g
Copy link
Contributor

@gmackall Looks like this just needs a merge and will be good to land.

@gmackall gmackall added the autosubmit Merge PR when tree becomes green via auto submit App label May 16, 2023
@auto-submit auto-submit bot merged commit a6532f9 into flutter:main May 17, 2023
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request May 18, 2023
Merged
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request May 18, 2023
@engine-flutter-autoroll
a6532f9 [image_picker] Upgrade androidx.activity to 1.7.0 and add a d…
af0a5ab 
…ependency on kotlin-bom to align kotlin transitive dependencies (flutter/packages#3968)
auto-submit bot pushed a commit to flutter/flutter that referenced this pull request May 18, 2023
@engine-flutter-autoroll
Roll Packages from 5c69914 to b31a128 (9 revisions) (#127109)
5381e82 
flutter/packages@5c69914...b31a128

2023-05-18 [email protected] [flutter_plugin_android_lifecycle] Fix lints (flutter/packages#4030)
2023-05-18 [email protected] [rfw] Fix a typo in the API documentation (flutter/packages#4023)
2023-05-18 [email protected] [ci] Manual flutter roll (flutter/packages#4033)
2023-05-17 [email protected] [flutter_adaptive_scaffold] exchange BottomNavigationBar with NavigationBar (flutter/packages#3746)
2023-05-17 [email protected] [tools] Ignore comments in federated safety check (flutter/packages#4028)
2023-05-17 [email protected] Revert "[url_launcher] Set broadcast reciever visability as required by target api 34" (flutter/packages#4027)
2023-05-17 [email protected] [camera] Fix Java lints in camerax version (flutter/packages#3966)
2023-05-17 [email protected] [image_picker] Upgrade androidx.activity to 1.7.0 and add a dependency on kotlin-bom to align kotlin transitive dependencies (flutter/packages#3968)
2023-05-17 49699333+dependabot[bot]@users.noreply.github.com [espresso]: Bump com.squareup.okhttp3:okhttp from 4.10.0 to 4.11.0 in /packages/espresso/android (flutter/packages#3804)

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://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
CaseyHillers pushed a commit to CaseyHillers/flutter that referenced this pull request May 24, 2023
@engine-flutter-autoroll
Roll Packages from 5c69914 to b31a128 (9 revisions) (flutter#127109)
abf1bad 
flutter/packages@5c69914...b31a128

2023-05-18 [email protected] [flutter_plugin_android_lifecycle] Fix lints (flutter/packages#4030)
2023-05-18 [email protected] [rfw] Fix a typo in the API documentation (flutter/packages#4023)
2023-05-18 [email protected] [ci] Manual flutter roll (flutter/packages#4033)
2023-05-17 [email protected] [flutter_adaptive_scaffold] exchange BottomNavigationBar with NavigationBar (flutter/packages#3746)
2023-05-17 [email protected] [tools] Ignore comments in federated safety check (flutter/packages#4028)
2023-05-17 [email protected] Revert "[url_launcher] Set broadcast reciever visability as required by target api 34" (flutter/packages#4027)
2023-05-17 [email protected] [camera] Fix Java lints in camerax version (flutter/packages#3966)
2023-05-17 [email protected] [image_picker] Upgrade androidx.activity to 1.7.0 and add a dependency on kotlin-bom to align kotlin transitive dependencies (flutter/packages#3968)
2023-05-17 49699333+dependabot[bot]@users.noreply.github.com [espresso]: Bump com.squareup.okhttp3:okhttp from 4.10.0 to 4.11.0 in /packages/espresso/android (flutter/packages#3804)

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://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
This was referenced Jul 7, 2023
Merged
Closed
Merged
nploi pushed a commit to nploi/packages that referenced this pull request Jul 16, 2023
@gmackall @nploi
[image_picker] Upgrade androidx.activity to 1.7.0 and add a dependenc…
7a24238 
…y on kotlin-bom to align kotlin transitive dependencies (flutter#3968)

Taking over flutter#3536
bumps androidx.activity:activity to 1.7.0
Adds a workaround to fix duplicate class failures described here flutter/flutter#125062.
@reidbaker reidbaker mentioned this pull request Jul 26, 2023
Merged
11 tasks
@reidbaker reidbaker mentioned this pull request Aug 4, 2023
Merged
11 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@camsim99 camsim99 camsim99 approved these changes

@tarrinneal tarrinneal tarrinneal approved these changes

@reidbaker reidbaker Awaiting requested review from reidbaker

@stuartmorgan-g stuartmorgan-g Awaiting requested review from stuartmorgan-g

Assignees
No one assigned
Labels
autosubmit Merge PR when tree becomes green via auto submit App needs tests p: image_picker platform-android
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@gmackall @stuartmorgan-g @camsim99 @tarrinneal