Use a boolean property instead of a verb

Author: melix

docs/src/docs/asciidoc/index.adoc

@@ -20,7 +20,7 @@ If you are interested in contributing, please refer to our https://github.com/gr
 ==== Gradle plugin
 
 * Fixed resource inference not working on custom binaries
-* Fixed `disableToolchainDetection` not working if a GraalVM installation isn't present. Please use `graalvmNative.disableToolchainDetection()` instead.
+* Fixed `disableToolchainDetection` not working if a GraalVM installation isn't present. Please use `graalvmNative.toolchainDetection.set(false)` instead.
 
 === Release 0.9.8
 

docs/src/docs/snippets/gradle/groovy/build.gradle

@@ -60,7 +60,7 @@ graalvmNative {
 if (providers.environmentVariable("DISABLE_TOOLCHAIN").isPresent()) {
 // tag::disabling-toolchain[]
     graalvmNative {
-        disableToolchainDetection()
+        toolchainDetection = false
     }
 // end::disabling-toolchain[]
 }

docs/src/docs/snippets/gradle/kotlin/build.gradle.kts

@@ -61,7 +61,7 @@ graalvmNative {
 if (providers.environmentVariable("DISABLE_TOOLCHAIN").isPresent()) {
 // tag::disabling-toolchain[]
     graalvmNative {
-        disableToolchainDetection()
+        toolchainDetection.set(false)
     }
 // end::disabling-toolchain[]
 }

native-gradle-plugin/src/main/java/org/graalvm/buildtools/gradle/dsl/GraalVMExtension.java

@@ -85,16 +85,11 @@ public interface GraalVMExtension {
     void registerTestBinary(String name, Action<? super TestBinaryConfig> spec);
 
     /**
-     * Enables detection of toolchains which support building native images.
-     * This is the default unless {@link #disableToolchainDetection()} was called.
+     * Property driving the detection of toolchains which support building native images.
+     * The default is true.
      */
-    void enableToolchainDetection();
+    Property<Boolean> getToolchainDetection();
 
-    /**
-     * Disables detection of toolchains, which is useful when the default detection
-     * mechanism isn't capable of handling your toolchain.
-     */
-    void disableToolchainDetection();
 
     interface TestBinaryConfig {
         /**

native-gradle-plugin/src/main/java/org/graalvm/buildtools/gradle/internal/DefaultGraalVmExtension.java

@@ -76,28 +76,28 @@ public DefaultGraalVmExtension(NamedDomainObjectContainer<NativeImageOptions> na
         this.project = project;
         this.toolchainService = project.getExtensions().getByType(JavaToolchainService.class);
         this.defaultJavaLauncher = project.getObjects().property(JavaLauncher.class);
-        enableToolchainDetection();
+        getToolchainDetection().convention(true);
         nativeImages.configureEach(options -> options.getJavaLauncher().convention(defaultJavaLauncher));
         getTestSupport().convention(true);
+        configureToolchain();
     }
 
-    @Override
-    public void enableToolchainDetection() {
+    private void configureToolchain() {
         defaultJavaLauncher.convention(
-                toolchainService.launcherFor(spec -> {
-                    spec.getLanguageVersion().set(JavaLanguageVersion.of(JavaVersion.current().getMajorVersion()));
-                    if (GradleUtils.isAtLeastGradle7()) {
-                        spec.getVendor().set(JvmVendorSpec.matching("GraalVM"));
+                getToolchainDetection().flatMap(enabled -> {
+                    if (enabled) {
+                        return toolchainService.launcherFor(spec -> {
+                            spec.getLanguageVersion().set(JavaLanguageVersion.of(JavaVersion.current().getMajorVersion()));
+                            if (GradleUtils.isAtLeastGradle7()) {
+                                spec.getVendor().set(JvmVendorSpec.matching("GraalVM"));
+                            }
+                        });
                     }
+                    return null;
                 })
         );
     }
 
-    @Override
-    public void disableToolchainDetection() {
-        defaultJavaLauncher.convention((JavaLauncher) null);
-    }
-
     @Override
     public NamedDomainObjectContainer<NativeImageOptions> getBinaries() {
         return nativeImages;