Sitelet https://github.com/flutter/flutter/pull/167573
Skip to content

[Android 16] Update mockito to 5.17.0 from 4.7.0, prework for android 36 support - #167573

Merged
auto-submit[bot] merged 3 commits into
flutter:masterfrom
reidbaker:i_166796_update_mockito_pre_36_work
Apr 22, 2025
Merged

[Android 16] Update mockito to 5.17.0 from 4.7.0, prework for android 36 support#167573
auto-submit[bot] merged 3 commits into
flutter:masterfrom
reidbaker:i_166796_update_mockito_pre_36_work

Conversation

@reidbaker

@reidbaker reidbaker commented Apr 22, 2025 •
edited
Loading

Copy link
Copy Markdown
Contributor

This updates all the dependencies in engine/src/flutter/shell/platform/android/test_runner/build.gradle and ignores the play store deprecration so I could get android studio to give me other lint help.

This work is required to unblock @jesswrd's work to update the engine to use android 36.
Deleted mockito-inline because it is automatically used after 5.2.0 according to Maven docs: https://mvnrepository.com/artifact/org.mockito/mockito-inline/5.2.0"

  • Remove config none annotations that have been deprecrated since roboletrics 4.0.1
  • Update all dependencies used in test runner, passes for spellcheckplugintest

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].
  • I followed the [breaking change policy] and added [Data Driven Fixes] where supported.
  • All existing and new tests are passing.

@reidbaker
reidbaker requested a review from gmackall April 22, 2025 16:25
@github-actions github-actions Bot added platform-android Android applications specifically engine flutter/engine related. See also e: labels. labels Apr 22, 2025
@reidbaker
reidbaker requested a review from jesswrd April 22, 2025 16:25
jesswrd
jesswrd approved these changes Apr 22, 2025
View reviewed changes

@jesswrd jesswrd left a comment •
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Can you add this to be the PR description: "Deleted mockito-inline because it is automatically used after 5.2.0 according to Maven docs: https://mvnrepository.com/artifact/org.mockito/mockito-inline/5.2.0"

@reidbaker

reidbaker commented Apr 22, 2025

Copy link
Copy Markdown
Contributor Author

Can you add this to be the PR description: "Deleted mockito-inline because it is automatically used after 5.2.0 according to Maven docs: https://mvnrepository.com/artifact/org.mockito/mockito-inline/5.2.0"

done

gmackall
gmackall approved these changes Apr 22, 2025
View reviewed changes

@gmackall gmackall left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM - was this config doing anything? Or were we just being explicit about not using a manifest, and now it is implicit?

@reidbaker

reidbaker commented Apr 22, 2025

Copy link
Copy Markdown
Contributor Author

LGTM - was this config doing anything? Or were we just being explicit about not using a manifest, and now it is implicit?

Best I can tell Config.NONE did nothing and the manifest attribute has been deprecated since 2018 and we had no instances of a configured manifest to migrate.

@jesswrd jesswrd changed the title Update mockito to 5.17 from 4.7, prework for android 36 support Update mockito to 5.17.0 from 4.7.0, prework for android 36 support Apr 22, 2025
@reidbaker reidbaker added the autosubmit Merge PR when tree becomes green via auto submit App label Apr 22, 2025
@auto-submit

auto-submit Bot commented Apr 22, 2025

Copy link
Copy Markdown
Contributor

autosubmit label was removed for flutter/flutter/167573, because - The status or check suite Google testing has failed. Please fix the issues identified (or deflake) before re-applying this label.

