Fixups

bzlmodRio · Jun 22, 2024 · 05426fd · 05426fd
1 parent 27d6fb5
commit 05426fd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/spotless/wrapper/src/main/java/com/diffplug/bazel/spotless/BazelProvisioner.java b/spotless/wrapper/src/main/java/com/diffplug/bazel/spotless/BazelProvisioner.java
@@ -113,7 +113,7 @@ public Set<File> provisionWithTransitives(boolean withTransitives, Collection<St
 		// System.out.println("Provisioner getting called: " + withTransitives + ", " + mavenCoordinates);
 
 		Set<String> subpaths = new HashSet<>();
-		subpaths.add(mavenToFilesystem("com.google.guava:guava:31.0.1-jre"));
+		subpaths.add(mavenToFilesystem("com.google.guava:guava:31.1-jre"));
 		for (String maven : mavenCoordinates) {
 			subpaths.add(mavenToFilesystem(maven));
 		}

diff --git a/spotless/wrapper/src/main/java/com/diffplug/bazel/spotless/JavaFormatter.java b/spotless/wrapper/src/main/java/com/diffplug/bazel/spotless/JavaFormatter.java
@@ -22,15 +22,17 @@
 import com.diffplug.bazel.spotless.config.ImportOrderConfig;
 import com.diffplug.bazel.spotless.config.JavaConfig;
 import com.diffplug.bazel.spotless.config.PalantirJavaFormatConfig;
-import com.diffplug.spotless.extra.EclipseBasedStepBuilder;
+import com.diffplug.spotless.extra.EquoBasedStepBuilder;
 import com.diffplug.spotless.extra.java.EclipseJdtFormatterStep;
 import com.diffplug.spotless.java.FormatAnnotationsStep;
 import com.diffplug.spotless.java.GoogleJavaFormatStep;
 import com.diffplug.spotless.java.ImportOrderStep;
 import com.diffplug.spotless.java.PalantirJavaFormatStep;
 import com.diffplug.spotless.java.RemoveUnusedImportsStep;
+import java.util.Set;
 
 public class JavaFormatter extends BaseFormatter {
+	@SuppressWarnings("this-escape")
 	public JavaFormatter(GenericConfig genericConfig, JavaConfig config) {
 		super(genericConfig);
 
@@ -71,7 +73,7 @@ private void createPalantirJavaFormatStep(PalantirJavaFormatConfig config) {
 
 	private void createEclipseJavaFormatStep(EclipseConfig config) {
 		final String version = config.hasVersion() ? config.getVersion() : EclipseJdtFormatterStep.defaultVersion();
-		EclipseBasedStepBuilder builder = EclipseJdtFormatterStep.createBuilder(provisioner);
+		EquoBasedStepBuilder builder = EclipseJdtFormatterStep.createBuilder(provisioner);
 		builder.setVersion(version);
 		addStep(builder.build());
 	}
@@ -93,13 +95,16 @@ private void createGoogleJavaFormatStep(GoogleJavaFormatConfig config) {
 
 	private void createImportOrderStep(ImportOrderConfig config) {
 		boolean wildcardsLast = config.hasWildcardsLast() && config.getWildcardsLast();
+		boolean semanticSort = false;
+		Set<String> treatAsPackage = Set.of();
+		Set<String> treatAsClass = Set.of();
 
 		if (config.hasImportOrderFile() && !config.getImportOrderList().isEmpty()) {
 			throw new IllegalArgumentException("Cannot specify both import order and import order file");
 		} else if (config.hasImportOrderFile()) {
-			addStep(ImportOrderStep.forJava().createFrom(wildcardsLast, config.getImportOrderFile()));
+			addStep(ImportOrderStep.forJava().createFrom(wildcardsLast, semanticSort, treatAsPackage, treatAsClass, config.getImportOrderFile()));
 		} else if (!config.getImportOrderList().isEmpty()) {
-			addStep(ImportOrderStep.forJava().createFrom(wildcardsLast, config.getImportOrderList().toArray(new String[]{})));
+			addStep(ImportOrderStep.forJava().createFrom(wildcardsLast, semanticSort, treatAsPackage, treatAsClass, config.getImportOrderList().toArray(new String[]{})));
 		}
 	}
 }