Ensure support for version 2.x of biome

The download path changed slightly for version 2.x.
Add tests for version 2.x.

Author: awa-xima

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

@@ -278,7 +278,7 @@ private String getDownloadUrl(String version, Platform platform) throws IOExcept
 		var architectureCodeName = getArchitectureCodeName(platform.getArchitecture());
 		var extension = getDownloadUrlExtension(platform.getOs());
 		var platformString = String.format(PLATFORM_PATTERN, osCodeName, architectureCodeName, extension);
-		return String.format(flavor.getUrlPattern(), version, platformString);
+		return String.format(BiomeSettings.getUrlPattern(version), version, platformString);
 	}
 
 	/**
@@ -313,7 +313,7 @@ private String getDownloadUrlExtension(OS os) throws IOException {
 	private Path getExecutablePath(String version, Platform platform) {
 		var os = platform.getOs().name().toLowerCase(Locale.ROOT);
 		var arch = platform.getArchitecture().name().toLowerCase(Locale.ROOT);
-		var fileName = String.format(flavor.getDownloadFilePattern(), os, arch, version);
+		var fileName = String.format(BiomeSettings.getDownloadFilePattern(), os, arch, version);
 		return downloadDir.resolve(fileName);
 	}
 

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

@@ -19,26 +19,27 @@
  * Settings and constants for Biome to use.
  */
 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 static String CONFIG_NAME = "biome.json";
+	private final static String DEFAULT_VERSION = "1.2.0";
+	private final static String DOWNLOAD_FILE_PATTERN = "biome-%s-%s-%s";
+	private final static String SHORT_NAME = "biome";
+	private final static String URL_PATTERN_1X = "https://github.com/biomejs/biome/releases/download/cli%%2Fv%s/biome-%s";
+	private final static String URL_PATTERN_2X = "https://github.com/biomejs/biome/releases/download/%%40biomejs%%2Fbiome%%40%s/biome-%s";
 
 	private BiomeSettings() {}
 
 	/**
 	 * @return The name of the default config file.
 	 */
 	public static String configName() {
-		return configName;
+		return CONFIG_NAME;
 	}
 
 	/**
 	 * @return Default version to use when no version was set explicitly.
 	 */
 	public static String defaultVersion() {
-		return defaultVersion;
+		return DEFAULT_VERSION;
 	}
 
 	/**
@@ -48,23 +49,27 @@ public static String defaultVersion() {
 	 *         the second is the OS, the third is the architecture.
 	 */
 	public static String getDownloadFilePattern() {
-		return downloadFilePattern;
+		return DOWNLOAD_FILE_PATTERN;
 	}
 
 	/**
+	 * @param version The biome version for which to get the URL pattern, e.g. 1.2.0 or 2.0.6.
 	 * @return The pattern for {@link String#format(String, Object...)
 	 *         String.format()} for the URL where the executables can be downloaded.
 	 *         The first parameter is the version, the second parameter is the OS /
 	 *         platform.
 	 */
-	public static String getUrlPattern() {
-		return urlPattern;
+	public static String getUrlPattern(String version) {
+		if (version != null && version.startsWith("1.")) {
+			return URL_PATTERN_1X;
+		}
+		return URL_PATTERN_2X;
 	}
 
 	/**
 	 * @return The short name of this flavor, e.g. <code>biome</code>.
 	 */
 	public static String shortName() {
-		return shortName;
+		return SHORT_NAME;
 	}
 }

plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BiomeIntegrationTest.java

@@ -424,4 +424,29 @@ void preservesIgnoredFiles() throws Exception {
 		assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
 		assertFile("package.json").sameAsResource("biome/json/packageAfter.json");
 	}
+
+	/**
+	 * Tests that the Gradle plugin works with version 2.x of biome.
+	 *
+	 * @throws Exception When a test failure occurs.
+	 */
+	@Test
+	void version2x() throws Exception {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    format 'mybiome', {",
+				"        target '**/*.js'",
+				"        biome('2.0.6')",
+				"    }",
+				"}");
+		setFile("biome_test.js").toResource("biome/js/fileBefore.js");
+
+		var spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
+		assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
+		assertFile("biome_test.js").sameAsResource("biome/js/fileAfter.js");
+	}
 }

plugin-maven/src/test/java/com/diffplug/spotless/maven/biome/BiomeMavenTest.java

@@ -248,4 +248,17 @@ void preservesIgnoredFiles() throws Exception {
 		mavenRunner().withArguments("spotless:apply").runNoError();
 		assertFile("package.json").sameAsResource("biome/json/packageAfter.json");
 	}
+
+	/**
+	 * Tests that the Maven plugin works with version 2.x of biome.
+	 *
+	 * @throws Exception When a test failure occurs.
+	 */
+	@Test
+	void version2X() throws Exception {
+		writePomWithBiomeSteps("**/*.js", "<biome><version>2.0.6</version></biome>");
+		setFile("biome_test.js").toResource("biome/js/fileBefore.js");
+		mavenRunner().withArguments("spotless:apply").runNoError();
+		assertFile("biome_test.js").sameAsResource("biome/js/fileAfter.js");
+	}
 }

testlib/src/test/java/com/diffplug/spotless/biome/BiomeStepTest.java

@@ -194,6 +194,32 @@ void preservesIgnoredFiles() {
 		}
 	}
 
+	/**
+	 * Tests for the different biome versions.
+	 */
+	@Nested
+	class BiomeVersion {
+		/**
+		 * Basic test that biome 1.x works.
+		 */
+		@Test
+		void test1x() {
+			var step = BiomeStep.withExeDownload("1.2.0", downloadDir).create();
+			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
+			stepHarness.testResource("biome/js/fileBefore.cjs", "biome/js/fileAfter.cjs");
+		}
+
+		/**
+		 * Basic test that biome 2.x works.
+		 */
+		@Test
+		void test2x() {
+			var step = BiomeStep.withExeDownload("2.0.6", downloadDir).create();
+			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
+			stepHarness.testResource("biome/js/fileBefore.cjs", "biome/js/fileAfter.cjs");
+		}
+	}
+
 	@Nested
 	class ConfigFile {
 		/**