@auto-submit auto-submit Bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Apr 22, 2025
@reidbaker reidbaker added the autosubmit Merge PR when tree becomes green via auto submit App label Apr 22, 2025
@auto-submit
auto-submit Bot added this pull request to the merge queue Apr 22, 2025
Merged via the queue into flutter:master with commit cb3fd95 Apr 22, 2025
@flutter-dashboard flutter-dashboard Bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Apr 22, 2025
@reidbaker
reidbaker deleted the i_166796_update_mockito_pre_36_work branch April 22, 2025 20:45
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Apr 23, 2025
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 23, 2025
@engine-flutter-autoroll
cb3fd95 Update mockito to 5.17.0 from 4.7.0, prework for android 36 s…
4aa4db4 
…upport (flutter/flutter#167573)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 23, 2025
@engine-flutter-autoroll
cb3fd95 Update mockito to 5.17.0 from 4.7.0, prework for android 36 s…
1154bb5 
…upport (flutter/flutter#167573)
This was referenced Apr 23, 2025
Closed
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 23, 2025
@engine-flutter-autoroll
cb3fd95 Update mockito to 5.17.0 from 4.7.0, prework for android 36 s…
5dc0ebe 
…upport (flutter/flutter#167573)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Apr 23, 2025
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 23, 2025
@engine-flutter-autoroll
cb3fd95 Update mockito to 5.17.0 from 4.7.0, prework for android 36 s…
23320c1 
…upport (flutter/flutter#167573)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Apr 23, 2025
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 28, 2025
@engine-flutter-autoroll
cb3fd95 Update mockito to 5.17.0 from 4.7.0, prework for android 36 s…
ab5fa54 
…upport (flutter/flutter#167573)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 28, 2025
@engine-flutter-autoroll
cb3fd95 Update mockito to 5.17.0 from 4.7.0, prework for android 36 s…
99ca4a7 
…upport (flutter/flutter#167573)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 28, 2025
@engine-flutter-autoroll
cb3fd95 Update mockito to 5.17.0 from 4.7.0, prework for android 36 s…
aed9b10 
…upport (flutter/flutter#167573)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 29, 2025
@engine-flutter-autoroll
cb3fd95 Update mockito to 5.17.0 from 4.7.0, prework for android 36 s…
907011a 
…upport (flutter/flutter#167573)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 29, 2025
@engine-flutter-autoroll
cb3fd95 Update mockito to 5.17.0 from 4.7.0, prework for android 36 s…
546de0f 
…upport (flutter/flutter#167573)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 29, 2025
@engine-flutter-autoroll
cb3fd95 Update mockito to 5.17.0 from 4.7.0, prework for android 36 s…
658ba06 
…upport (flutter/flutter#167573)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 30, 2025
@engine-flutter-autoroll
cb3fd95 Update mockito to 5.17.0 from 4.7.0, prework for android 36 s…
f5c4953 
…upport (flutter/flutter#167573)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 30, 2025
@engine-flutter-autoroll
cb3fd95 Update mockito to 5.17.0 from 4.7.0, prework for android 36 s…
338e67d 
…upport (flutter/flutter#167573)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 1, 2025
@engine-flutter-autoroll
cb3fd95 Update mockito to 5.17.0 from 4.7.0, prework for android 36 s…
50a78f0 
…upport (flutter/flutter#167573)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 1, 2025
@engine-flutter-autoroll
cb3fd95 Update mockito to 5.17.0 from 4.7.0, prework for android 36 s…
c53c11b 
…upport (flutter/flutter#167573)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 1, 2025
@engine-flutter-autoroll
cb3fd95 Update mockito to 5.17.0 from 4.7.0, prework for android 36 s…
74fc6d5 
…upport (flutter/flutter#167573)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 1, 2025
@engine-flutter-autoroll
cb3fd95 Update mockito to 5.17.0 from 4.7.0, prework for android 36 s…
a0dbdc4 
…upport (flutter/flutter#167573)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 1, 2025
@engine-flutter-autoroll
cb3fd95 Update mockito to 5.17.0 from 4.7.0, prework for android 36 s…
3928454 
…upport (flutter/flutter#167573)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 1, 2025
@engine-flutter-autoroll
cb3fd95 Update mockito to 5.17.0 from 4.7.0, prework for android 36 s…
ce9ea6f 
…upport (flutter/flutter#167573)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 1, 2025
@engine-flutter-autoroll
cb3fd95 Update mockito to 5.17.0 from 4.7.0, prework for android 36 s…
3d7b35f 
…upport (flutter/flutter#167573)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 2, 2025
@engine-flutter-autoroll
cb3fd95 Update mockito to 5.17.0 from 4.7.0, prework for android 36 s…
72f0845 
…upport (flutter/flutter#167573)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 2, 2025
@engine-flutter-autoroll
cb3fd95 Update mockito to 5.17.0 from 4.7.0, prework for android 36 s…
3af43f2 
…upport (flutter/flutter#167573)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 2, 2025
@engine-flutter-autoroll
cb3fd95 Update mockito to 5.17.0 from 4.7.0, prework for android 36 s…
075ff1f 
…upport (flutter/flutter#167573)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 2, 2025
@engine-flutter-autoroll
cb3fd95 Update mockito to 5.17.0 from 4.7.0, prework for android 36 s…
e269018 
…upport (flutter/flutter#167573)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 2, 2025
@engine-flutter-autoroll
cb3fd95 Update mockito to 5.17.0 from 4.7.0, prework for android 36 s…
3349bda 
…upport (flutter/flutter#167573)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 3, 2025
@engine-flutter-autoroll
cb3fd95 Update mockito to 5.17.0 from 4.7.0, prework for android 36 s…
cce37e5 
…upport (flutter/flutter#167573)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 3, 2025
@engine-flutter-autoroll
cb3fd95 Update mockito to 5.17.0 from 4.7.0, prework for android 36 s…
c37dc63 
…upport (flutter/flutter#167573)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 4, 2025
@engine-flutter-autoroll
cb3fd95 Update mockito to 5.17.0 from 4.7.0, prework for android 36 s…
0e8c60a 
…upport (flutter/flutter#167573)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 5, 2025
@engine-flutter-autoroll
cb3fd95 Update mockito to 5.17.0 from 4.7.0, prework for android 36 s…
a75d083 
…upport (flutter/flutter#167573)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 5, 2025
@engine-flutter-autoroll
cb3fd95 Update mockito to 5.17.0 from 4.7.0, prework for android 36 s…
83564a6 
…upport (flutter/flutter#167573)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 5, 2025
@engine-flutter-autoroll
cb3fd95 Update mockito to 5.17.0 from 4.7.0, prework for android 36 s…
95a650c 
…upport (flutter/flutter#167573)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 5, 2025
@engine-flutter-autoroll
cb3fd95 Update mockito to 5.17.0 from 4.7.0, prework for android 36 s…
5a58563 
…upport (flutter/flutter#167573)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 5, 2025
@engine-flutter-autoroll
cb3fd95 Update mockito to 5.17.0 from 4.7.0, prework for android 36 s…
2bdcc1b 
…upport (flutter/flutter#167573)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 5, 2025
@engine-flutter-autoroll
cb3fd95 Update mockito to 5.17.0 from 4.7.0, prework for android 36 s…
c86b261 
…upport (flutter/flutter#167573)
@jesswrd jesswrd mentioned this pull request Jun 10, 2025
Closed
24 of 25 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@gmackall gmackall gmackall approved these changes
@jesswrd jesswrd jesswrd approved these changes

Assignees

No one assigned

Labels

engine flutter/engine related. See also e: labels. platform-android Android applications specifically

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@reidbaker @gmackall @jesswrd