Rename remaining rome stuff to biome.

Author: nedtwigg

lib/src/main/java/com/diffplug/spotless/rome/Architecture.java renamed to lib/src/main/java/com/diffplug/spotless/biome/Architecture.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.diffplug.spotless.rome;
+package com.diffplug.spotless.biome;
 
 /**
  * Enumeration of possible computer architectures.
@@ -34,11 +34,11 @@ public static Architecture guess() {
 		var version = System.getProperty("os.version");
 
 		if (arch == null || arch.isBlank()) {
-			throw new IllegalStateException("No OS information is available, specify the Rome executable manually");
+			throw new IllegalStateException("No OS information is available, specify the Biome executable manually");
 		}
 
 		var msg = "Unsupported architecture " + arch + "/" + version
-				+ ", specify the path to the Rome executable manually";
+				+ ", specify the path to the Biome executable manually";
 
 		if (arch.equals("ppc64le")) {
 			throw new IllegalStateException(msg);

lib/src/main/java/com/diffplug/spotless/rome/RomeExecutableDownloader.java renamed to lib/src/main/java/com/diffplug/spotless/biome/BiomeExecutableDownloader.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.diffplug.spotless.rome;
+package com.diffplug.spotless.biome;
 
 import java.io.IOException;
 import java.math.BigInteger;
@@ -41,8 +41,8 @@
  * Downloader for the Biome executable:
  * <a href="https://github.com/biomejs/biome">https://github.com/biomejs/biome</a>.
  */
