Skip to content

Remove nullable type in TestJvmSpec #11336

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gh-worker-dd-mergequeue-cf854d merged 1 commit into from
May 11, 2026
+2 −1
Merged

Remove nullable type in TestJvmSpec #11336

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion buildSrc/src/main/kotlin/datadog/gradle/plugin/testJvmConstraints/TestJvmSpec.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import org.gradle.jvm.toolchain.JvmImplementation
import org.gradle.jvm.toolchain.JvmVendorSpec
import org.gradle.jvm.toolchain.internal.DefaultToolchainSpec
import org.gradle.jvm.toolchain.internal.SpecificInstallationToolchainSpec
import org.gradle.kotlin.dsl.property
import org.gradle.kotlin.dsl.support.serviceOf
import java.nio.file.Files
import java.nio.file.Path
Expand Down Expand Up @@ -151,7 +152,7 @@ class TestJvmSpec(val project: Project) {
project.providers.zip(testJvmSpec, normalizedTestJvm) { jvmSpec, testJvm ->
// Only change test JVM if it's not the one we are running the gradle build with
if ((jvmSpec as? SpecificInstallationToolchainSpec)?.javaHome == currentJavaHomePath.get()) {
project.providers.provider<JavaLauncher?> { null }
project.objects.property<JavaLauncher>()
} else {
// The provider always says that a value is present so we need to wrap it for proper error messages
project.javaToolchains.launcherFor(jvmSpec).orElse(project.providers.provider {
Expand Down
Loading