new step to expand java wildcard imports diffplug#2744 diffplug#2594

Author: Vincent Potucek

gradle/spotless.gradle

@@ -7,7 +7,6 @@ spotless {
 			eclipse().configFile rootProject.file('gradle/spotless.eclipseformat.xml')
 			expandWildcardImports()
 			forbidRegex('ForbidGradleInternal', 'import org\\.gradle\\.api\\.internal\\.(.*)', "Don't use Gradle's internal API")
-			forbidWildcardImports()
 			formatAnnotations()
 			importOrderFile   rootProject.file('gradle/spotless.importorder')
 			licenseHeaderFile rootProject.file('gradle/spotless.license')

lib/src/main/java/com/diffplug/spotless/java/ForbidWildcardImportsStep.java

@@ -18,7 +18,12 @@
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.generic.ReplaceRegexStep;
 
-/** Forbids any wildcard import statements. */
+/**
+ * Forbids any wildcard import statements.
+ *
+ * @deprecated Use {@link ExpandWildcardImportsStep}
+ */
+@Deprecated(forRemoval = true)
 public final class ForbidWildcardImportsStep {
 
 	/**

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

@@ -161,8 +161,10 @@ public void removeUnusedImports(String formatter) {
 	public void removeWildcardImports() {
 		System.err.println("`removeWildcardImports()` replaced by `forbidWildcardImports()`");
 		forbidWildcardImports();
+		expandWildcardImports();
 	}
 
+	@Deprecated
 	public void forbidWildcardImports() {
 		addStep(ForbidWildcardImportsStep.create());
 	}