Skip to content

Commit 292f6a0

Browse files
committed
Revert "Use Gradle's new daemon JVM criteria feature"
This causes problems on IntelliJ IDEA's 2025.1 EAP version which picks the IDE's own JetBrains JDK rather than one specified using the `JDK21` env var. Since JetBrains' JDK does not contain tools like `jar` this causes builds to break when the Gradle daemon is started via IntelliJ IDEA. This reverts commit 1e29d8e.
1 parent 3583e01 commit 292f6a0

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

gradle/gradle-daemon-jvm.properties

Lines changed: 0 additions & 2 deletions
This file was deleted.

gradle/plugins/settings.gradle.kts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
val expectedJavaVersion = JavaVersion.VERSION_21
2+
val actualJavaVersion = JavaVersion.current()
3+
require(actualJavaVersion == expectedJavaVersion) {
4+
"The JUnit 5 build must be executed with Java ${expectedJavaVersion.majorVersion}. Currently executing with Java ${actualJavaVersion.majorVersion}."
5+
}
6+
17
dependencyResolutionManagement {
28
versionCatalogs {
39
create("libs") {

0 commit comments

Comments
 (0)