Skip to content

Commit f35a109

Browse files
committed
EclipseWtpFormatterCommonTest::getSupportedVersions() now matches the previous behavior of EclipseWtpFormatterStepTest vs EclipseWtpFormatterStepTestOld.
1 parent 44ad6d9 commit f35a109

1 file changed

Lines changed: 7 additions & 5 deletions

File tree

lib-extra/src/test/java/com/diffplug/spotless/extra/wtp/EclipseWtpFormatterCommonTests.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@
2525
import java.util.Arrays;
2626
import java.util.Properties;
2727
import java.util.function.Consumer;
28-
import java.util.stream.Stream;
2928

3029
import org.junit.jupiter.api.Test;
3130
import org.junit.jupiter.api.condition.EnabledForJreRange;
3231

3332
import com.diffplug.spotless.FormatterStep;
33+
import com.diffplug.spotless.Jvm;
3434
import com.diffplug.spotless.extra.EclipseBasedStepBuilder;
3535
import com.diffplug.spotless.extra.eclipse.EclipseCommonTests;
3636

@@ -45,10 +45,12 @@ abstract class EclipseWtpFormatterCommonTests extends EclipseCommonTests {
4545

4646
@Override
4747
protected String[] getSupportedVersions() {
48-
String[] oldVersions = {"4.7.3a", "4.7.3b", "4.8.0", "4.12.0", "4.13.0", "4.14.0", "4.15.0",
49-
"4.16.0", "4.17.0", "4.18.0"};
50-
String[] newVersions = {"4.19.0"};
51-
return Stream.concat(Stream.of(oldVersions), Stream.of(newVersions)).toArray(String[]::new);
48+
if (Jvm.version() >= 11) {
49+
return new String[]{"4.19.0"};
50+
} else {
51+
return new String[]{"4.7.3a", "4.7.3b", "4.8.0", "4.12.0", "4.13.0", "4.14.0", "4.15.0",
52+
"4.16.0", "4.17.0", "4.18.0"};
53+
}
5254
}
5355

5456
@Override

0 commit comments

Comments
 (0)