-final class RomeExecutableDownloader {
-	private static final Logger logger = LoggerFactory.getLogger(RomeExecutableDownloader.class);
+final class BiomeExecutableDownloader {
+	private static final Logger logger = LoggerFactory.getLogger(BiomeExecutableDownloader.class);
 
 	/**
 	 * The checksum algorithm to use for checking the integrity of downloaded files.
@@ -80,7 +80,7 @@ final class RomeExecutableDownloader {
 	 * @param flavor Flavor of Biome to use.
 	 * @param downloadDir Directory where to store the downloaded executable.
 	 */
-	public RomeExecutableDownloader(BiomeFlavor flavor, Path downloadDir) {
+	public BiomeExecutableDownloader(BiomeFlavor flavor, Path downloadDir) {
 		this.flavor = flavor;
 		this.downloadDir = downloadDir;
 	}

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

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.diffplug.spotless.rome;
+package com.diffplug.spotless.biome;
 
 /**
  * The flavor of Biome to use. Exists for compatibility reason, may be removed

lib/src/main/java/com/diffplug/spotless/rome/RomeStep.java renamed to lib/src/main/java/com/diffplug/spotless/biome/BiomeStep.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.diffplug.spotless.rome;
+package com.diffplug.spotless.biome;
 
 import java.io.File;
 import java.io.IOException;
@@ -40,11 +40,11 @@
 /**
  * formatter step that formats JavaScript and TypeScript code with Biome:
  * <a href= "https://github.com/biomejs/biome">https://github.com/biomejs/biome</a>.
- * It delegates to the Biome executable. The Rome executable is downloaded from
+ * It delegates to the Biome executable. The Biome executable is downloaded from
  * the network when no executable path is provided explicitly.
  */
-public class RomeStep {
-	private static final Logger logger = LoggerFactory.getLogger(RomeStep.class);
+public class BiomeStep {
+	private static final Logger logger = LoggerFactory.getLogger(BiomeStep.class);
 
 	/**
 	 * Path to the directory with the {@code biome.json} config file, can be
@@ -113,8 +113,8 @@ public String name() {
 	 * @param downloadDir Directory where to place the downloaded executable.
 	 * @return A new Biome step that download the executable from the network.
 	 */
-	public static RomeStep withExeDownload(BiomeFlavor flavor, String version, String downloadDir) {
-		return new RomeStep(flavor, version, null, downloadDir);
+	public static BiomeStep withExeDownload(BiomeFlavor flavor, String version, String downloadDir) {
+		return new BiomeStep(flavor, version, null, downloadDir);
 	}
 
 	/**
@@ -125,8 +125,8 @@ public static RomeStep withExeDownload(BiomeFlavor flavor, String version, Strin
 	 * @param pathToExe Path to the Biome executable to use.
 	 * @return A new Biome step that format with the given executable.
 	 */
-	public static RomeStep withExePath(BiomeFlavor flavor, String pathToExe) {
-		return new RomeStep(flavor, null, pathToExe, null);
+	public static BiomeStep withExePath(BiomeFlavor flavor, String pathToExe) {
+		return new BiomeStep(flavor, null, pathToExe, null);
 	}
 
 	/**
@@ -230,7 +230,7 @@ private static void validateBiomeExecutable(String resolvedPathToExe) {
 	 * @param pathToExe Path to the Biome executable to use.
 	 * @param downloadDir Directory where to place the downloaded executable.
 	 */
-	private RomeStep(BiomeFlavor flavor, String version, String pathToExe, String downloadDir) {
+	private BiomeStep(BiomeFlavor flavor, String version, String pathToExe, String downloadDir) {
 		this.flavor = flavor;
 		this.version = version != null && !version.isBlank() ? version : defaultVersion(flavor);
 		this.pathToExe = pathToExe;
@@ -255,7 +255,7 @@ public FormatterStep create() {
 	 *                   a file named {@code biome.json}.
 	 * @return This builder instance for chaining method calls.
 	 */
-	public RomeStep withConfigPath(String configPath) {
+	public BiomeStep withConfigPath(String configPath) {
 		this.configPath = configPath;
 		return this;
 	}
@@ -280,7 +280,7 @@ public RomeStep withConfigPath(String configPath) {
 	 * @param language The language of the files to format.
 	 * @return This builder instance for chaining method calls.
 	 */
-	public RomeStep withLanguage(String language) {
+	public BiomeStep withLanguage(String language) {
 		this.language = language;
 		return this;
 	}
@@ -333,7 +333,7 @@ private String resolveExe() throws IOException, InterruptedException {
 				return pathToExe;
 			}
 		} else {
-			var downloader = new RomeExecutableDownloader(flavor, Paths.get(downloadDir));
+			var downloader = new BiomeExecutableDownloader(flavor, Paths.get(downloadDir));
 			var downloaded = downloader.ensureDownloaded(version).toString();
 			makeExecutable(downloaded);
 			return downloaded;

lib/src/main/java/com/diffplug/spotless/rome/OS.java renamed to lib/src/main/java/com/diffplug/spotless/biome/OS.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.diffplug.spotless.rome;
+package com.diffplug.spotless.biome;
 
 import java.util.Locale;
 
@@ -38,12 +38,12 @@ enum OS {
 	public static OS guess() {
 		var osName = System.getProperty("os.name");
 		if (osName == null || osName.isBlank()) {
-			throw new IllegalStateException("No OS information is available, specify the Rome executable manually");
+			throw new IllegalStateException("No OS information is available, specify the Biome executable manually");
 		}
 		var osNameUpper = osName.toUpperCase(Locale.ROOT);
 		if (osNameUpper.contains("SUNOS") || osName.contains("AIX")) {
 			throw new IllegalStateException(
-					"Unsupported OS " + osName + ", specify the path to the Rome executable manually");
+					"Unsupported OS " + osName + ", specify the path to the Biome executable manually");
 		}
 		if (osNameUpper.contains("WINDOWS")) {
 			return OS.WINDOWS;

lib/src/main/java/com/diffplug/spotless/rome/Platform.java renamed to lib/src/main/java/com/diffplug/spotless/biome/Platform.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.diffplug.spotless.rome;
+package com.diffplug.spotless.biome;
 
 /**
  * Represents a platform where code is run, consisting of an operating system

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 DiffPlug
+ * Copyright 2023-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,10 +28,10 @@
 import org.gradle.api.artifacts.repositories.MavenArtifactRepository;
 
 import com.diffplug.spotless.FormatterStep;
-import com.diffplug.spotless.rome.BiomeFlavor;
-import com.diffplug.spotless.rome.RomeStep;
+import com.diffplug.spotless.biome.BiomeFlavor;
+import com.diffplug.spotless.biome.BiomeStep;
 
-public abstract class RomeStepConfig<Self extends RomeStepConfig<Self>> {
+public abstract class BiomeStepConfig<Self extends BiomeStepConfig<Self>> {
 	/**
 	 * Optional path to the directory with configuration file for Biome. The file
 	 * must be named {@code biome.json}. When none is given, the default
@@ -95,7 +95,7 @@ public abstract class RomeStepConfig<Self extends RomeStepConfig<Self>> {
 	@Nullable
 	private String version;
 
-	protected RomeStepConfig(Project project, Consumer<FormatterStep> replaceStep, BiomeFlavor flavor,
+	protected BiomeStepConfig(Project project, Consumer<FormatterStep> replaceStep, BiomeFlavor flavor,
 			String version) {
 		this.project = requireNonNull(project);
 		this.replaceStep = requireNonNull(replaceStep);
@@ -234,13 +234,13 @@ private File findDataDir() {
 	 *
 	 * @return A builder for a Biome step.
 	 */
-	private RomeStep newBuilder() {
+	private BiomeStep newBuilder() {
 		if (pathToExe != null) {
 			var resolvedPathToExe = resolvePathToExe();
-			return RomeStep.withExePath(flavor, resolvedPathToExe);
+			return BiomeStep.withExePath(flavor, resolvedPathToExe);
 		} else {
 			var downloadDir = resolveDownloadDir();
-			return RomeStep.withExeDownload(flavor, version, downloadDir);
+			return BiomeStep.withExeDownload(flavor, version, downloadDir);
 		}
 	}
 

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

@@ -53,6 +53,7 @@
 import com.diffplug.spotless.LineEnding;
 import com.diffplug.spotless.OnMatch;
 import com.diffplug.spotless.Provisioner;
+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;
@@ -67,7 +68,6 @@
 import com.diffplug.spotless.generic.TrimTrailingWhitespaceStep;
 import com.diffplug.spotless.npm.NpmPathResolver;
 import com.diffplug.spotless.npm.PrettierFormatterStep;
-import com.diffplug.spotless.rome.BiomeFlavor;
 
 import groovy.lang.Closure;
 
@@ -728,15 +728,15 @@ protected FormatterStep createStep() {
 	 * the file name. It should be specified as a formatter step for a generic
 	 * <code>format{ ... }</code>.
 	 */
-	public class BiomeGeneric extends RomeStepConfig<BiomeGeneric> {
+	public class BiomeGeneric extends BiomeStepConfig<BiomeGeneric> {
 		@Nullable
 		String language;
 
 		/**
-		 * Creates a new Rome config that downloads the Rome executable for the given
+		 * Creates a new Biome config that downloads the Biome executable for the given
 		 * version from the network.
 		 *
-		 * @param version Rome version to use. The default version is used when
+		 * @param version Biome version to use. The default version is used when
 		 *                <code>null</code>.
 		 */
 		public BiomeGeneric(String version) {
@@ -801,12 +801,12 @@ public PrettierConfig prettier(Map<String, String> devDependencies) {
 	 * offline, you can specify the path to the Biome executable via
 	 * {@code biome().pathToExe(...)}.
 	 */
-	public RomeStepConfig<?> biome() {
+	public BiomeStepConfig<?> biome() {
 		return biome(null);
 	}
 
 	/** Downloads the given Biome version from the network. */
-	public RomeStepConfig<?> biome(String version) {
+	public BiomeStepConfig<?> biome(String version) {
 		var biomeConfig = new BiomeGeneric(version);
 		addStep(biomeConfig.createStep());
 		return biomeConfig;

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

@@ -30,11 +30,11 @@
 
 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;
 import com.diffplug.spotless.npm.PrettierFormatterStep;
-import com.diffplug.spotless.rome.BiomeFlavor;
 
 public class JavascriptExtension extends FormatExtension {
 
@@ -161,7 +161,7 @@ public BiomeJs biome(String version) {
 	/**
 	 * Biome formatter step for JavaScript.
 	 */
-	public class BiomeJs extends RomeStepConfig<BiomeJs> {
+	public class BiomeJs extends BiomeStepConfig<BiomeJs> {
 		/**
 		 * Creates a new Biome formatter step config for formatting JavaScript files.
 		 * Unless overwritten, the given Biome version is downloaded from the network.

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

@@ -22,12 +22,12 @@
 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;
 import com.diffplug.spotless.json.JsonSimpleStep;
 import com.diffplug.spotless.json.gson.GsonStep;
-import com.diffplug.spotless.rome.BiomeFlavor;
 
 public class JsonExtension extends FormatExtension {
 	private static final int DEFAULT_INDENTATION = 4;
@@ -185,7 +185,7 @@ protected final FormatterStep createStep() {
 	/**
 	 * Biome formatter step for JSON.
 	 */
-	public class BiomeJson extends RomeStepConfig<BiomeJson> {
+	public class BiomeJson extends BiomeStepConfig<BiomeJson> {
 		/**
 		 * Creates a new Biome formatter step config for formatting JSON files. Unless
 		 * overwritten, the given Biome version is downloaded from the network.