Upgrade to GE plugin 3.8 and require at least 3.7

build.gradle

@@ -49,7 +49,7 @@ compatibilityTest {
 		gePlugin.groupId = 'com.gradle'
 		gePlugin.artifactId = 'gradle-enterprise-gradle-plugin'
 		gePlugin.versions = [
-			'3.1.1', '3.2.1', '3.3.4', '3.4.1', '3.5.2'
+			'3.7.2'
 		]
 	}
 }

gradle.properties

@@ -1,4 +1,4 @@
 version=0.0.9-SNAPSHOT
 
-gradleEnterprisePluginVersion=3.7.2
+gradleEnterprisePluginVersion=3.8
 javaFormatVersion=0.0.27

src/main/java/io/spring/ge/conventions/gradle/BuildScanConventions.java

@@ -56,19 +56,20 @@ class BuildScanConventions implements Action<BuildScanExtension> {
 	 * @param buildScan build scan to be configured
 	 */
 	@Override
+	@SuppressWarnings("deprecation")
 	public void execute(BuildScanExtension buildScan) {
-		buildScan.setCaptureTaskInputFiles(true);
 		buildScan.obfuscation((obfuscation) -> obfuscation.ipAddresses(
 				(addresses) -> addresses.stream().map((address) -> "0.0.0.0").collect(Collectors.toList())));
 		configurePublishing(buildScan);
 		tagBuildScan(buildScan);
 		buildScan.background(this::addGitMetadata);
 		addCiMetadata(buildScan);
+		buildScan.setUploadInBackground(!isCi());
 		try {
-			buildScan.setUploadInBackground(!isCi());
+			buildScan.capture((settings) -> settings.setTaskInputFiles(true));
 		}
 		catch (NoSuchMethodError ex) {
-			// GE Plugin version < 3.3. Continue
+			buildScan.setCaptureTaskInputFiles(true);
 		}
 	}
 

src/test/java/io/spring/ge/conventions/gradle/BuildScanConventionsTests.java

@@ -42,7 +42,7 @@ class BuildScanConventionsTests {
 	@Test
 	void capturingOfTaskInputsIsEnabled() {
 		new BuildScanConventions(this.processRunner).execute(this.buildScan);
-		assertThat(this.buildScan.captureTaskInputFiles).isTrue();
+		assertThat(this.buildScan.captureSettings.isTaskInputFiles()).isTrue();
 	}
 
 	@Test

src/test/java/io/spring/ge/conventions/gradle/TestBuildScanExtension.java

@@ -24,6 +24,7 @@
 import java.util.function.Function;
 
 import com.gradle.scan.plugin.BuildResult;
+import com.gradle.scan.plugin.BuildScanCaptureSettings;
 import com.gradle.scan.plugin.BuildScanDataObfuscation;
 import com.gradle.scan.plugin.BuildScanExtension;
 import com.gradle.scan.plugin.PublishedBuildScan;
@@ -44,7 +45,7 @@ public final class TestBuildScanExtension implements BuildScanExtension {
 
 	final Map<String, String> links = new HashMap<>();
 
-	boolean captureTaskInputFiles;
+	final TestBuildScanCaptureSettings captureSettings = new TestBuildScanCaptureSettings();
 
 	boolean publishAlways;
 
@@ -95,8 +96,9 @@ public String getTermsOfServiceUrl() {
 	}
 
 	@Override
+	@Deprecated
 	public boolean isCaptureTaskInputFiles() {
-		return this.captureTaskInputFiles;
+		return this.captureSettings.isTaskInputFiles();
 	}
 
 	@Override
@@ -139,8 +141,9 @@ public void setAllowUntrustedServer(boolean allow) {
 	}
 
 	@Override
+	@Deprecated
 	public void setCaptureTaskInputFiles(boolean capture) {
-		this.captureTaskInputFiles = capture;
+		this.captureSettings.setTaskInputFiles(capture);
 	}
 
 	@Override
@@ -178,6 +181,16 @@ public void setUploadInBackground(boolean uploadInBackground) {
 		this.uploadInBackground = uploadInBackground;
 	}
 
+	@Override
+	public void capture(Action<? super BuildScanCaptureSettings> action) {
+		action.execute(this.captureSettings);
+	}
+
+	@Override
+	public BuildScanCaptureSettings getCapture() {
+		throw new UnsupportedOperationException();
+	}
+
 	static final class TestBuildScanDataObfuscation implements BuildScanDataObfuscation {
 
 		Function<? super List<InetAddress>, ? extends List<String>> ipAddressesObfuscator;
@@ -199,4 +212,40 @@ public void username(Function<? super String, ? extends String> obfuscator) {
 
 	}
 
+	static final class TestBuildScanCaptureSettings implements BuildScanCaptureSettings {
+
+		private boolean taskInputFiles;
+
+		@Override
+		public boolean isBuildLogging() {
+			throw new UnsupportedOperationException();
+		}
+
+		@Override
+		public boolean isTaskInputFiles() {
+			return this.taskInputFiles;
+		}
+
+		@Override
+		public boolean isTestLogging() {
+			throw new UnsupportedOperationException();
+		}
+
+		@Override
+		public void setBuildLogging(boolean capture) {
+			throw new UnsupportedOperationException();
+		}
+
+		@Override
+		public void setTaskInputFiles(boolean capture) {
+			this.taskInputFiles = capture;
+		}
+
+		@Override
+		public void setTestLogging(boolean capture) {
+			throw new UnsupportedOperationException();
+		}
+
+	}
+
 }