Exclude empty toolchain versions from Gradle build scan

sbrannen · sbrannen · commit 2de7bf6e2bb8 · 2021-05-04T15:20:38.000+02:00
See gh-25787
diff --git 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()

Original file line number	Diff line number	Diff line change
`@@ -45,10 +45,10 @@ rootProject.children.each {project ->`
`45`	`45`	`settings.gradle.projectsLoaded {`
`46`	`46`	`gradleEnterprise {`
`47`	`47`	`buildScan {`
`48`		`- if (settings.gradle.rootProject.hasProperty('mainToolchain')) {`
	`48`	`+ if (settings.gradle.rootProject.hasProperty('mainToolchain') && settings.gradle.rootProject.getProperty('mainToolchain')) {`
`49`	`49`	`value("Main toolchain", 'JDK' + settings.gradle.rootProject.getProperty('mainToolchain'))`
`50`	`50`	`}`
`51`		`- if (settings.gradle.rootProject.hasProperty('testToolchain')) {`
	`51`	`+ if (settings.gradle.rootProject.hasProperty('testToolchain') && settings.gradle.rootProject.getProperty('testToolchain')) {`
`52`	`52`	`value("Test toolchain", 'JDK' + settings.gradle.rootProject.getProperty('testToolchain'))`
`53`	`53`	`}`
`54`	`54`	`File buildDir = settings.gradle.rootProject.getBuildDir()`