Remove BiomeFlavor enum

We only support biome (not rome) anymore, so the enum serves no purpose.

Author: awa-xima

lib/src/main/java/com/diffplug/spotless/biome/BiomeExecutableDownloader.java

@@ -71,17 +71,13 @@ final class BiomeExecutableDownloader {
 
 	private final Path downloadDir;
 
-	private final BiomeFlavor flavor;
-
 	/**
 	 * Creates a new downloader for the Biome executable. The executable files are
 	 * stored in the given download directory.
 	 *
-	 * @param flavor Flavor of Biome to use.
 	 * @param downloadDir Directory where to store the downloaded executable.
 	 */
-	public BiomeExecutableDownloader(BiomeFlavor flavor, Path downloadDir) {
-		this.flavor = flavor;
+	public BiomeExecutableDownloader(Path downloadDir) {
 		this.downloadDir = downloadDir;
 	}
 
@@ -240,7 +236,7 @@ private String computeChecksum(Path file, String algorithm) throws IOException {
 	 * Finds the code name for the given operating system used by the Biome
 	 * executable download URL.
 	 *
-	 * @param os Desired operating system.
+	 * @param architecture Desired operating system architecture.
 	 * @return Code name for the Biome download URL.
 	 * @throws IOException When the given OS is not supported by Biome.
 	 */

lib/src/main/java/com/diffplug/spotless/biome/BiomeFlavor.java renamed to lib/src/main/java/com/diffplug/spotless/biome/BiomeSettings.java

@@ -16,52 +16,38 @@
 package com.diffplug.spotless.biome;
 
 /**
- * The flavor of Biome to use. Exists for compatibility reason, may be removed
- * shortly.
- * <p>
- * Will be removed once the old Rome project is not supported anymore.
+ * Settings and constants for Biome to use.
  */
-public enum BiomeFlavor {
-	/** The new forked Biome project. */
-	BIOME("biome", "1.2.0", "biome.json", "biome-%s-%s-%s",
-			"https://github.com/biomejs/biome/releases/download/cli%%2Fv%s/biome-%s");
+public final class BiomeSettings {
+	private final static String configName= "biome.json";
+	private final static String defaultVersion = "1.2.0";
+	private final static String downloadFilePattern = "biome-%s-%s-%s";
+	private final static String shortName = "biome";
+	private final static String urlPattern = "https://github.com/biomejs/biome/releases/download/cli%%2Fv%s/biome-%s";
 
-	private final String configName;
-	private final String defaultVersion;
-	private final String downloadFilePattern;
-	private final String shortName;
-	private final String urlPattern;
-
-	BiomeFlavor(String shortName, String defaultVersion, String configName, String downloadFilePattern,
-			String urlPattern) {
-		this.shortName = shortName;
-		this.defaultVersion = defaultVersion;
-		this.configName = configName;
-		this.downloadFilePattern = downloadFilePattern;
-		this.urlPattern = urlPattern;
-	}
+	private BiomeSettings() {}
 
 	/**
 	 * @return The name of the default config file.
 	 */
-	public String configName() {
+	public static String configName() {
 		return configName;
 	}
 
 	/**
 	 * @return Default version to use when no version was set explicitly.
 	 */
-	public String defaultVersion() {
+	public static String defaultVersion() {
 		return defaultVersion;
 	}
 
 	/**
 	 * @return The pattern for {@link String#format(String, Object...)
 	 *         String.format()} for the file name of a Biome executable for a
-	 *         certain version and architecure. The first parameter is the platform,
+	 *         certain version and architecture. The first parameter is the platform,
 	 *         the second is the OS, the third is the architecture.
 	 */
-	public String getDownloadFilePattern() {
+	public static String getDownloadFilePattern() {
 		return downloadFilePattern;
 	}
 
@@ -71,15 +57,14 @@ public String getDownloadFilePattern() {
 	 *         The first parameter is the version, the second parameter is the OS /
 	 *         platform.
 	 */
-	public String getUrlPattern() {
+	public static String getUrlPattern() {
 		return urlPattern;
 	}
 
 	/**
-	 * @return The short name of this flavor, i.e. <code>rome</code> or
-	 *         <code>biome</code>.
+	 * @return The short name of this flavor, e.g. <code>biome</code>.
 	 */
-	public String shortName() {
+	public static String shortName() {
 		return shortName;
 	}
 }

lib/src/main/java/com/diffplug/spotless/biome/BiomeStep.java

@@ -72,12 +72,6 @@ public class BiomeStep {
 	 */
 	private String language;
 
-	/**
-	 * Biome flavor to use. Will be removed once we stop supporting the deprecated Rome project.
-	 */
-	@Deprecated
-	private final BiomeFlavor flavor;
-
 	/**
 	 * Path to the Biome executable. Can be <code>null</code>, but either a path to
 	 * the executable of a download directory and version must be given. The path
@@ -103,32 +97,30 @@ public class BiomeStep {
 	 * @return The name of this format step, i.e. <code>biome</code> or <code>rome</code>.
 	 */
 	public String name() {
-		return flavor.shortName();
+		return BiomeSettings.shortName();
 	}
 
 	/**
 	 * Creates a Biome step that format code by downloading to the given Biome
 	 * version. The executable is downloaded from the network.
 	 *
-	 * @param flavor Flavor of Biome to use.
 	 * @param version     Version of the Biome executable to download.
 	 * @param downloadDir Directory where to place the downloaded executable.
 	 * @return A new Biome step that download the executable from the network.
 	 */
-	public static BiomeStep withExeDownload(BiomeFlavor flavor, String version, String downloadDir) {
-		return new BiomeStep(flavor, version, null, downloadDir);
+	public static BiomeStep withExeDownload(String version, String downloadDir) {
+		return new BiomeStep(version, null, downloadDir);
 	}
 
 	/**
 	 * Creates a Biome step that formats code by delegating to the Biome executable
 	 * located at the given path.
 	 *
-	 * @param flavor Flavor of Biome to use.
 	 * @param pathToExe Path to the Biome executable to use.
 	 * @return A new Biome step that format with the given executable.
 	 */
-	public static BiomeStep withExePath(BiomeFlavor flavor, String pathToExe) {
-		return new BiomeStep(flavor, null, pathToExe, null);
+	public static BiomeStep withExePath(String pathToExe) {
+		return new BiomeStep(null, pathToExe, null);
 	}
 
 	/**
@@ -156,8 +148,8 @@ private static void attemptToAddPosixPermission(Path file, PosixFilePermission p
 	 *
 	 * @return The default version for Biome.
 	 */
-	private static String defaultVersion(BiomeFlavor flavor) {
-		return flavor.defaultVersion();
+	private static String defaultVersion() {
+		return BiomeSettings.defaultVersion();
 	}
 
 	/**
@@ -200,12 +192,12 @@ private static String resolveNameAgainstPath(String name) throws IOException, In
 	 * Checks the Biome config path. When the config path does not exist or when it
 	 * does not contain a file named {@code biome.json}, an error is thrown.
 	 */
-	private static void validateBiomeConfigPath(BiomeFlavor flavor, String configPath) {
+	private static void validateBiomeConfigPath(String configPath) {
 		if (configPath == null) {
 			return;
 		}
 		var path = Paths.get(configPath);
-		var config = path.resolve(flavor.configName());
+		var config = path.resolve(BiomeSettings.configName());
 		if (!Files.exists(path)) {
 			throw new IllegalArgumentException("Biome config directory does not exist: " + path);
 		}
@@ -227,14 +219,12 @@ private static void validateBiomeExecutable(String resolvedPathToExe) {
 	/**
 	 * Creates a new Biome step with the configuration from the given builder.
 	 *
-	 * @param flavor Flavor of Biome to use.
 	 * @param version     Version of the Biome executable to download.
 	 * @param pathToExe Path to the Biome executable to use.
 	 * @param downloadDir Directory where to place the downloaded executable.
 	 */
-	private BiomeStep(BiomeFlavor flavor, String version, String pathToExe, String downloadDir) {
-		this.flavor = flavor;
-		this.version = version != null && !version.isBlank() ? version : defaultVersion(flavor);
+	private BiomeStep(String version, String pathToExe, String downloadDir) {
+		this.version = version != null && !version.isBlank() ? version : defaultVersion();
 		this.pathToExe = pathToExe;
 		this.downloadDir = downloadDir;
 	}
@@ -306,7 +296,7 @@ public BiomeStep withLanguage(String language) {
 	private State createState() throws IOException, InterruptedException {
 		var resolvedPathToExe = resolveExe();
 		validateBiomeExecutable(resolvedPathToExe);
-		validateBiomeConfigPath(flavor, configPath);
+		validateBiomeConfigPath(configPath);
 		logger.debug("Using Biome executable located at  '{}'", resolvedPathToExe);
 		var exeSignature = FileSignature.signAsList(Collections.singleton(new File(resolvedPathToExe)));
 		makeExecutable(resolvedPathToExe);
@@ -337,7 +327,7 @@ private String resolveExe() throws IOException, InterruptedException {
 				return pathToExe;
 			}
 		} else {
-			var downloader = new BiomeExecutableDownloader(flavor, Paths.get(downloadDir));
+			var downloader = new BiomeExecutableDownloader(Paths.get(downloadDir));
 			var downloaded = downloader.ensureDownloaded(version).toString();
 			makeExecutable(downloaded);
 			return downloaded;

plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BiomeStepConfig.java

@@ -23,10 +23,10 @@
 
 import javax.annotation.Nullable;
 
+import com.diffplug.spotless.biome.BiomeSettings;
 import org.gradle.api.Project;
 
 import com.diffplug.spotless.FormatterStep;
-import com.diffplug.spotless.biome.BiomeFlavor;
 import com.diffplug.spotless.biome.BiomeStep;
 
 public abstract class BiomeStepConfig<Self extends BiomeStepConfig<Self>> {
@@ -48,12 +48,6 @@ public abstract class BiomeStepConfig<Self extends BiomeStepConfig<Self>> {
 	@Nullable
 	private Object downloadDir;
 
-	/**
-	 * The flavor of Biome to use. Will be removed when we stop support the
-	 * deprecated Rome project.
-	 */
-	private final BiomeFlavor flavor;
-
 	/**
 	 * Optional path to the Biome executable. Either a <code>version</code> or a
 	 * <code>pathToExe</code> should be specified. When not given, an attempt is
@@ -93,11 +87,9 @@ public abstract class BiomeStepConfig<Self extends BiomeStepConfig<Self>> {
 	@Nullable
 	private String version;
 
-	protected BiomeStepConfig(Project project, Consumer<FormatterStep> replaceStep, BiomeFlavor flavor,
-			String version) {
+	protected BiomeStepConfig(Project project, Consumer<FormatterStep> replaceStep, String version) {
 		this.project = requireNonNull(project);
 		this.replaceStep = requireNonNull(replaceStep);
-		this.flavor = flavor;
 		this.version = version;
 	}
 
@@ -224,10 +216,10 @@ private File findDataDir() {
 	private BiomeStep newBuilder() {
 		if (pathToExe != null) {
 			var resolvedPathToExe = resolvePathToExe();
-			return BiomeStep.withExePath(flavor, resolvedPathToExe);
+			return BiomeStep.withExePath(resolvedPathToExe);
 		} else {
 			var downloadDir = resolveDownloadDir();
-			return BiomeStep.withExeDownload(flavor, version, downloadDir);
+			return BiomeStep.withExeDownload(version, downloadDir);
 		}
 	}
 
@@ -260,7 +252,7 @@ private String resolveDownloadDir() {
 		if (downloadDir != null) {
 			return project.file(downloadDir).toString();
 		} else {
-			return findDataDir().toPath().resolve(flavor.shortName()).toString();
+			return findDataDir().toPath().resolve(BiomeSettings.shortName()).toString();
 		}
 	}
 }

plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CssExtension.java

@@ -17,8 +17,6 @@
 
 import javax.inject.Inject;
 
-import com.diffplug.spotless.biome.BiomeFlavor;
-
 /** Gradle step for formatting CSS files. */
 public class CssExtension extends FormatExtension {
 	private static final String CSS_FILE_EXTENSION = "**/*.css";
@@ -73,7 +71,7 @@ public class BiomeCss extends BiomeStepConfig<BiomeCss> {
 		 * @param version Biome version to use.
 		 */
 		public BiomeCss(String version) {
-			super(getProject(), CssExtension.this::replaceStep, BiomeFlavor.BIOME, version);
+			super(getProject(), CssExtension.this::replaceStep, version);
 		}
 
 		@Override

plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java

@@ -59,7 +59,6 @@
 import com.diffplug.spotless.OnMatch;
 import com.diffplug.spotless.Provisioner;
 import com.diffplug.spotless.SerializedFunction;
-import com.diffplug.spotless.biome.BiomeFlavor;
 import com.diffplug.spotless.cpp.ClangFormatStep;
 import com.diffplug.spotless.extra.EclipseBasedStepBuilder;
 import com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep;
@@ -825,13 +824,13 @@ public class BiomeGeneric extends BiomeStepConfig<BiomeGeneric> {
 		 *                <code>null</code>.
 		 */
 		public BiomeGeneric(String version) {
-			super(getProject(), FormatExtension.this::replaceStep, BiomeFlavor.BIOME, version);
+			super(getProject(), FormatExtension.this::replaceStep, version);
 		}
 
 		/**
 		 * Sets the language (syntax) of the input files to format. When
 		 * <code>null</code> or the empty string, the language is detected automatically
-		 * from the file name. Currently the following languages are supported by Biome:
+		 * from the file name. Currently, the following languages are supported by Biome:
 		 * <ul>
 		 * <li>js (JavaScript)</li>
 		 * <li>jsx (JavaScript + JSX)</li>

plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java

@@ -30,7 +30,6 @@
 
 import com.diffplug.common.collect.ImmutableList;
 import com.diffplug.spotless.FormatterStep;
-import com.diffplug.spotless.biome.BiomeFlavor;
 import com.diffplug.spotless.npm.EslintConfig;
 import com.diffplug.spotless.npm.EslintFormatterStep;
 import com.diffplug.spotless.npm.NpmPathResolver;
@@ -169,7 +168,7 @@ public class BiomeJs extends BiomeStepConfig<BiomeJs> {
 		 * @param version Biome version to use.
 		 */
 		public BiomeJs(String version) {
-			super(getProject(), JavascriptExtension.this::replaceStep, BiomeFlavor.BIOME, version);
+			super(getProject(), JavascriptExtension.this::replaceStep, version);
 		}
 
 		@Override

plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java

@@ -22,7 +22,6 @@
 import javax.inject.Inject;
 
 import com.diffplug.spotless.FormatterStep;
-import com.diffplug.spotless.biome.BiomeFlavor;
 import com.diffplug.spotless.json.JacksonJsonConfig;
 import com.diffplug.spotless.json.JacksonJsonStep;
 import com.diffplug.spotless.json.JsonPatchStep;
@@ -192,7 +191,7 @@ public class BiomeJson extends BiomeStepConfig<BiomeJson> {
 		 * @param version Biome version to use.
 		 */
 		public BiomeJson(String version) {
-			super(getProject(), JsonExtension.this::replaceStep, BiomeFlavor.BIOME, version);
+			super(getProject(), JsonExtension.this::replaceStep, version);
 		}
 
 		@Override

plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java

@@ -30,7 +30,6 @@
 
 import com.diffplug.gradle.spotless.JavascriptExtension.EslintBaseConfig;
 import com.diffplug.spotless.FormatterStep;
-import com.diffplug.spotless.biome.BiomeFlavor;
 import com.diffplug.spotless.npm.EslintConfig;
 import com.diffplug.spotless.npm.EslintFormatterStep;
 import com.diffplug.spotless.npm.EslintTypescriptConfig;
@@ -254,7 +253,7 @@ public class BiomeTs extends BiomeStepConfig<BiomeTs> {
 		 * @param version Biome version to use.
 		 */
 		public BiomeTs(String version) {
-			super(getProject(), TypescriptExtension.this::replaceStep, BiomeFlavor.BIOME, version);
+			super(getProject(), TypescriptExtension.this::replaceStep, version);
 		}
 
 		@Override

plugin-maven/src/main/java/com/diffplug/spotless/maven/css/BiomeCss.java

@@ -15,15 +15,14 @@
  */
 package com.diffplug.spotless.maven.css;
 
-import com.diffplug.spotless.biome.BiomeFlavor;
 import com.diffplug.spotless.maven.generic.AbstractBiome;
 
 /**
  * Biome formatter step for CSS.
  */
 public class BiomeCss extends AbstractBiome {
 	public BiomeCss() {
-		super(BiomeFlavor.BIOME);
+		super();
 	}
 
 	@Override