Skip to content

Commit 19bf3cb

Browse files
authored
Merge pull request #65 from aecio/gjf-1.11.0
Support google-java-format up to version 1.11.0
2 parents 6c4214e + 25e897f commit 19bf3cb

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ dependencies {
3131
bundle(project(':format')) {
3232
exclude group: 'org.codehaus.groovy', module: 'groovy-all'
3333
}
34-
bundle 'com.google.guava:guava:28.0-jre'
34+
bundle 'com.google.guava:guava:30.0-jre'
3535
bundle 'com.google.dagger:dagger:2.23.2'
3636
annotationProcessor 'com.google.dagger:dagger-compiler:2.23.2'
3737
annotationProcessor 'com.google.auto.value:auto-value:1.6.5'

subprojects/format/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ dependencies {
1212
implementation 'org.codehaus.groovy:groovy-all:2.5.10' // v2.5.10 is the first version which runs on a Java 14 JVM.
1313
// At runtime, we must still support v2.3.10 (bundled with
1414
// Gradle v2.6) on Java < 14 JVMs.
15-
implementation 'com.google.guava:guava:28.0-jre'
15+
implementation 'com.google.guava:guava:30.0-jre'
1616
testImplementation('org.spockframework:spock-core:1.3-groovy-2.5') {
1717
exclude group: 'org.codehaus.groovy', module: 'groovy-all'
1818
}

subprojects/format/src/main/groovy/com/github/sherter/googlejavaformatgradleplugin/format/Gjf.java

+5-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public class Gjf {
99
public static final String ARTIFACT_ID = "google-java-format";
1010

1111
public static final ImmutableList<String> SUPPORTED_VERSIONS =
12-
ImmutableList.of("1.0", "1.1", "1.2", "1.3", "1.4", "1.5", "1.6", "1.7", "1.8");
12+
ImmutableList.of("1.0", "1.1", "1.2", "1.3", "1.4", "1.5", "1.6", "1.7", "1.8", "1.9", "1.10.0", "1.11.0");
1313

1414
/**
1515
* Constructs a new formatter that delegates to <a
@@ -37,6 +37,10 @@ private static FormatterFactory newFormatterFactory(
3737
case "1.6":
3838
case "1.7":
3939
return new OneDotOneFactory(classLoader, config);
40+
case "1.8":
41+
case "1.9":
42+
case "1.10.0":
43+
case "1.11.0":
4044
default:
4145
return new OneDotEightFactory(classLoader, config);
4246
}

0 commit comments

Comments
 (0)