Skip to content

Commit 938391e

Browse files
meili-bors[bot]dependabot[bot]brunoocasali
authored
Merge #867
867: Bump the gradle-dependencies group across 1 directory with 4 updates r=brunoocasali a=dependabot[bot] Bumps the gradle-dependencies group with 4 updates in the / directory: [org.junit:junit-bom](https://github.com/junit-team/junit5), [org.junit.jupiter:junit-jupiter](https://github.com/junit-team/junit5), [org.mockito:mockito-core](https://github.com/mockito/mockito). Updates `org.junit:junit-bom` from 5.11.4 to 5.13.0 <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/junit-team/junit5/releases">org.junit:junit-bom's releases</a>.</em></p> <blockquote> <p>JUnit 5.13.0 = Platform 1.13.0 + Jupiter 5.13.0 + Vintage 5.13.0</p> <p>See <a href="https://junit.org/junit5/docs/5.13.0/release-notes/">Release Notes</a>.</p> <h2>New Contributors</h2> <ul> <li><a href="https://github.com/Oyster-zx"><code>`@​Oyster-zx</code></a>` made their first contribution in <a href="https://redirect.github.com/junit-team/junit5/pull/4311">junit-team/junit5#4311</a></li> <li><a href="https://github.com/etrandafir93"><code>`@​etrandafir93</code></a>` made their first contribution in <a href="https://redirect.github.com/junit-team/junit5/pull/4336">junit-team/junit5#4336</a></li> <li><a href="https://github.com/hanszt"><code>`@​hanszt</code></a>` made their first contribution in <a href="https://redirect.github.com/junit-team/junit5/pull/3377">junit-team/junit5#3377</a></li> <li><a href="https://github.com/ngocnhan-tran1996"><code>`@​ngocnhan-tran1996</code></a>` made their first contribution in <a href="https://redirect.github.com/junit-team/junit5/pull/4545">junit-team/junit5#4545</a></li> </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/junit-team/junit5/compare/r5.12.2...r5.13.0">https://github.com/junit-team/junit5/compare/r5.12.2...r5.13.0</a></p> <p>JUnit 5.13.0-RC1 = Platform 1.13.0-RC1 + Jupiter 5.13.0-RC1 + Vintage 5.13.0-RC1</p> <p>See <a href="https://junit.org/junit5/docs/5.13.0-RC1/release-notes/">Release Notes</a>.</p> <h2>New Contributors</h2> <ul> <li><a href="https://github.com/hanszt"><code>`@​hanszt</code></a>` made their first contribution in <a href="https://redirect.github.com/junit-team/junit5/pull/3377">junit-team/junit5#3377</a></li> </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/junit-team/junit5/compare/r5.13.0-M3...r5.13.0-RC1">https://github.com/junit-team/junit5/compare/r5.13.0-M3...r5.13.0-RC1</a></p> <p>JUnit 5.13.0-M3 = Platform 1.13.0-M3 + Jupiter 5.13.0-M3 + Vintage 5.13.0-M3</p> <p>See <a href="https://junit.org/junit5/docs/5.13.0-M3/release-notes/">Release Notes</a>.</p> <p><strong>Full Changelog</strong>: <a href="https://github.com/junit-team/junit5/compare/r5.13.0-M2...r5.13.0-M3">https://github.com/junit-team/junit5/compare/r5.13.0-M2...r5.13.0-M3</a></p> <p>JUnit 5.13.0-M2 = Platform 1.13.0-M2 + Jupiter 5.13.0-M2 + Vintage 5.13.0-M2</p> <p>See <a href="https://junit.org/junit5/docs/5.13.0-M2/release-notes/">Release Notes</a>.</p> <p><strong>Full Changelog</strong>: <a href="https://github.com/junit-team/junit5/compare/r5.13.0-M1...r5.13.0-M2">https://github.com/junit-team/junit5/compare/r5.13.0-M1...r5.13.0-M2</a></p> <p>JUnit 5.13.0-M1 = Platform 1.13.0-M1 + Jupiter 5.13.0-M1 + Vintage 5.13.0-M1</p> <p>See <a href="https://junit.org/junit5/docs/5.13.0-M1/release-notes/">Release Notes</a>.</p> <h2>New Contributors</h2> <ul> <li><a href="https://github.com/Oyster-zx"><code>`@​Oyster-zx</code></a>` made their first contribution in <a href="https://redirect.github.com/junit-team/junit5/pull/4311">junit-team/junit5#4311</a></li> <li><a href="https://github.com/etrandafir93"><code>`@​etrandafir93</code></a>` made their first contribution in <a href="https://redirect.github.com/junit-team/junit5/pull/4336">junit-team/junit5#4336</a></li> </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/junit-team/junit5/compare/r5.12.1...r5.13.0-M1">https://github.com/junit-team/junit5/compare/r5.12.1...r5.13.0-M1</a></p> <p>JUnit 5.12.2 = Platform 1.12.2 + Jupiter 5.12.2 + Vintage 5.12.2</p> <p>See <a href="https://junit.org/junit5/docs/5.12.2/release-notes/">Release Notes</a>.</p> <p><strong>Full Changelog</strong>: <a href="https://github.com/junit-team/junit5/compare/r5.12.1...r5.12.2">https://github.com/junit-team/junit5/compare/r5.12.1...r5.12.2</a></p> <p>JUnit 5.12.1 = Platform 1.12.1 + Jupiter 5.12.1 + Vintage 5.12.1</p> <!-- raw HTML omitted --> </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/junit-team/junit5/commit/f539f92fce67e95c642e3788284e27dbad8add7c"><code>f539f92</code></a> Release 5.13.0</li> <li><a href="https://github.com/junit-team/junit5/commit/a54ad65325608225e553b8c1310899f090fdf8eb"><code>a54ad65</code></a> Use <code>set</code>/<code>get</code> on <code>AtomicBoolean</code> compatibility with Java 8</li> <li><a href="https://github.com/junit-team/junit5/commit/9bb6a0f4bdb63709a86410e695e0fb31b79aaa28"><code>9bb6a0f</code></a> Finalize 5.13.0 release notes</li> <li><a href="https://github.com/junit-team/junit5/commit/5f0e4e6e355355693eddac376669be393476dc66"><code>5f0e4e6</code></a> Remove short-circuiting to ensure all classes are checked for cycles (<a href="https://redirect.github.com/junit-team/junit5/issues/4598">#4598</a>)</li> <li><a href="https://github.com/junit-team/junit5/commit/36bb005e4d28f3c817a0f3c1466603a84deeb841"><code>36bb005</code></a> Improve assertion failure message in TestClassPredicatesTests</li> <li><a href="https://github.com/junit-team/junit5/commit/2c86dfa055d679d203f0977b0739a385cc2649d1"><code>2c86dfa</code></a> Avoid publishing Gradle Module Metadata for <code>shadowRuntimeElements</code></li> <li><a href="https://github.com/junit-team/junit5/commit/4b27910013e672e2c55c26a1ab7737d0ac1f321e"><code>4b27910</code></a> Allow publishing files to an existing directory</li> <li><a href="https://github.com/junit-team/junit5/commit/b819306bccb1ab78994a208169d9e98ca97e7a5b"><code>b819306</code></a> Fix console launcher's <code>--uid</code> option (<a href="https://redirect.github.com/junit-team/junit5/issues/4589">#4589</a>)</li> <li><a href="https://github.com/junit-team/junit5/commit/df466515d250c7f041aed13890f0490c8497680d"><code>df46651</code></a> Fix <code>:junit-platform-console:compileModule</code></li> <li><a href="https://github.com/junit-team/junit5/commit/182a268a8a38cd4047f80e6478f8896f0595e027"><code>182a268</code></a> Force Gradle to update snapshots</li> <li>Additional commits viewable in <a href="https://github.com/junit-team/junit5/compare/r5.11.4...r5.13.0">compare view</a></li> </ul> </details> <br /> Updates `org.junit.jupiter:junit-jupiter` from 5.11.4 to 5.13.0 <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/junit-team/junit5/releases">org.junit.jupiter:junit-jupiter's releases</a>.</em></p> <blockquote> <p>JUnit 5.13.0 = Platform 1.13.0 + Jupiter 5.13.0 + Vintage 5.13.0</p> <p>See <a href="https://junit.org/junit5/docs/5.13.0/release-notes/">Release Notes</a>.</p> <h2>New Contributors</h2> <ul> <li><a href="https://github.com/Oyster-zx"><code>`@​Oyster-zx</code></a>` made their first contribution in <a href="https://redirect.github.com/junit-team/junit5/pull/4311">junit-team/junit5#4311</a></li> <li><a href="https://github.com/etrandafir93"><code>`@​etrandafir93</code></a>` made their first contribution in <a href="https://redirect.github.com/junit-team/junit5/pull/4336">junit-team/junit5#4336</a></li> <li><a href="https://github.com/hanszt"><code>`@​hanszt</code></a>` made their first contribution in <a href="https://redirect.github.com/junit-team/junit5/pull/3377">junit-team/junit5#3377</a></li> <li><a href="https://github.com/ngocnhan-tran1996"><code>`@​ngocnhan-tran1996</code></a>` made their first contribution in <a href="https://redirect.github.com/junit-team/junit5/pull/4545">junit-team/junit5#4545</a></li> </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/junit-team/junit5/compare/r5.12.2...r5.13.0">https://github.com/junit-team/junit5/compare/r5.12.2...r5.13.0</a></p> <p>JUnit 5.13.0-RC1 = Platform 1.13.0-RC1 + Jupiter 5.13.0-RC1 + Vintage 5.13.0-RC1</p> <p>See <a href="https://junit.org/junit5/docs/5.13.0-RC1/release-notes/">Release Notes</a>.</p> <h2>New Contributors</h2> <ul> <li><a href="https://github.com/hanszt"><code>`@​hanszt</code></a>` made their first contribution in <a href="https://redirect.github.com/junit-team/junit5/pull/3377">junit-team/junit5#3377</a></li> </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/junit-team/junit5/compare/r5.13.0-M3...r5.13.0-RC1">https://github.com/junit-team/junit5/compare/r5.13.0-M3...r5.13.0-RC1</a></p> <p>JUnit 5.13.0-M3 = Platform 1.13.0-M3 + Jupiter 5.13.0-M3 + Vintage 5.13.0-M3</p> <p>See <a href="https://junit.org/junit5/docs/5.13.0-M3/release-notes/">Release Notes</a>.</p> <p><strong>Full Changelog</strong>: <a href="https://github.com/junit-team/junit5/compare/r5.13.0-M2...r5.13.0-M3">https://github.com/junit-team/junit5/compare/r5.13.0-M2...r5.13.0-M3</a></p> <p>JUnit 5.13.0-M2 = Platform 1.13.0-M2 + Jupiter 5.13.0-M2 + Vintage 5.13.0-M2</p> <p>See <a href="https://junit.org/junit5/docs/5.13.0-M2/release-notes/">Release Notes</a>.</p> <p><strong>Full Changelog</strong>: <a href="https://github.com/junit-team/junit5/compare/r5.13.0-M1...r5.13.0-M2">https://github.com/junit-team/junit5/compare/r5.13.0-M1...r5.13.0-M2</a></p> <p>JUnit 5.13.0-M1 = Platform 1.13.0-M1 + Jupiter 5.13.0-M1 + Vintage 5.13.0-M1</p> <p>See <a href="https://junit.org/junit5/docs/5.13.0-M1/release-notes/">Release Notes</a>.</p> <h2>New Contributors</h2> <ul> <li><a href="https://github.com/Oyster-zx"><code>`@​Oyster-zx</code></a>` made their first contribution in <a href="https://redirect.github.com/junit-team/junit5/pull/4311">junit-team/junit5#4311</a></li> <li><a href="https://github.com/etrandafir93"><code>`@​etrandafir93</code></a>` made their first contribution in <a href="https://redirect.github.com/junit-team/junit5/pull/4336">junit-team/junit5#4336</a></li> </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/junit-team/junit5/compare/r5.12.1...r5.13.0-M1">https://github.com/junit-team/junit5/compare/r5.12.1...r5.13.0-M1</a></p> <p>JUnit 5.12.2 = Platform 1.12.2 + Jupiter 5.12.2 + Vintage 5.12.2</p> <p>See <a href="https://junit.org/junit5/docs/5.12.2/release-notes/">Release Notes</a>.</p> <p><strong>Full Changelog</strong>: <a href="https://github.com/junit-team/junit5/compare/r5.12.1...r5.12.2">https://github.com/junit-team/junit5/compare/r5.12.1...r5.12.2</a></p> <p>JUnit 5.12.1 = Platform 1.12.1 + Jupiter 5.12.1 + Vintage 5.12.1</p> <!-- raw HTML omitted --> </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/junit-team/junit5/commit/f539f92fce67e95c642e3788284e27dbad8add7c"><code>f539f92</code></a> Release 5.13.0</li> <li><a href="https://github.com/junit-team/junit5/commit/a54ad65325608225e553b8c1310899f090fdf8eb"><code>a54ad65</code></a> Use <code>set</code>/<code>get</code> on <code>AtomicBoolean</code> compatibility with Java 8</li> <li><a href="https://github.com/junit-team/junit5/commit/9bb6a0f4bdb63709a86410e695e0fb31b79aaa28"><code>9bb6a0f</code></a> Finalize 5.13.0 release notes</li> <li><a href="https://github.com/junit-team/junit5/commit/5f0e4e6e355355693eddac376669be393476dc66"><code>5f0e4e6</code></a> Remove short-circuiting to ensure all classes are checked for cycles (<a href="https://redirect.github.com/junit-team/junit5/issues/4598">#4598</a>)</li> <li><a href="https://github.com/junit-team/junit5/commit/36bb005e4d28f3c817a0f3c1466603a84deeb841"><code>36bb005</code></a> Improve assertion failure message in TestClassPredicatesTests</li> <li><a href="https://github.com/junit-team/junit5/commit/2c86dfa055d679d203f0977b0739a385cc2649d1"><code>2c86dfa</code></a> Avoid publishing Gradle Module Metadata for <code>shadowRuntimeElements</code></li> <li><a href="https://github.com/junit-team/junit5/commit/4b27910013e672e2c55c26a1ab7737d0ac1f321e"><code>4b27910</code></a> Allow publishing files to an existing directory</li> <li><a href="https://github.com/junit-team/junit5/commit/b819306bccb1ab78994a208169d9e98ca97e7a5b"><code>b819306</code></a> Fix console launcher's <code>--uid</code> option (<a href="https://redirect.github.com/junit-team/junit5/issues/4589">#4589</a>)</li> <li><a href="https://github.com/junit-team/junit5/commit/df466515d250c7f041aed13890f0490c8497680d"><code>df46651</code></a> Fix <code>:junit-platform-console:compileModule</code></li> <li><a href="https://github.com/junit-team/junit5/commit/182a268a8a38cd4047f80e6478f8896f0595e027"><code>182a268</code></a> Force Gradle to update snapshots</li> <li>Additional commits viewable in <a href="https://github.com/junit-team/junit5/compare/r5.11.4...r5.13.0">compare view</a></li> </ul> </details> <br /> Updates `org.mockito:mockito-core` from 4.9.0 to 4.11.0 <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/mockito/mockito/releases">org.mockito:mockito-core's releases</a>.</em></p> <blockquote> <h2>v4.11.0</h2> <p><!-- raw HTML omitted --><!-- raw HTML omitted --><em>Changelog generated by <a href="https://github.com/shipkit/shipkit-changelog">Shipkit Changelog Gradle Plugin</a></em><!-- raw HTML omitted --><!-- raw HTML omitted --></p> <h4>4.11.0</h4> <ul> <li>2022-12-28 - <a href="https://github.com/mockito/mockito/compare/v4.10.0...v4.11.0">1 commit(s)</a> by Andy Coates</li> <li>Improve vararg handling: approach 2 [(<a href="https://redirect.github.com/mockito/mockito/issues/2807">#2807</a>)](<a href="https://redirect.github.com/mockito/mockito/pull/2807">mockito/mockito#2807</a>)</li> <li>Mocking varargs method with <code>any(String[].class)</code> doesn't work as expected [(<a href="https://redirect.github.com/mockito/mockito/issues/2796">#2796</a>)](<a href="https://redirect.github.com/mockito/mockito/issues/2796">mockito/mockito#2796</a>)</li> <li>(Argument)Matchers regression from 1.10.19 to 2.18.3 for varargs [(<a href="https://redirect.github.com/mockito/mockito/issues/1498">#1498</a>)](<a href="https://redirect.github.com/mockito/mockito/issues/1498">mockito/mockito#1498</a>)</li> <li>Cannot verify varargs parameter as an array [(<a href="https://redirect.github.com/mockito/mockito/issues/1222">#1222</a>)](<a href="https://redirect.github.com/mockito/mockito/issues/1222">mockito/mockito#1222</a>)</li> <li>ArgumentCaptor can't capture varargs-arrays [(<a href="https://redirect.github.com/mockito/mockito/issues/584">#584</a>)](<a href="https://redirect.github.com/mockito/mockito/issues/584">mockito/mockito#584</a>)</li> <li>Verification of an empty varargs call fails when isNotNull() is used [(<a href="https://redirect.github.com/mockito/mockito/issues/567">#567</a>)](<a href="https://redirect.github.com/mockito/mockito/issues/567">mockito/mockito#567</a>)</li> </ul> <h2>v4.10.0</h2> <p><!-- raw HTML omitted --><!-- raw HTML omitted --><em>Changelog generated by <a href="https://github.com/shipkit/shipkit-changelog">Shipkit Changelog Gradle Plugin</a></em><!-- raw HTML omitted --><!-- raw HTML omitted --></p> <h4>4.10.0</h4> <ul> <li>2022-12-14 - <a href="https://github.com/mockito/mockito/compare/v4.9.0...v4.10.0">13 commit(s)</a> by Andrei Solntsev, Andriy Redko, Andy Coates, Christopher Lambert, Marcono1234, Vladimir Glinskikh, dependabot[bot]</li> <li>Add new artifact mockito-subclass (to use mock-maker-subclass MockMaker) [(<a href="https://redirect.github.com/mockito/mockito/issues/2821">#2821</a>)](<a href="https://redirect.github.com/mockito/mockito/pull/2821">mockito/mockito#2821</a>)</li> <li>Bump gradle from 7.5.1 to 7.6 [(<a href="https://redirect.github.com/mockito/mockito/issues/2817">#2817</a>)](<a href="https://redirect.github.com/mockito/mockito/pull/2817">mockito/mockito#2817</a>)</li> <li>Fix incorrect Javadoc inline tag for MockitoJUnitRunner [(<a href="https://redirect.github.com/mockito/mockito/issues/2816">#2816</a>)](<a href="https://redirect.github.com/mockito/mockito/pull/2816">mockito/mockito#2816</a>)</li> <li>Bump shipkit-auto-version from 1.2.1 to 1.2.2 [(<a href="https://redirect.github.com/mockito/mockito/issues/2811">#2811</a>)](<a href="https://redirect.github.com/mockito/mockito/pull/2811">mockito/mockito#2811</a>)</li> <li>Bump com.github.ben-manes.versions from 0.42.0 to 0.44.0 [(<a href="https://redirect.github.com/mockito/mockito/issues/2810">#2810</a>)](<a href="https://redirect.github.com/mockito/mockito/pull/2810">mockito/mockito#2810</a>)</li> <li>Bump kotlinVersion from 1.7.21 to 1.7.22 [(<a href="https://redirect.github.com/mockito/mockito/issues/2809">#2809</a>)](<a href="https://redirect.github.com/mockito/mockito/pull/2809">mockito/mockito#2809</a>)</li> <li>Bump junit from 1.1.3 to 1.1.4 [(<a href="https://redirect.github.com/mockito/mockito/issues/2806">#2806</a>)](<a href="https://redirect.github.com/mockito/mockito/pull/2806">mockito/mockito#2806</a>)</li> <li>Simplify <code>MatcherApplicationStrategy</code> [(<a href="https://redirect.github.com/mockito/mockito/issues/2803">#2803</a>)](<a href="https://redirect.github.com/mockito/mockito/pull/2803">mockito/mockito#2803</a>)</li> <li>Bump kotlinVersion from 1.7.10 to 1.7.21 [(<a href="https://redirect.github.com/mockito/mockito/issues/2801">#2801</a>)](<a href="https://redirect.github.com/mockito/mockito/pull/2801">mockito/mockito#2801</a>)</li> <li>Bump espresso-core from 3.4.0 to 3.5.0 [(<a href="https://redirect.github.com/mockito/mockito/issues/2800">#2800</a>)](<a href="https://redirect.github.com/mockito/mockito/pull/2800">mockito/mockito#2800</a>)</li> <li>Bump versions.bytebuddy from 1.12.16 to 1.12.19 [(<a href="https://redirect.github.com/mockito/mockito/issues/2799">#2799</a>)](<a href="https://redirect.github.com/mockito/mockito/pull/2799">mockito/mockito#2799</a>)</li> <li>Upgrade errorprone from 2.14.0 to 2.16 [(<a href="https://redirect.github.com/mockito/mockito/issues/2794">#2794</a>)](<a href="https://redirect.github.com/mockito/mockito/pull/2794">mockito/mockito#2794</a>)</li> <li>automatically detect class to mock [(<a href="https://redirect.github.com/mockito/mockito/issues/2779">#2779</a>)](<a href="https://redirect.github.com/mockito/mockito/pull/2779">mockito/mockito#2779</a>)</li> </ul> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/mockito/mockito/commit/483e15f9f940716a85f2d58f6c28981136790c4e"><code>483e15f</code></a> Add <code>type()</code> method to <code>ArgumentMatcher</code> (<a href="https://redirect.github.com/mockito/mockito/issues/2807">#2807</a>)</li> <li><a href="https://github.com/mockito/mockito/commit/a4e2e48507424d7efc32be53f5bd23bcfd3b4ddb"><code>a4e2e48</code></a> Add <code>mockito-subclass</code> artifact (<a href="https://redirect.github.com/mockito/mockito/issues/2821">#2821</a>)</li> <li><a href="https://github.com/mockito/mockito/commit/e2e628918518b73de7381692f28556ac6caa4710"><code>e2e6289</code></a> Bump gradle from 7.5.1 to 7.6 (<a href="https://redirect.github.com/mockito/mockito/issues/2817">#2817</a>)</li> <li><a href="https://github.com/mockito/mockito/commit/ee9ba749fee1bf9c48429ce9083cd171709441e3"><code>ee9ba74</code></a> Fix incorrect Javadoc inline tag for MockitoJUnitRunner (<a href="https://redirect.github.com/mockito/mockito/issues/2816">#2816</a>)</li> <li><a href="https://github.com/mockito/mockito/commit/2567f050f1e48da5acad2c5d616e565650f64b9d"><code>2567f05</code></a> Bump shipkit-auto-version from 1.2.1 to 1.2.2 (<a href="https://redirect.github.com/mockito/mockito/issues/2811">#2811</a>)</li> <li><a href="https://github.com/mockito/mockito/commit/bdcb31e34c301a45845cfc743438c7aeaeb8b096"><code>bdcb31e</code></a> Bump com.github.ben-manes.versions from 0.42.0 to 0.44.0 (<a href="https://redirect.github.com/mockito/mockito/issues/2810">#2810</a>)</li> <li><a href="https://github.com/mockito/mockito/commit/34b8a8db64798538d66d88fd7fc572990ca0c908"><code>34b8a8d</code></a> Bump kotlinVersion from 1.7.21 to 1.7.22 (<a href="https://redirect.github.com/mockito/mockito/issues/2809">#2809</a>)</li> <li><a href="https://github.com/mockito/mockito/commit/83a41fdff122b0f82b8754571d3a9fa2d37dece6"><code>83a41fd</code></a> Bump junit from 1.1.3 to 1.1.4 (<a href="https://redirect.github.com/mockito/mockito/issues/2806">#2806</a>)</li> <li><a href="https://github.com/mockito/mockito/commit/8f4af189a9f98190c1ead3aff630e05cda721a89"><code>8f4af18</code></a> Simplify <code>MatcherApplicationStrategy</code> (<a href="https://redirect.github.com/mockito/mockito/issues/2803">#2803</a>)</li> <li><a href="https://github.com/mockito/mockito/commit/0ce902af967cca91cb9ff2beaac95e44406bd175"><code>0ce902a</code></a> Bump kotlinVersion from 1.7.10 to 1.7.21 (<a href="https://redirect.github.com/mockito/mockito/issues/2801">#2801</a>)</li> <li>Additional commits viewable in <a href="https://github.com/mockito/mockito/compare/v4.9.0...v4.11.0">compare view</a></li> </ul> </details> <br /> You can trigger a rebase of this PR by commenting ``@dependabot` rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> 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` show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - ``@dependabot` ignore <dependency name> major version` will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself) - ``@dependabot` ignore <dependency name> minor version` will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself) - ``@dependabot` ignore <dependency name>` will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself) - ``@dependabot` unignore <dependency name>` will remove all of the ignore conditions of the specified dependency - ``@dependabot` unignore <dependency name> <ignore condition>` will remove the ignore condition of the specified dependency and ignore conditions </details> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Bruno Casali <[email protected]>
2 parents a13f631 + f1718a3 commit 938391e

File tree

5 files changed

+33
-27
lines changed

5 files changed

+33
-27
lines changed

‎build.gradle‎

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,6 @@ group = 'com.meilisearch.sdk'
2020
archivesBaseName = 'meilisearch-java'
2121
version = '0.14.7'
2222

23-
java {
24-
sourceCompatibility = JavaVersion.VERSION_1_8
25-
targetCompatibility = JavaVersion.VERSION_1_8
26-
}
27-
2823
jacoco {
2924
toolVersion = "0.8.8"
3025
reportsDirectory = layout.buildDirectory.dir("$projectDir/tmp/coverage")
@@ -56,10 +51,10 @@ dependencies {
5651
api 'com.squareup.okhttp3:okhttp:4.12.0'
5752

5853
// Use JUnit test framework
59-
testImplementation(platform('org.junit:junit-bom:5.11.4'))
60-
testImplementation('org.junit.jupiter:junit-jupiter:5.11.4')
54+
testImplementation(platform('org.junit:junit-bom:5.13.0'))
55+
testImplementation('org.junit.jupiter:junit-jupiter:5.13.0')
6156
// https://mvnrepository.com/artifact/org.mockito/mockito-core
62-
testImplementation 'org.mockito:mockito-core:4.9.0'
57+
testImplementation 'org.mockito:mockito-core:4.11.0'
6358
testImplementation 'org.hamcrest:hamcrest:3.0'
6459
testImplementation 'com.squareup.okio:okio:3.12.0'
6560
testImplementation 'com.squareup.okhttp3:okhttp:4.12.0'
@@ -92,13 +87,12 @@ task buildJar(type: Jar) {
9287
}
9388

9489
test {
95-
finalizedBy jacocoTestReport
9690
useJUnitPlatform {
97-
excludeTags('integration')
91+
excludeTags 'integration'
9892
}
99-
93+
finalizedBy jacocoTestReport
10094
testLogging {
101-
events 'passed', 'skipped', 'failed'
95+
events 'passed', 'skipped', 'failed'
10296
}
10397
}
10498

@@ -114,7 +108,7 @@ jacocoTestReport {
114108

115109
task integrationTest(type: Test) {
116110
useJUnitPlatform {
117-
includeTags('integration')
111+
includeTags 'integration'
118112
}
119113
testLogging {
120114
events 'passed', 'skipped', 'failed'
@@ -123,10 +117,17 @@ task integrationTest(type: Test) {
123117
}
124118

125119
java {
120+
sourceCompatibility = JavaVersion.VERSION_1_8
121+
targetCompatibility = JavaVersion.VERSION_1_8
122+
126123
withJavadocJar()
127124
withSourcesJar()
128125
}
129126

127+
tasks.withType(JavaCompile).configureEach {
128+
options.compilerArgs += ['-Xlint:deprecation', '-Xlint:unchecked']
129+
}
130+
130131
publishing {
131132
publications {
132133
mavenJava(MavenPublication) {
@@ -195,3 +196,11 @@ spotless {
195196
googleJavaFormat('1.7').aosp()
196197
}
197198
}
199+
200+
testing {
201+
suites {
202+
test {
203+
useJUnitJupiter()
204+
}
205+
}
206+
}

‎docker-compose.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
version: "3.8"
2-
31
services:
42
package:
5-
image: azul/zulu-openjdk:8-latest
3+
image: azul/zulu-openjdk:11-latest
64
tty: true
75
stdin_open: true
86
working_dir: /home/package

‎src/main/java/com/meilisearch/sdk/MultiSearchRequest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ public class MultiSearchRequest {
66
private ArrayList<IndexSearchRequest> queries;
77

88
public MultiSearchRequest() {
9-
this.queries = new ArrayList();
9+
this.queries = new ArrayList<IndexSearchRequest>();
1010
}
1111

1212
/*

‎src/main/java/com/meilisearch/sdk/SettingsHandler.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -707,6 +707,7 @@ public String[] getSeparatorTokensSettings(String uid) {
707707
* Updates the separator tokens settings of the index
708708
*
709709
* @param uid Index identifier
710+
* @param separatorTokens an array of strings that contains the new separator tokens settings
710711
* @return TaskInfo instance
711712
* @throws MeilisearchException if an error occurs
712713
*/
@@ -747,6 +748,7 @@ public String[] getNonSeparatorTokensSettings(String uid) {
747748
* Updates the non-separator tokens settings of the index
748749
*
749750
* @param uid Index identifier
751+
* @param separatorTokens an array of strings that contains the new separator tokens settings
750752
* @return TaskInfo instance
751753
* @throws MeilisearchException if an error occurs
752754
*/

‎src/test/java/com/meilisearch/sdk/json/GsonJsonHandlerTest.java‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import java.util.stream.Stream;
2929
import lombok.Getter;
3030
import org.junit.jupiter.api.Test;
31+
import org.mockito.Mockito;
3132

3233
class GsonJsonHandlerTest {
3334

@@ -68,16 +69,11 @@ void encodeAnObject() {
6869

6970
@Test
7071
void encodeThrowsJsonEncodingExceptionWhenGsonThrowsException() {
71-
assertThrows(
72-
JsonEncodingException.class,
73-
() ->
74-
classToTest.encode(
75-
new JsonElement() {
76-
@Override
77-
public JsonElement deepCopy() {
78-
return null;
79-
}
80-
}));
72+
JsonElement mockElement = Mockito.mock(JsonElement.class);
73+
// Optionally mock behavior (if needed):
74+
// Mockito.when(mockElement.deepCopy()).thenReturn(null);
75+
76+
assertThrows(JsonEncodingException.class, () -> classToTest.encode(mockElement));
8177
}
8278

8379
@Test
@@ -161,6 +157,7 @@ void deserializeWithParametersEmpty() throws Exception {
161157
void deserializeMap() throws Exception {
162158
String mapString =
163159
"{\"commitSha\":\"b46889b5f0f2f8b91438a08a358ba8f05fc09fc1\",\"commitDate\":\"2019-11-15T09:51:54.278247+00:00\",\"pkgVersion\":\"0.1.1\"}";
160+
@SuppressWarnings("unchecked")
164161
HashMap<String, String> decode =
165162
classToTest.decode(mapString, HashMap.class, String.class, String.class);
166163

0 commit comments

Comments
 (0)