Allow configuration of scalaMajorVersion

Author: mdedetrich

lib/src/main/java/com/diffplug/spotless/scala/ScalaFmtStep.java

@@ -35,23 +35,35 @@ public class ScalaFmtStep {
 	private ScalaFmtStep() {}
 
 	private static final String DEFAULT_VERSION = "3.5.9";
+
+	private static final String DEFAULT_SCALA_MAJOR_VERSION = "2.13";
 	static final String NAME = "scalafmt";
-	static final String MAVEN_COORDINATE = "org.scalameta:scalafmt-core_2.13:";
+	static final String MAVEN_COORDINATE = "org.scalameta:scalafmt-core_";
 
 	public static FormatterStep create(Provisioner provisioner) {
-		return create(defaultVersion(), provisioner, null);
+		return create(defaultVersion(), defaultScalaMajorVersion(), provisioner, null);
 	}
 
 	public static FormatterStep create(String version, Provisioner provisioner, @Nullable File configFile) {
+		return create(version, defaultScalaMajorVersion(), provisioner, configFile);
+	}
+
+	public static FormatterStep create(String version, @Nullable String scalaMajorVersion, Provisioner provisioner, @Nullable File configFile) {
+		String finalScalaMajorVersion = scalaMajorVersion == null ? DEFAULT_SCALA_MAJOR_VERSION : scalaMajorVersion;
+
 		return FormatterStep.createLazy(NAME,
-				() -> new State(JarState.from(MAVEN_COORDINATE + version, provisioner), configFile),
+				() -> new State(JarState.from(MAVEN_COORDINATE + finalScalaMajorVersion + ":" + version, provisioner), configFile),
 				State::createFormat);
 	}
 
 	public static String defaultVersion() {
 		return DEFAULT_VERSION;
 	}
 
+	public static String defaultScalaMajorVersion() {
+		return DEFAULT_SCALA_MAJOR_VERSION;
+	}
+
 	static final class State implements Serializable {
 		private static final long serialVersionUID = 1L;
 

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

@@ -48,21 +48,29 @@ public ScalaFmtConfig scalafmt(String version) {
 	public class ScalaFmtConfig {
 		final String version;
 		@Nullable
+		String scalaMajorVersion;
+		@Nullable
 		Object configFile;
 
 		ScalaFmtConfig(String version) {
 			this.version = Objects.requireNonNull(version);
-			addStep(createStep());
 		}
 
-		public void configFile(Object configFile) {
+		public ScalaFmtConfig configFile(Object configFile) {
 			this.configFile = Objects.requireNonNull(configFile);
 			replaceStep(createStep());
+			return this;
+		}
+
+		public ScalaFmtConfig scalaMajorVersion(String scalaMajorVersion) {
+			this.scalaMajorVersion = Objects.requireNonNull(scalaMajorVersion);
+			replaceStep(createStep());
+			return this;
 		}
 
 		private FormatterStep createStep() {
 			File resolvedConfigFile = configFile == null ? null : getProject().file(configFile);
-			return ScalaFmtStep.create(version, provisioner(), resolvedConfigFile);
+			return ScalaFmtStep.create(version, scalaMajorVersion, provisioner(), resolvedConfigFile);
 		}
 	}
 

plugin-maven/src/main/java/com/diffplug/spotless/maven/scala/Scalafmt.java

@@ -32,10 +32,14 @@ public class Scalafmt implements FormatterStepFactory {
 	@Parameter
 	private String version;
 
+	@Parameter
+	private String scalaMajorVersion;
+
 	@Override
 	public FormatterStep newFormatterStep(FormatterStepConfig config) {
 		String scalafmtVersion = version != null ? version : ScalaFmtStep.defaultVersion();
+		String scalafmtScalaMajorVersion = scalaMajorVersion != null ? scalaMajorVersion : ScalaFmtStep.defaultScalaMajorVersion();
 		File configFile = config.getFileLocator().locateFile(file);
-		return ScalaFmtStep.create(scalafmtVersion, config.getProvisioner(), configFile);
+		return ScalaFmtStep.create(scalafmtVersion, scalafmtScalaMajorVersion, config.getProvisioner(), configFile);
 	}
 }