From 2de7bf6e2bb8804b23b53c9ba094d6e73cdcf508 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 4 May 2021 15:20:38 +0200
Subject: [PATCH] Exclude empty toolchain versions from Gradle build scan

See gh-25787
---
 settings.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/settings.gradle b/settings.gradle
index 8c1472350f1..4779c598108 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -45,10 +45,10 @@ rootProject.children.each {project ->
 settings.gradle.projectsLoaded {
 	gradleEnterprise {
 		buildScan {
-			if (settings.gradle.rootProject.hasProperty('mainToolchain')) {
+			if (settings.gradle.rootProject.hasProperty('mainToolchain') && settings.gradle.rootProject.getProperty('mainToolchain')) {
 				value("Main toolchain", 'JDK' + settings.gradle.rootProject.getProperty('mainToolchain'))
 			}
-			if (settings.gradle.rootProject.hasProperty('testToolchain')) {
+			if (settings.gradle.rootProject.hasProperty('testToolchain') && settings.gradle.rootProject.getProperty('testToolchain')) {
 				value("Test toolchain", 'JDK' + settings.gradle.rootProject.getProperty('testToolchain'))
 			}
 			File buildDir = settings.gradle.rootProject.getBuildDir()