Skip to content

Commit 48c9e4f

Browse files
authored
Remove Java 17 lower dependency versions in lib (#2764)
2 parents 7f90d65 + d83b07c commit 48c9e4f

File tree

5 files changed

+4
-6
lines changed

5 files changed

+4
-6
lines changed

lib-extra/src/main/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStep.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public final class GrEclipseFormatterStep {
3333
private GrEclipseFormatterStep() {}
3434

3535
private static final String NAME = "eclipse groovy formatter";
36-
private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "4.26").add(17, "4.35");
36+
private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(17, "4.35");
3737

3838
public static String defaultVersion() {
3939
return JVM_SUPPORT.getRecommendedFormatterVersion();

lib-extra/src/main/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStep.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public final class EclipseJdtFormatterStep {
3434
private EclipseJdtFormatterStep() {}
3535

3636
private static final String NAME = "eclipse jdt formatter";
37-
private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "4.26").add(17, "4.35");
37+
private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(17, "4.35");
3838

3939
public static String defaultVersion() {
4040
return JVM_SUPPORT.getRecommendedFormatterVersion();

lib-extra/src/main/java/com/diffplug/spotless/extra/wtp/EclipseWtpFormatterStep.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public enum EclipseWtpFormatterStep {
3838

3939
private static final String NAME = "eclipse wtp formatter";
4040
private static final String FORMATTER_PACKAGE = "com.diffplug.spotless.extra.eclipse.wtp.";
41-
private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(8, "4.18.0").add(11, "4.21.0");
41+
private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(17, "4.21.0");
4242
private static final String FORMATTER_METHOD = "format";
4343

4444
private final String implementationClassName;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public final class CleanthatJavaStep implements Serializable {
4545
/**
4646
* CleanThat changelog is available at <a href="https://github.com/solven-eu/cleanthat/blob/master/CHANGES.MD">here</a>.
4747
*/
48-
private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "2.24");
48+
private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(17, "2.24");
4949

5050
private final JarState.Promised jarState;
5151
private final String version;

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,6 @@ private static FormatterStep createInternally(String name, String groupArtifact,
120120
}
121121

122122
private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME)
123-
.addMin(11, "1.8") // we only support google-java-format >= 1.8 due to api changes
124-
.addMin(16, "1.10.0") // java 16 requires at least 1.10.0 due to jdk api changes in JavaTokenizer
125123
.addMin(21, "1.17.0") // java 21 requires at least 1.17.0 due to https://github.com/google/google-java-format/issues/898
126124
.add(17, "1.28.0"); // default version
127125

0 commit comments

Comments
 (0)