Fix 6.1 checkstyle report finalizer failure

changelog/@unreleased/pr-1176.v2.yml

@@ -0,0 +1,7 @@
+type: fix
+fix:
+  description: Errors of the form `The value for Report xml property 'required' is
+    final and cannot be changed any further.` in Gradle 6.1 are now fixed for the
+    `com.palantir.junit-reports` plugin.
+  links:
+  - https://github.com/palantir/gradle-baseline/pull/1176

gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineCheckstyle.java

@@ -54,8 +54,8 @@ public void apply(Project project) {
 
         project.getExtensions()
                 .getByType(CheckstyleExtension.class)
-                .setConfigDir(this.project.file(
-                        Paths.get(getConfigDir(), "checkstyle").toString()));
+                .getConfigDirectory()
+                .set(this.project.file(Paths.get(getConfigDir(), "checkstyle").toString()));
         project.getPluginManager().withPlugin("eclipse", plugin -> {
             EclipseProject eclipseProject =
                     project.getExtensions().getByType(EclipseModel.class).getProject();

gradle-baseline-java/src/test/groovy/com/palantir/baseline/JunitReportsPluginSpec.groovy

@@ -0,0 +1,59 @@
+/*
+ * (c) Copyright 2020 Palantir Technologies Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.palantir.baseline
+
+import nebula.test.IntegrationSpec
+import nebula.test.functional.ExecutionResult
+import spock.lang.Unroll
+
+@Unroll
+class JunitReportsPluginSpec extends IntegrationSpec {
+    private static final List<String> GRADLE_TEST_VERSIONS = ['5.6.4', '6.1']
+
+    def '#gradleVersionNumber: configures the checkstlye plugin correctly'() {
+        setup:
+        gradleVersion = gradleVersionNumber
+
+        when:
+        buildFile << '''
+            apply plugin: 'java'
+            apply plugin: 'checkstyle'
+            apply plugin: 'com.palantir.junit-reports'
+
+            repositories {
+                jcenter()
+            }
+        '''.stripIndent()
+
+        file('src/main/java/foo/Foo.java') << '''
+            package foo;
+            public class Foo {}
+        '''.stripIndent()
+
+        ExecutionResult executionResult = runTasks('checkstyleMain')
+
+        then:
+        // Running checkstyle inside nebula does not work as there are classpath problems that result in the `groovy-all`
+        // not being on Gradle's classpath. So the best we can do to verify that the checkstyle actually ran is to
+        // verify we get the classpath error that happens when the checkstyle class runs :(
+        // https://github.com/gradle/gradle/issues/3995
+        executionResult.standardError.contains 'java.lang.ClassNotFoundException: groovy.util.AntBuilder'
+
+        where:
+        gradleVersionNumber << GRADLE_TEST_VERSIONS
+    }
+}

gradle-junit-reports/build.gradle

@@ -12,4 +12,5 @@ dependencies {
   testCompile 'junit:junit'
   testCompile 'org.assertj:assertj-core'
   testCompile 'org.mockito:mockito-core'
+  testImplementation 'com.netflix.nebula:nebula-test'
 }

gradle-junit-reports/src/main/java/com/palantir/gradle/junit/JunitReportsFinalizer.java

@@ -29,6 +29,7 @@
 import org.gradle.api.file.DirectoryProperty;
 import org.gradle.api.file.RegularFileProperty;
 import org.gradle.api.provider.Provider;
+import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.TaskAction;
 import org.w3c.dom.Document;
 
@@ -61,6 +62,7 @@ public static void registerFinalizer(
     @Inject
     public JunitReportsFinalizer() {}
 
+    @Input
     public final Task getStyleTask() {
         return styleTask;
     }
@@ -69,6 +71,7 @@ public final void setStyleTask(Task styleTask) {
         this.styleTask = styleTask;
     }
 
+    @Input
     public final TaskTimer getTaskTimer() {
         return taskTimer;
     }
@@ -77,6 +80,7 @@ public final void setTaskTimer(TaskTimer taskTimer) {
         this.taskTimer = taskTimer;
     }
 
+    @Input
     public final FailuresSupplier getFailuresSupplier() {
         return failuresSupplier;
     }
@@ -85,10 +89,12 @@ public final void setFailuresSupplier(FailuresSupplier failuresSupplier) {
         this.failuresSupplier = failuresSupplier;
     }
 
+    @Input
     public final RegularFileProperty getTargetFile() {
         return targetFile;
     }
 
+    @Input
     public final DirectoryProperty getReportDir() {
         return reportDir;
     }

gradle-junit-reports/src/main/java/com/palantir/gradle/junit/XmlReportFailuresSupplier.java

@@ -23,6 +23,7 @@
 import java.util.List;
 import java.util.UUID;
 import org.gradle.api.Action;
+import org.gradle.api.Project;
 import org.gradle.api.Task;
 import org.gradle.api.reporting.ReportContainer;
 import org.gradle.api.reporting.Reporting;
@@ -33,13 +34,13 @@ public final class XmlReportFailuresSupplier implements FailuresSupplier {
     public static <T extends Task & Reporting<? extends ReportContainer<SingleFileReport>>>
             XmlReportFailuresSupplier create(final T task, final ReportHandler<T> reportHandler) {
         // Ensure any necessary output is enabled
-        task.doFirst(new Action<Task>() {
+        task.getProject().afterEvaluate(new Action<Project>() {
             @Override
-            @SuppressWarnings("StrictUnusedVariable")
-            public void execute(Task ignored) {
+            public void execute(Project _project) {
                 reportHandler.configureTask(task);
             }
         });
+
         return new XmlReportFailuresSupplier(task, reportHandler);
     }