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

Bump mockito-android from 3.4.6 to 3.5.10 #6768

Merged

Conversation

dependabot-preview[bot]
Copy link
Contributor

@dependabot-preview dependabot-preview bot commented Aug 21, 2020

Bumps mockito-android from 3.4.6 to 3.5.3.

Release notes

Sourced from mockito-android's releases.

v3.5.2

Release notes were automatically generated by Shipkit

3.5.2

v3.5.1

Release notes were automatically generated by Shipkit

3.5.1

v3.5.0

Release notes were automatically generated by Shipkit

3.5.0

v3.4.8

Release notes were automatically generated by Shipkit

3.4.8

v3.4.7

Release notes were automatically generated by Shipkit

3.4.7

Commits
  • 5cb5a66 3.5.3 release (previous 3.5.2) + release notes updated by CI build 4723
  • 7d47fad [ci maven-central-release] Merge pull request #2013 from mockito/constructor...
  • 7e942c4 Attempts to fix stack overflow error.
  • 7ee8518 Fixes #2012: Uses constructor for mock instantiation if explicitly configured.
  • 31bdc24 3.5.2 release (previous 3.5.1) + release notes updated by CI build 4717
  • dd5f2c1 Publish to Maven Central
  • 2dd7ea1 3.5.1 release (previous 3.5.0) + release notes updated by CI build 4715
  • f41ec63 Merge pull request #2006 from mockito/introduce-animal-sniffer
  • ec659f4 Do not use invoke/invokeExact directly but from generated code to avoid break...
  • d42221c Add signature checks to assure Android and Java 8 compatibility. Exclude clas...
  • Additional commits viewable in compare view

Dependabot compatibility score

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.

Dependabot will merge this PR once CI passes on it, as requested by @tobiasKaminsky.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
  • @dependabot use these labels will set the current labels as the default for future PRs for this repo and language
  • @dependabot use these reviewers will set the current reviewers as the default for future PRs for this repo and language
  • @dependabot use these assignees will set the current assignees as the default for future PRs for this repo and language
  • @dependabot use this milestone will set the current milestone as the default for future PRs for this repo and language
  • @dependabot badge me will comment on this PR with code to add a "Dependabot enabled" badge to your readme

Additionally, you can set the following in your Dependabot dashboard:

  • Update frequency (including time of day and day of week)
  • Pull request limits (per update run and/or open at any time)
  • Automerge options (never/patch/minor, and dev/runtime dependencies)
  • Out-of-range updates (receive only lockfile updates, if desired)
  • Security updates (receive only security updates, if desired)

@dependabot-preview dependabot-preview bot added 3. to review dependencies Pull requests that update a dependency file labels Aug 21, 2020
@tobiasKaminsky
Copy link
Member

Let us wait for mockito/mockito#2014

@dependabot-preview
Copy link
Contributor Author

A newer version of org.mockito:mockito-android exists, but since this PR has been edited by someone other than Dependabot I haven't updated it. You'll get a PR for the updated version as normal once this PR is merged.

@tobiasKaminsky tobiasKaminsky force-pushed the dependabot/gradle/org.mockito-mockito-android-3.5.3 branch from 44a5bb4 to d4337fb Compare August 24, 2020 06:40
@tobiasKaminsky tobiasKaminsky changed the title Bump mockito-android from 3.4.6 to 3.5.3 Bump mockito-android from 3.4.6 to 3.5.5 Aug 24, 2020
@dependabot-preview
Copy link
Contributor Author

One of your CI runs failed on this pull request, so Dependabot won't merge it.

Dependabot will still automatically merge this pull request if you amend it and your tests pass.

@tobiasKaminsky tobiasKaminsky force-pushed the dependabot/gradle/org.mockito-mockito-android-3.5.3 branch 2 times, most recently from db61896 to 85b019d Compare August 27, 2020 13:08
@tobiasKaminsky tobiasKaminsky force-pushed the dependabot/gradle/org.mockito-mockito-android-3.5.3 branch from 85b019d to b96801a Compare August 28, 2020 10:05
@tobiasKaminsky
Copy link
Member

Problem is: mockito/mockito#2007

