Detect toolchainVersion when it is set in gradle.properties

Closes gh-100

Author: wilkinsona

README.md

@@ -28,7 +28,7 @@ The build scans will be customized to:
 - Add tags:
     - `JDK-<version>`.
       When using Maven, `<version>` is the specification version of the JDK running the build.
-      When using Gradle, `<version>` is the value of the `toolchainVersion` project property or, when not set, it's the specification version of the JDK running the build.
+      When using Gradle, `<version>` is the value of the `toolchainVersion` property or, when not set, it's the specification version of the JDK running the build.
     - `CI` or `Local` depending on where the build is executing.
     - `dirty` if the git working copy is dirty.
     - Name of the git branch being built.

develocity-conventions-gradle-plugin/src/main/java/io/spring/develocity/conventions/gradle/DevelocityConventionsPlugin.java

@@ -34,6 +34,7 @@
 import org.gradle.api.Plugin;
 import org.gradle.api.initialization.Settings;
 import org.gradle.api.internal.ProcessOperations;
+import org.gradle.api.provider.Provider;
 
 /**
  * {@link Plugin plugin} for configuring the use of Develocity hosted at
@@ -60,8 +61,7 @@ public void apply(Settings settings) {
 			return;
 		}
 		if (isBuildScanEnabled(settings)) {
-			configureBuildScanConventions(extension, extension.getBuildScan(), settings.getStartParameter(),
-					settings.getRootDir());
+			configureBuildScanConventions(extension, extension.getBuildScan(), settings);
 		}
 		if (settings.getStartParameter().isBuildCacheEnabled()) {
 			settings.buildCache((buildCacheConfiguration) -> new BuildCacheConventions()
@@ -99,16 +99,16 @@ private boolean containsPropertiesTask(StartParameter startParameter) {
 	}
 
 	private void configureBuildScanConventions(DevelocityConfiguration develocity, BuildScanConfiguration buildScan,
-			StartParameter startParameter, File rootDir) {
+			Settings settings) {
+		Provider<String> toolchainVersion = settings.getProviders().gradleProperty("toolchainVersion");
 		ProcessOperationsProcessRunner processRunner = new ProcessOperationsProcessRunner(
-				new WorkingDirectoryProcessOperations(this.processOperations, rootDir));
-		if (startParameter.isBuildScan()) {
+				new WorkingDirectoryProcessOperations(this.processOperations, settings.getRootDir()));
+		if (settings.getStartParameter().isBuildScan()) {
 			new AnonymousPublicationBuildScanConventions(processRunner) {
 
 				@Override
 				protected String getJdkVersion() {
-					String toolchainVersion = startParameter.getProjectProperties().get("toolchainVersion");
-					return (toolchainVersion != null) ? toolchainVersion : super.getJdkVersion();
+					return toolchainVersion.getOrElse(super.getJdkVersion());
 				}
 
 			}.execute(new GradleConfigurableDevelocity(develocity), new GradleConfigurableBuildScan(buildScan));
@@ -118,8 +118,7 @@ protected String getJdkVersion() {
 
 				@Override
 				protected String getJdkVersion() {
-					String toolchainVersion = startParameter.getProjectProperties().get("toolchainVersion");
-					return (toolchainVersion != null) ? toolchainVersion : super.getJdkVersion();
+					return toolchainVersion.getOrElse(super.getJdkVersion());
 				}
 
 			}.execute(new GradleConfigurableDevelocity(develocity), new GradleConfigurableBuildScan(buildScan));