Skip to content

Commit 646a598

Browse files
author
Alex Simkin
committed
Added scalafmt 3 support
1 parent 2ade60a commit 646a598

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

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

+7-3
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,12 @@ public class ScalaFmtStep {
4040
private ScalaFmtStep() {}
4141

4242
private static final Pattern VERSION_PRE_2_0 = Pattern.compile("[10]\\.(\\d+)\\.\\d+");
43+
private static final Pattern VERSION_PRE_3_0 = Pattern.compile("2\\.(\\d+)\\.\\d+");
4344
private static final String DEFAULT_VERSION = "2.0.1";
4445
static final String NAME = "scalafmt";
4546
static final String MAVEN_COORDINATE_PRE_2_0 = "com.geirsson:scalafmt-core_2.11:";
46-
static final String MAVEN_COORDINATE = "org.scalameta:scalafmt-core_2.11:";
47+
static final String MAVEN_COORDINATE_PRE_3_0 = "org.scalameta:scalafmt-core_2.11:";
48+
static final String MAVEN_COORDINATE = "org.scalameta:scalafmt-core_2.13:";
4749

4850
public static FormatterStep create(Provisioner provisioner) {
4951
return create(defaultVersion(), provisioner, null);
@@ -69,9 +71,11 @@ static final class State implements Serializable {
6971

7072
State(String version, Provisioner provisioner, @Nullable File configFile) throws IOException {
7173
String mavenCoordinate;
72-
Matcher versionMatcher = VERSION_PRE_2_0.matcher(version);
73-
if (versionMatcher.matches()) {
74+
Matcher versionMatcher;
75+
if ((versionMatcher = VERSION_PRE_2_0.matcher()).matches()) {
7476
mavenCoordinate = MAVEN_COORDINATE_PRE_2_0;
77+
} else if ((versionMatcher = VERSION_PRE_3_0.matcher()).matches()) {
78+
mavenCoordinate = MAVEN_COORDINATE_PRE_3_0;
7579
} else {
7680
mavenCoordinate = MAVEN_COORDINATE;
7781
}

0 commit comments

Comments
 (0)