Every FormatExtension needs its contructor to change from SpotlessExtension to SpotlessExtensionBase.

nedtwigg · nedtwigg · commit 79b210a6b16e · 2020-06-04T16:13:39.000-07:00
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java
@@ -26,7 +26,7 @@
 public class CppExtension extends FormatExtension implements HasBuiltinDelimiterForLicense {
 	static final String NAME = "cpp";
 
-	public CppExtension(SpotlessExtension spotless) {
+	public CppExtension(SpotlessExtensionBase spotless) {
 		super(spotless);
 	}
 
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CssExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CssExtension.java
@@ -30,7 +30,7 @@
 public class CssExtension extends FormatExtension implements HasBuiltinDelimiterForLicense {
 	static final String NAME = "css";
 
-	public CssExtension(SpotlessExtension spotless) {
+	public CssExtension(SpotlessExtensionBase spotless) {
 		super(spotless);
 	}
 
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
@@ -55,9 +55,9 @@
 
 /** Adds a `spotless{Name}Check` and `spotless{Name}Apply` task. */
 public class FormatExtension {
-	final SpotlessExtension spotless;
+	final SpotlessExtensionBase spotless;
 
-	public FormatExtension(SpotlessExtension spotless) {
+	public FormatExtension(SpotlessExtensionBase spotless) {
 		this.spotless = Objects.requireNonNull(spotless);
 	}
 
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java
@@ -33,7 +33,7 @@ public class FreshMarkExtension extends FormatExtension {
 
 	public final List<Action<Map<String, Object>>> propertyActions = new ArrayList<>();
 
-	public FreshMarkExtension(SpotlessExtension spotless) {
+	public FreshMarkExtension(SpotlessExtensionBase spotless) {
 		super(spotless);
 		addStep(FreshMarkStep.create(() -> {
 			Map<String, Object> map = new HashMap<>();
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java
@@ -38,7 +38,7 @@
 public class GroovyExtension extends FormatExtension implements HasBuiltinDelimiterForLicense {
 	static final String NAME = "groovy";
 
-	public GroovyExtension(SpotlessExtension spotless) {
+	public GroovyExtension(SpotlessExtensionBase spotless) {
 		super(spotless);
 	}
 
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java
@@ -24,7 +24,7 @@ public class GroovyGradleExtension extends FormatExtension {
 	private static final String GRADLE_FILE_EXTENSION = "*.gradle";
 	static final String NAME = "groovyGradle";
 
-	public GroovyGradleExtension(SpotlessExtension spotless) {
+	public GroovyGradleExtension(SpotlessExtensionBase spotless) {
 		super(spotless);
 	}
 
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
@@ -40,7 +40,7 @@
 public class JavaExtension extends FormatExtension implements HasBuiltinDelimiterForLicense {
 	static final String NAME = "java";
 
-	public JavaExtension(SpotlessExtension spotless) {
+	public JavaExtension(SpotlessExtensionBase spotless) {
 		super(spotless);
 	}
 
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java
@@ -33,7 +33,7 @@
 public class KotlinExtension extends FormatExtension implements HasBuiltinDelimiterForLicense {
 	static final String NAME = "kotlin";
 
-	public KotlinExtension(SpotlessExtension spotless) {
+	public KotlinExtension(SpotlessExtensionBase spotless) {
 		super(spotless);
 	}
 
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java
@@ -29,7 +29,7 @@ public class KotlinGradleExtension extends FormatExtension {
 
 	static final String NAME = "kotlinGradle";
 
-	public KotlinGradleExtension(SpotlessExtension spotless) {
+	public KotlinGradleExtension(SpotlessExtensionBase spotless) {
 		super(spotless);
 	}
 
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java
@@ -31,7 +31,7 @@
 public class ScalaExtension extends FormatExtension {
 	static final String NAME = "scala";
 
-	public ScalaExtension(SpotlessExtension spotless) {
+	public ScalaExtension(SpotlessExtensionBase spotless) {
 		super(spotless);
 	}
 
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java
@@ -25,7 +25,7 @@
 public class SqlExtension extends FormatExtension {
 	static final String NAME = "sql";
 
-	public SqlExtension(SpotlessExtension spotless) {
+	public SqlExtension(SpotlessExtensionBase spotless) {
 		super(spotless);
 	}
 
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java
@@ -36,7 +36,7 @@ public class TypescriptExtension extends FormatExtension {
 
 	static final String NAME = "typescript";
 
-	public TypescriptExtension(SpotlessExtension spotless) {
+	public TypescriptExtension(SpotlessExtensionBase spotless) {
 		super(spotless);
 	}
 
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/XmlExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/XmlExtension.java
@@ -30,7 +30,7 @@
 public class XmlExtension extends FormatExtension implements HasBuiltinDelimiterForLicense {
 	static final String NAME = "xml";
 
-	public XmlExtension(SpotlessExtension spotless) {
+	public XmlExtension(SpotlessExtensionBase spotless) {
 		super(spotless);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`public class CppExtension extends FormatExtension implements HasBuiltinDelimiterForLicense {`
`27`	`27`	`static final String NAME = "cpp";`
`28`	`28`
`29`		`- public CppExtension(SpotlessExtension spotless) {`
	`29`	`+ public CppExtension(SpotlessExtensionBase spotless) {`
`30`	`30`	`super(spotless);`
`31`	`31`	`}`
`32`	`32`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`	`public class CssExtension extends FormatExtension implements HasBuiltinDelimiterForLicense {`
`31`	`31`	`static final String NAME = "css";`
`32`	`32`
`33`		`- public CssExtension(SpotlessExtension spotless) {`
	`33`	`+ public CssExtension(SpotlessExtensionBase spotless) {`
`34`	`34`	`super(spotless);`
`35`	`35`	`}`
`36`	`36`
Original file line number	Diff line number	Diff line change
`@@ -55,9 +55,9 @@`
`55`	`55`
`56`	`56`	/** Adds a `spotless{Name}Check` and `spotless{Name}Apply` task. */
`57`	`57`	`public class FormatExtension {`
`58`		`- final SpotlessExtension spotless;`
	`58`	`+ final SpotlessExtensionBase spotless;`
`59`	`59`
`60`		`- public FormatExtension(SpotlessExtension spotless) {`
	`60`	`+ public FormatExtension(SpotlessExtensionBase spotless) {`
`61`	`61`	`this.spotless = Objects.requireNonNull(spotless);`
`62`	`62`	`}`
`63`	`63`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@`
`38`	`38`	`public class GroovyExtension extends FormatExtension implements HasBuiltinDelimiterForLicense {`
`39`	`39`	`static final String NAME = "groovy";`
`40`	`40`
`41`		`- public GroovyExtension(SpotlessExtension spotless) {`
	`41`	`+ public GroovyExtension(SpotlessExtensionBase spotless) {`
`42`	`42`	`super(spotless);`
`43`	`43`	`}`
`44`	`44`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public class GroovyGradleExtension extends FormatExtension {`
`24`	`24`	`private static final String GRADLE_FILE_EXTENSION = "*.gradle";`
`25`	`25`	`static final String NAME = "groovyGradle";`
`26`	`26`
`27`		`- public GroovyGradleExtension(SpotlessExtension spotless) {`
	`27`	`+ public GroovyGradleExtension(SpotlessExtensionBase spotless) {`
`28`	`28`	`super(spotless);`
`29`	`29`	`}`
`30`	`30`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@`
`40`	`40`	`public class JavaExtension extends FormatExtension implements HasBuiltinDelimiterForLicense {`
`41`	`41`	`static final String NAME = "java";`
`42`	`42`
`43`		`- public JavaExtension(SpotlessExtension spotless) {`
	`43`	`+ public JavaExtension(SpotlessExtensionBase spotless) {`
`44`	`44`	`super(spotless);`
`45`	`45`	`}`
`46`	`46`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@`
`33`	`33`	`public class KotlinExtension extends FormatExtension implements HasBuiltinDelimiterForLicense {`
`34`	`34`	`static final String NAME = "kotlin";`
`35`	`35`
`36`		`- public KotlinExtension(SpotlessExtension spotless) {`
	`36`	`+ public KotlinExtension(SpotlessExtensionBase spotless) {`
`37`	`37`	`super(spotless);`
`38`	`38`	`}`
`39`	`39`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public class KotlinGradleExtension extends FormatExtension {`
`29`	`29`
`30`	`30`	`static final String NAME = "kotlinGradle";`
`31`	`31`
`32`		`- public KotlinGradleExtension(SpotlessExtension spotless) {`
	`32`	`+ public KotlinGradleExtension(SpotlessExtensionBase spotless) {`
`33`	`33`	`super(spotless);`
`34`	`34`	`}`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`public class ScalaExtension extends FormatExtension {`
`32`	`32`	`static final String NAME = "scala";`
`33`	`33`
`34`		`- public ScalaExtension(SpotlessExtension spotless) {`
	`34`	`+ public ScalaExtension(SpotlessExtensionBase spotless) {`
`35`	`35`	`super(spotless);`
`36`	`36`	`}`
`37`	`37`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`public class SqlExtension extends FormatExtension {`
`26`	`26`	`static final String NAME = "sql";`
`27`	`27`
`28`		`- public SqlExtension(SpotlessExtension spotless) {`
	`28`	`+ public SqlExtension(SpotlessExtensionBase spotless) {`
`29`	`29`	`super(spotless);`
`30`	`30`	`}`
`31`	`31`