@tobiasKaminsky tobiasKaminsky force-pushed the dependabot/gradle/org.mockito-mockito-android-3.5.3 branch from b96801a to 0cb3cee Compare September 2, 2020 06:07
@tobiasKaminsky tobiasKaminsky changed the title Bump mockito-android from 3.4.6 to 3.5.5 Bump mockito-android from 3.4.6 to 3.5.10 Sep 4, 2020
@tobiasKaminsky tobiasKaminsky force-pushed the dependabot/gradle/org.mockito-mockito-android-3.5.3 branch from 0cb3cee to d1ea95a Compare September 4, 2020 05:51
dependabot-preview bot and others added 2 commits September 9, 2020 12:12
Bumps [mockito-android](https://github.com/mockito/mockito) from 3.4.6 to 3.5.3.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](mockito/mockito@v3.4.6...v3.5.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
@tobiasKaminsky tobiasKaminsky force-pushed the dependabot/gradle/org.mockito-mockito-android-3.5.3 branch from d1ea95a to 8c77b98 Compare September 9, 2020 10:15
@nextcloud-android-bot
Copy link
Collaborator

APK file: https://www.kaminsky.me/nc-dev/android-artifacts/15762.apk

qrcode

To test this change/fix you can simply download above APK file and install and test it in parallel to your existing Nextcloud app.

@nextcloud-android-bot
Copy link
Collaborator

master-Unit test failed, but no output was generated. Maybe a preliminary stage failed.

@nextcloud-android-bot
Copy link
Collaborator

stable-Unit test failed, but no output was generated. Maybe a preliminary stage failed.

@nextcloud-android-bot
Copy link
Collaborator

Codacy

394

Lint

TypemasterPR
Warnings8181
Errors00

SpotBugs (new)

Warning TypeNumber
Bad practice Warnings27
Correctness Warnings54
Internationalization Warnings9
Multithreaded correctness Warnings9
Performance Warnings72
Security Warnings44
Dodgy code Warnings105
Total320

SpotBugs (master)

Warning TypeNumber
Bad practice Warnings27
Correctness Warnings54
Internationalization Warnings9
Multithreaded correctness Warnings9
Performance Warnings72
Security Warnings44
Dodgy code Warnings105
Total320

@codecov
Copy link

codecov bot commented Sep 9, 2020

Codecov Report

Merging #6768 into master will decrease coverage by 1.51%.
The diff coverage is n/a.

@@             Coverage Diff              @@
##             master    #6768      +/-   ##
============================================
- Coverage     28.58%   27.07%   -1.52%     
- Complexity        5     2316    +2311     
============================================
  Files           427      425       -2     
  Lines         34200    34178      -22     
  Branches       4729     4729              
============================================
- Hits           9776     9253     -523     
- Misses        22959    23472     +513     
+ Partials       1465     1453      -12     
Impacted Files Coverage Δ Complexity Δ
...main/java/com/nextcloud/client/etm/EtmMenuEntry.kt 0.00% <0.00%> (-100.00%) 0.00% <0.00%> (ø%)
...va/com/owncloud/android/utils/OwnCloudSession.java 0.00% <0.00%> (-100.00%) 0.00% <0.00%> (ø%)
...i/activities/data/files/RemoteFilesRepository.java 0.00% <0.00%> (-100.00%) 0.00% <0.00%> (ø%)
...es/data/activities/RemoteActivitiesRepository.java 0.00% <0.00%> (-100.00%) 0.00% <0.00%> (ø%)
...a/com/nextcloud/client/media/PlayerStateMachine.kt 0.00% <0.00%> (-95.39%) 0.00% <0.00%> (ø%)
...java/com/nextcloud/client/logger/ui/AsyncFilter.kt 0.00% <0.00%> (-94.12%) 0.00% <0.00%> (ø%)
...om/owncloud/android/datamodel/MediaFolderType.java 0.00% <0.00%> (-92.86%) 0.00% <0.00%> (ø%)
...n/java/com/owncloud/android/utils/StringUtils.java 0.00% <0.00%> (-88.89%) 0.00% <0.00%> (ø%)
...oud/android/ui/activities/ActivitiesPresenter.java 0.00% <0.00%> (-80.65%) 0.00% <0.00%> (ø%)
...main/java/com/nextcloud/client/media/AudioFocus.kt 0.00% <0.00%> (-80.00%) 0.00% <0.00%> (ø%)
... and 45 more

@tobiasKaminsky tobiasKaminsky merged commit 68efb59 into master Sep 9, 2020
@delete-merged-branch delete-merged-branch bot deleted the dependabot/gradle/org.mockito-mockito-android-3.5.3 branch September 9, 2020 10:53
@AndyScherzinger AndyScherzinger added this to the Nextcloud App 3.14.0 milestone Sep 9, 2020
thelittlefireman pushed a commit to thelittlefireman/android that referenced this pull request Mar 19, 2021
…g.mockito-mockito-android-3.5.3

Bump mockito-android from 3.4.6 to 3.5.10
Signed-off-by: thelittlefireman <thelittlefireman@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review dependencies Pull requests that update a dependency file
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants