Skip to content

Commit f1e6482

Browse files
committed
Upgrade to Mockito 5.14.2
This version brings bytebuddy 1.15.4 which supports JDK 24.
1 parent e3301dd commit f1e6482

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

framework-platform/framework-platform.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ dependencies {
2121
api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.8.1"))
2222
api(platform("org.jetbrains.kotlinx:kotlinx-serialization-bom:1.6.3"))
2323
api(platform("org.junit:junit-bom:5.11.3"))
24-
api(platform("org.mockito:mockito-bom:5.14.1"))
24+
api(platform("org.mockito:mockito-bom:5.14.2"))
2525

2626
constraints {
2727
api("com.fasterxml:aalto-xml:1.3.2")

gradle/toolchains.gradle

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,9 @@ plugins.withType(JavaPlugin).configureEach {
5555
languageVersion = testLanguageVersion
5656
}
5757
// Enable Java experimental support in Bytebuddy
58-
// Remove when JDK 22 is supported by Mockito
59-
if (testLanguageVersion == JavaLanguageVersion.of(22)) {
58+
// Bytebuddy 1.15.4 supports JDK <= 24
59+
// see https://github.com/raphw/byte-buddy/blob/master/release-notes.md
60+
if (testLanguageVersion.compareTo(JavaLanguageVersion.of(24)) > 0 ) {
6061
jvmArgs("-Dnet.bytebuddy.experimental=true")
6162
}
6263
}

0 commit comments

Comments
 (0)