Skip to content

Conversation

@scordio
Copy link
Contributor

@scordio scordio commented Jan 7, 2024

Second step for fixing #3212, related to #3212 (comment).

@scordio scordio marked this pull request as draft January 7, 2024 22:26
@codecov-commenter
Copy link

codecov-commenter commented Jan 7, 2024

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 85.29%. Comparing base (53189fa) to head (42b94fd).
⚠️ Report is 265 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff            @@
##               main    #3226   +/-   ##
=========================================
  Coverage     85.29%   85.29%           
  Complexity     2913     2913           
=========================================
  Files           334      334           
  Lines          8884     8884           
  Branches       1103     1103           
=========================================
  Hits           7578     7578           
  Misses         1014     1014           
  Partials        292      292           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@TimvdLippe
Copy link
Contributor

The build appears to fail on androidTest. We don't need to run those tests in Java builds afaik, as we run them in de Android builds. Still, I don't think Android supports Java 21, but I do think it can support it via toolchains. Can we set the toolchain to 21 but the compatibility remains on 11 and see if that works?

@scordio scordio marked this pull request as ready for review January 9, 2024 21:23
@scordio scordio changed the title Run CI jobs on Java 21 Run release job on Java 21 Jan 9, 2024
@TimvdLippe TimvdLippe merged commit 3254d8b into mockito:main Jan 10, 2024
@scordio scordio deleted the java-21 branch January 10, 2024 17:02
kodiakhq bot referenced this pull request in cloudquery/plugin-pb-java Feb 1, 2024
This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [org.mockito:mockito-core](https://togithub.com/mockito/mockito) | dependencies | minor | `5.8.0` -> `5.10.0` |

---

### Release Notes

<details>
<summary>mockito/mockito (org.mockito:mockito-core)</summary>

### [`v5.10.0`](https://togithub.com/mockito/mockito/releases/tag/v5.10.0)

<sup><sup>*Changelog generated by [Shipkit Changelog Gradle Plugin](https://togithub.com/shipkit/shipkit-changelog)*</sup></sup>

##### 5.10.0

-   2024-01-24 - [8 commit(s)](https://togithub.com/mockito/mockito/compare/v5.9.0...v5.10.0) by Andre Brait, dependabot\[bot]
-   Bump org.shipkit:shipkit-auto-version from 1.2.2 to 2.0.2 [(#&#8203;3248)](https://togithub.com/mockito/mockito/pull/3248)
-   Bump org.assertj:assertj-core from 3.25.1 to 3.25.2 [(#&#8203;3247)](https://togithub.com/mockito/mockito/pull/3247)
-   Bump org.shipkit:shipkit-changelog from 1.2.0 to 2.0.1 [(#&#8203;3245)](https://togithub.com/mockito/mockito/pull/3245)
-   Bump com.diffplug.spotless from 6.24.0 to 6.25.0 [(#&#8203;3244)](https://togithub.com/mockito/mockito/pull/3244)
-   Better typing for PluginLoader#loadPlugin(..) [(#&#8203;3242)](https://togithub.com/mockito/mockito/pull/3242)
-   Bump com.github.ben-manes.versions from 0.50.0 to 0.51.0 [(#&#8203;3241)](https://togithub.com/mockito/mockito/pull/3241)
-   Bump com.diffplug.spotless from 6.23.3 to 6.24.0 [(#&#8203;3236)](https://togithub.com/mockito/mockito/pull/3236)
-   Fixes [#&#8203;3219](https://togithub.com/mockito/mockito/issues/3219): Add support for static mocks on DoNotMockEnforcer [(#&#8203;3220)](https://togithub.com/mockito/mockito/pull/3220)
-   Mockito#mockStatic(Class\<?>) skips DoNotMockEnforcer [(#&#8203;3219)](https://togithub.com/mockito/mockito/issues/3219)

### [`v5.9.0`](https://togithub.com/mockito/mockito/releases/tag/v5.9.0)

#### What's Changed

-   Bump com.diffplug.spotless from 6.23.2 to 6.23.3 by [@&#8203;dependabot](https://togithub.com/dependabot) in [https://github.com/mockito/mockito/pull/3191](https://togithub.com/mockito/mockito/pull/3191)
-   Bump com.gradle.enterprise from 3.15.1 to 3.16 by [@&#8203;dependabot](https://togithub.com/dependabot) in [https://github.com/mockito/mockito/pull/3192](https://togithub.com/mockito/mockito/pull/3192)
-   Bump org.eclipse.platform:org.eclipse.osgi from 3.18.500 to 3.18.600 by [@&#8203;dependabot](https://togithub.com/dependabot) in [https://github.com/mockito/mockito/pull/3193](https://togithub.com/mockito/mockito/pull/3193)
-   Bump com.gradle.enterprise from 3.16 to 3.16.1 by [@&#8203;dependabot](https://togithub.com/dependabot) in [https://github.com/mockito/mockito/pull/3200](https://togithub.com/mockito/mockito/pull/3200)
-   Bump actions/upload-artifact from 3 to 4 by [@&#8203;dependabot](https://togithub.com/dependabot) in [https://github.com/mockito/mockito/pull/3201](https://togithub.com/mockito/mockito/pull/3201)
-   Bump com.google.googlejavaformat:google-java-format from 1.18.1 to 1.19.1 by [@&#8203;dependabot](https://togithub.com/dependabot) in [https://github.com/mockito/mockito/pull/3206](https://togithub.com/mockito/mockito/pull/3206)
-   Bump versions.bytebuddy from 1.14.10 to 1.14.11 by [@&#8203;dependabot](https://togithub.com/dependabot) in [https://github.com/mockito/mockito/pull/3208](https://togithub.com/mockito/mockito/pull/3208)
-   Bump org.jetbrains.kotlin:kotlin-stdlib from 1.9.21 to 1.9.22 by [@&#8203;dependabot](https://togithub.com/dependabot) in [https://github.com/mockito/mockito/pull/3211](https://togithub.com/mockito/mockito/pull/3211)
-   Bump org.jetbrains.kotlin:kotlin-gradle-plugin from 1.9.21 to 1.9.22 by [@&#8203;dependabot](https://togithub.com/dependabot) in [https://github.com/mockito/mockito/pull/3210](https://togithub.com/mockito/mockito/pull/3210)
-   Bump org.codehaus.groovy:groovy from 3.0.19 to 3.0.20 by [@&#8203;dependabot](https://togithub.com/dependabot) in [https://github.com/mockito/mockito/pull/3213](https://togithub.com/mockito/mockito/pull/3213)
-   [@&#8203;since](https://togithub.com/since) at ArgumentCaptor.captor() by [@&#8203;bjmi](https://togithub.com/bjmi) in [https://github.com/mockito/mockito/pull/3214](https://togithub.com/mockito/mockito/pull/3214)
-   Bump org.assertj:assertj-core from 3.24.2 to 3.25.0 by [@&#8203;dependabot](https://togithub.com/dependabot) in [https://github.com/mockito/mockito/pull/3218](https://togithub.com/mockito/mockito/pull/3218)
-   Bump org.assertj:assertj-core from 3.25.0 to 3.25.1 by [@&#8203;dependabot](https://togithub.com/dependabot) in [https://github.com/mockito/mockito/pull/3223](https://togithub.com/mockito/mockito/pull/3223)
-   Update Gradle to 8.5 by [@&#8203;scordio](https://togithub.com/scordio) in [https://github.com/mockito/mockito/pull/3225](https://togithub.com/mockito/mockito/pull/3225)
-   Bump com.google.googlejavaformat:google-java-format from 1.19.1 to 1.19.2 by [@&#8203;dependabot](https://togithub.com/dependabot) in [https://github.com/mockito/mockito/pull/3228](https://togithub.com/mockito/mockito/pull/3228)
-   Run release job on Java 21 by [@&#8203;scordio](https://togithub.com/scordio) in [https://github.com/mockito/mockito/pull/3226](https://togithub.com/mockito/mockito/pull/3226)
-   Bump org.gradle.toolchains.foojay-resolver-convention from 0.7.0 to 0.8.0 by [@&#8203;dependabot](https://togithub.com/dependabot) in [https://github.com/mockito/mockito/pull/3234](https://togithub.com/mockito/mockito/pull/3234)
-   Align Javadoc configuration to Java 21 standards by [@&#8203;scordio](https://togithub.com/scordio) in [https://github.com/mockito/mockito/pull/3230](https://togithub.com/mockito/mockito/pull/3230)

#### New Contributors

-   [@&#8203;bjmi](https://togithub.com/bjmi) made their first contribution in [https://github.com/mockito/mockito/pull/3214](https://togithub.com/mockito/mockito/pull/3214)

**Full Changelog**: mockito/mockito@v5.8.0...v5.9.0

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "before 4am on the first day of the month" (UTC), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4xNjMuMiIsInVwZGF0ZWRJblZlciI6IjM3LjE2My4yIiwidGFyZ2V0QnJhbmNoIjoibWFpbiJ9-->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants