New task :plugin-gradle:modernTest (also CI job) which runs all tests using the new modern implementation.

Author: nedtwigg

.circleci/config.yml

@@ -92,6 +92,17 @@ jobs:
           command: ./gradlew :plugin-maven:check --build-cache
       - store_test_results:
           path: plugin-maven/build/test-results/test
+  test_gradle_modern_8:
+    << : *env_gradle
+    steps:
+      - checkout
+      - *restore_cache_wrapper
+      - *restore_cache_deps
+      - run:
+          name: gradlew :plugin-gradle:modernTest
+          command: ./gradlew :plugin-gradle:modernTest --build-cache
+      - store_test_results:
+          path: plugin-gradle/build/test-results/modernTest
   test_npm_8:
     << : *env_gradle
     docker:

plugin-gradle/build.gradle

@@ -41,6 +41,13 @@ task npmTest(type: Test) {
 	}
 }
 
+task modernTest(type: Test) {
+	systemProperty 'spotlessModern', 'true'
+	useJUnit {
+		excludeCategories 'com.diffplug.spotless.category.NpmTest', 'com.diffplug.gradle.spotless.ExcludeFromPluginGradleModern'
+	}
+}
+
 // make it easy for eclipse to run against latest build
 tasks.eclipse.dependsOn(pluginUnderTestMetadata)
 

plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessPlugin.java

@@ -28,6 +28,11 @@ public class SpotlessPlugin implements Plugin<Project> {
 
 	@Override
 	public void apply(Project project) {
+		// if -PspotlessModern=true, then use the modern stuff instead of the legacy stuff
+		if (project.hasProperty(SpotlessPluginModern.SPOTLESS_MODERN) && project.findProperty(SpotlessPluginModern.SPOTLESS_MODERN).equals("true")) {
+			new SpotlessPluginModern().apply(project);
+			return;
+		}
 		// make sure there's a `clean` task
 		project.getPlugins().apply(BasePlugin.class);
 

plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessPluginModern.java

@@ -23,6 +23,9 @@
 import com.diffplug.spotless.SpotlessCache;
 
 public class SpotlessPluginModern implements Plugin<Project> {
+	static final String SPOTLESS_MODERN = "spotlessModern";
+	static final String MINIMUM_GRADLE = "5.4";
+
 	@Override
 	public void apply(Project project) {
 		// make sure there's a `clean` task

plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ErrorShouldRethrowJre8Test.java

@@ -58,7 +58,7 @@ public void passesIfNoException() throws Exception {
 				"    } // format",
 				"}     // spotless");
 		setFile("README.md").toContent("This code is fun.");
-		runWithSuccess(":spotlessMisc");
+		runWithSuccess("> Task :spotlessMisc");
 	}
 
 	@Test
@@ -68,9 +68,9 @@ public void anyExceptionShouldFail() throws Exception {
 				"}     // spotless");
 		setFile("README.md").toContent("This code is fubar.");
 		runWithFailure(
-				":spotlessMiscStep 'no swearing' found problem in 'README.md':",
-				"No swearing!",
-				"java.lang.RuntimeException: No swearing!");
+				"> Task :spotlessMisc FAILED",
+				"Step 'no swearing' found problem in 'README.md':",
+				"No swearing!");
 	}
 
 	@Test
@@ -80,7 +80,7 @@ public void unlessEnforceCheckIsFalse() throws Exception {
 				"    enforceCheck false",
 				"}     // spotless");
 		setFile("README.md").toContent("This code is fubar.");
-		runWithSuccess(":compileJava UP-TO-DATE");
+		runWithSuccess("> Task :compileJava NO-SOURCE");
 	}
 
 	@Test
@@ -90,7 +90,7 @@ public void unlessExemptedByStep() throws Exception {
 				"    } // format",
 				"}     // spotless");
 		setFile("README.md").toContent("This code is fubar.");
-		runWithSuccess(":spotlessMisc",
+		runWithSuccess("> Task :spotlessMisc",
 				"Unable to apply step 'no swearing' to 'README.md'");
 	}
 
@@ -101,7 +101,7 @@ public void unlessExemptedByPath() throws Exception {
 				"    } // format",
 				"}     // spotless");
 		setFile("README.md").toContent("This code is fubar.");
-		runWithSuccess(":spotlessMisc",
+		runWithSuccess("> Task :spotlessMisc",
 				"Unable to apply step 'no swearing' to 'README.md'");
 	}
 
@@ -114,34 +114,37 @@ public void failsIfNeitherStepNorFileExempted() throws Exception {
 				"}     // spotless");
 		setFile("README.md").toContent("This code is fubar.");
 		runWithFailure(
-				":spotlessMiscStep 'no swearing' found problem in 'README.md':",
-				"No swearing!",
-				"java.lang.RuntimeException: No swearing!");
+				"> Task :spotlessMisc FAILED",
+				"Step 'no swearing' found problem in 'README.md':",
+				"No swearing!");
 	}
 
 	private void runWithSuccess(String... messages) throws Exception {
 		if (JreVersion.thisVm() != JreVersion._8) {
 			return;
 		}
-		BuildResult result = gradleRunner().withArguments("check").build();
+		BuildResult result = gradleRunner().withGradleVersion(SpotlessPluginModern.MINIMUM_GRADLE).withArguments("check").build();
 		assertResultAndMessages(result, TaskOutcome.SUCCESS, messages);
 	}
 
 	private void runWithFailure(String... messages) throws Exception {
 		if (JreVersion.thisVm() != JreVersion._8) {
 			return;
 		}
-		BuildResult result = gradleRunner().withArguments("check").buildAndFail();
+		BuildResult result = gradleRunner().withGradleVersion(SpotlessPluginModern.MINIMUM_GRADLE).withArguments("check").buildAndFail();
 		assertResultAndMessages(result, TaskOutcome.FAILED, messages);
 	}
 
 	private void assertResultAndMessages(BuildResult result, TaskOutcome outcome, String... messages) {
 		String expectedToStartWith = StringPrinter.buildStringFromLines(messages).trim();
 		int numNewlines = CharMatcher.is('\n').countIn(expectedToStartWith);
-		List<String> actualLines = Splitter.on('\n').splitToList(LineEnding.toUnix(result.getOutput()));
+		List<String> actualLines = Splitter.on('\n').splitToList(LineEnding.toUnix(result.getOutput().trim()));
 		String actualStart = String.join("\n", actualLines.subList(0, numNewlines + 1));
 		Assertions.assertThat(actualStart).isEqualTo(expectedToStartWith);
-		Assertions.assertThat(result.tasks(outcome).size() + result.tasks(TaskOutcome.UP_TO_DATE).size())
+		//		result.getTasks()
+		//		.stream()
+		//		.forEach(task -> System.out.println("task " + task.getPath() + " " + task.getOutcome()));
+		Assertions.assertThat(result.tasks(outcome).size() + result.tasks(TaskOutcome.UP_TO_DATE).size() + result.tasks(TaskOutcome.NO_SOURCE).size())
 				.isEqualTo(result.getTasks().size());
 	}
 }

plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ExcludeFromPluginGradleModern.java

@@ -0,0 +1,20 @@
+/*
+ * Copyright 2020 DiffPlug
+ *
+ * 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.diffplug.gradle.spotless;
+
+public interface ExcludeFromPluginGradleModern {
+
+}

plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java

@@ -31,6 +31,7 @@
 
 import com.diffplug.common.base.Errors;
 import com.diffplug.common.base.StringPrinter;
+import com.diffplug.common.collect.ImmutableMap;
 import com.diffplug.common.tree.TreeDef;
 import com.diffplug.common.tree.TreeStream;
 import com.diffplug.spotless.JreVersion;
@@ -74,10 +75,15 @@ protected static String requestGradleForJre8and11(String ver) {
 	}
 
 	protected final GradleRunner gradleRunner() throws IOException {
-		return GradleRunner.create()
+		GradleRunner runner = GradleRunner.create()
 				.withGradleVersion(requestGradleForJre8and11("2.14"))
 				.withProjectDir(rootFolder())
 				.withPluginClasspath();
+		if ("true".equals(System.getProperty(SpotlessPluginModern.SPOTLESS_MODERN))) {
+			runner.withEnvironment(ImmutableMap.of("ORG_GRADLE_PROJECT_" + SpotlessPluginModern.SPOTLESS_MODERN, "true"));
+			runner.withGradleVersion(SpotlessPluginModern.MINIMUM_GRADLE);
+		}
+		return runner;
 	}
 
 	/** Dumps the complete file contents of the folder to the console. */

plugin-gradle/src/test/java/com/diffplug/gradle/spotless/IdeHookTest.java

@@ -21,7 +21,6 @@
 import java.nio.charset.StandardCharsets;
 
 import org.assertj.core.api.Assertions;
-import org.gradle.testkit.runner.GradleRunner;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -70,7 +69,8 @@ private void runWith(String... arguments) throws IOException {
 			// gradle 2.14 -> 4.6 confirmed to work
 			// gradle 4.7 -> 5.1 don't work in tooling API because of https://github.com/gradle/gradle/issues/7617
 			// gradle 5.1 -> current confirmed to work
-			GradleRunner.create()
+			gradleRunner()
+					.withGradleVersion(SpotlessPluginModern.MINIMUM_GRADLE)
 					.withProjectDir(rootFolder())
 					.withPluginClasspath()
 					.withArguments(arguments)

plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SpecificFilesTest.java

@@ -21,9 +21,11 @@
 import org.gradle.testkit.runner.UnexpectedBuildFailure;
 import org.junit.Ignore;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
 import com.diffplug.spotless.LineEnding;
 
+@Category(ExcludeFromPluginGradleModern.class)
 public class SpecificFilesTest extends GradleIntegrationHarness {
 
 	private static String regexWinSafe(String input) {