Merge remote-tracking branch 'origin/main' into marc/parallel-execution-custom-implementation

Author: mpkorstanje

.idea/icon.png

@@ -14,8 +14,8 @@ import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 
 // end::user_guide[]
-// tag::user_guide[]
 @Suppress("JUnitMalformedDeclaration")
+// tag::user_guide[]
 class KotlinCoroutinesDemo {
     @BeforeEach
     fun regularSetUp() {

documentation/src/test/kotlin/example/KotlinCoroutinesDemo.kt

@@ -60,7 +60,7 @@ mockito-bom = { module = "org.mockito:mockito-bom", version = "5.20.0" }
 mockito-core = { module = "org.mockito:mockito-core" }
 mockito-junit-jupiter = { module = "org.mockito:mockito-junit-jupiter" }
 nohttp-checkstyle = { module = "io.spring.nohttp:nohttp-checkstyle", version = "0.0.11" }
-nullaway = { module = "com.uber.nullaway:nullaway", version = "0.12.11" }
+nullaway = { module = "com.uber.nullaway:nullaway", version = "0.12.12" }
 opentest4j = { module = "org.opentest4j:opentest4j", version.ref = "opentest4j" }
 openTestReporting-cli = { module = "org.opentest4j.reporting:open-test-reporting-cli", version.ref = "openTestReporting" }
 openTestReporting-events = { module = "org.opentest4j.reporting:open-test-reporting-events", version.ref = "openTestReporting" }

gradle/libs.versions.toml

@@ -69,7 +69,6 @@ tasks.withType<JavaCompile>().configureEach {
 			}
 			onlyNullMarked = true
 			isJSpecifyMode = true
-			customContractAnnotations.add("org.junit.platform.commons.annotation.Contract")
 			checkContracts = true
 			suppressionNameAliases.add("DataFlowIssue")
 		}

gradle/plugins/common/src/main/kotlin/junitbuild.java-errorprone-conventions.gradle.kts

@@ -33,14 +33,19 @@ tasks.test {
 
 val initializeAtBuildTime = mapOf(
 	// These need to be added to native-build-tools
-	"6.1" to listOf<String>(),
+	"5.14.1" to listOf(
+		"org.junit.jupiter.engine.discovery.MethodSegmentResolver"
+	),
 )
 
 graalvmNative {
 	binaries {
 		named("test") {
 			buildArgs.add("-H:+ReportExceptionStackTraces")
-			buildArgs.add("--initialize-at-build-time=${initializeAtBuildTime.values.flatten().joinToString(",")}")
+			val classNames = initializeAtBuildTime.values.flatten()
+			if (classNames.isNotEmpty()) {
+				buildArgs.add("--initialize-at-build-time=${classNames.joinToString(",")}")
+			}
 		}
 	}
 }