Merge remote-tracking branch 'origin/main' into js-ts-rome

Author: blutorange

CHANGES.md

@@ -10,8 +10,9 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
-
-* * Support Rome as a formatter for JavaScript and TypeScript code. Adds a new `rome` step to `javascript` and `typescript` formatter configurations. https://github.com/diffplug/spotless/pull/1663
+### Added
+* `Jvm.Support` now accepts `-SNAPSHOT` versions, treated as the non`-SNAPSHOT`. ([#1583](https://github.com/diffplug/spotless/issues/1583))
+* Support Rome as a formatter for JavaScript and TypeScript code. Adds a new `rome` step to `javascript` and `typescript` formatter configurations. https://github.com/diffplug/spotless/pull/1663
 
 ## [2.38.0] - 2023-04-06
 ### Added

gradle.properties

@@ -32,4 +32,4 @@ VER_DURIAN=1.2.0
 VER_JGIT=6.5.0.202303070854-r
 VER_JUNIT=5.9.2
 VER_ASSERTJ=3.24.2
-VER_MOCKITO=5.2.0
+VER_MOCKITO=5.3.0

lib/src/main/java/com/diffplug/spotless/Jvm.java

@@ -280,7 +280,11 @@ public int compare(V version0, V version1) {
 
 			private static <V> int[] convert(V versionObject) {
 				try {
-					return Arrays.asList(versionObject.toString().split("\\.")).stream().mapToInt(Integer::parseInt).toArray();
+					String versionString = versionObject.toString();
+					if (versionString.endsWith("-SNAPSHOT")) {
+						versionString = versionString.substring(0, versionString.length() - "-SNAPSHOT".length());
+					}
+					return Arrays.asList(versionString.split("\\.")).stream().mapToInt(Integer::parseInt).toArray();
 				} catch (Exception e) {
 					throw new IllegalArgumentException(String.format("Not a semantic version: %s", versionObject), e);
 				}

plugin-gradle/CHANGES.md

@@ -3,9 +3,12 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
-
+### Added
 * Support Rome as a formatter for JavaScript and TypeScript code. Adds a new `rome` step to `javascript` and `typescript` formatter configurations. https://github.com/diffplug/spotless/pull/1663
 
+### Fixed
+* Added `@DisableCachingByDefault` to `RegisterDependenciesTask`.
+
 ## [6.18.0] - 2023-04-06
 ### Added
 * `removeUnusedImport` can be configured to rely on `cleanthat-javaparser-unnecessaryimport`. Default remains `google-java-format`. ([#1589](https://github.com/diffplug/spotless/pull/1589))

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,6 +31,7 @@
 import org.gradle.api.tasks.OutputFile;
 import org.gradle.api.tasks.TaskAction;
 import org.gradle.build.event.BuildEventsListenerRegistry;
+import org.gradle.work.DisableCachingByDefault;
 
 import com.diffplug.common.base.Preconditions;
 import com.diffplug.common.io.Files;
@@ -46,6 +47,7 @@
  * - When this "registerDependencies" task does its up-to-date check, it queries the task execution graph to see which
  *   SpotlessTasks are at risk of being executed, and causes them all to be evaluated safely in the root buildscript.
  */
+@DisableCachingByDefault(because = "This task coordinates the setup and execution of other tasks, and should not be cached")
 public abstract class RegisterDependenciesTask extends DefaultTask {
 	static final String TASK_NAME = "spotlessInternalRegisterDependencies";
 

plugin-maven/CHANGES.md

@@ -3,6 +3,7 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Added
 * Support Rome as a formatter for JavaScript and TypeScript code. Adds a new `rome` step to `javascript` and `typescript` formatter configurations. https://github.com/diffplug/spotless/pull/1663### Fixed
 
 ## [2.36.0] - 2023-04-06

plugin-maven/README.md

@@ -459,7 +459,7 @@ Additionally, `editorConfigOverride` options will override what's supplied in `.
 <scalafmt>
   <version>3.5.9</version>              <!-- optional -->
   <file>${project.basedir}/scalafmt.conf</file> <!-- optional -->
-  <majorScalaVersion>2.13</majorScalaVersion> <!-- optional -->
+  <scalaMajorVersion>2.13</scalaMajorVersion> <!-- optional -->
 </scalafmt>
 ```
 

plugin-maven/src/test/java/com/diffplug/spotless/maven/java/CleanthatJavaRefactorerTest.java

@@ -13,18 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.diffplug.spotless.maven.test;
+package com.diffplug.spotless.maven.java;
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import com.diffplug.spotless.maven.MavenIntegrationHarness;
 
 class CleanthatJavaRefactorerTest extends MavenIntegrationHarness {
-	private static final Logger LOGGER = LoggerFactory.getLogger(CleanthatJavaRefactorerTest.class);
-
 	@Test
 	void testEnableDraft() throws Exception {
 		writePomWithJavaSteps(

settings.gradle

@@ -6,15 +6,15 @@ pluginManagement {
 }
 
 plugins {
-	id 'com.diffplug.spotless' version '6.17.0' apply false
+	id 'com.diffplug.spotless' version '6.18.0' apply false
 	// https://plugins.gradle.org/plugin/com.gradle.plugin-publish
-	id 'com.gradle.plugin-publish' version '1.1.0' apply false
+	id 'com.gradle.plugin-publish' version '1.2.0' apply false
 	// https://github.com/gradle-nexus/publish-plugin/releases
 	id 'io.github.gradle-nexus.publish-plugin' version '1.3.0' apply false
 	// https://github.com/spotbugs/spotbugs-gradle-plugin/releases
 	id 'com.github.spotbugs' version '5.0.14' apply false
 	// https://github.com/diffplug/spotless-changelog/blob/main/CHANGELOG.md
-	id 'com.diffplug.spotless-changelog' version '3.0.1' apply false
+	id 'com.diffplug.spotless-changelog' version '3.0.2' apply false
 	// https://github.com/diffplug/goomph/blob/main/CHANGES.md
 	// DO NOT UPDATE, see https://github.com/diffplug/spotless/pull/874
 	id 'com.diffplug.p2.asmaven' version '3.27.0' apply false
@@ -23,7 +23,7 @@ plugins {
 	// https://github.com/davidburstrom/version-compatibility-gradle-plugin/tags
 	id 'io.github.davidburstrom.version-compatibility' version '0.5.0' apply false
 	// https://plugins.gradle.org/plugin/com.gradle.enterprise
-	id 'com.gradle.enterprise' version '3.12.6'
+	id 'com.gradle.enterprise' version '3.13'
 	// https://github.com/equodev/equo-ide/blob/main/plugin-gradle/CHANGELOG.md
 	id 'dev.equo.ide' version '1.0.1' apply false
 }

testlib/src/test/java/com/diffplug/spotless/JvmTest.java

@@ -93,7 +93,7 @@ void supportListsMinimumJvmIfOnlyHigherJvmSupported() {
 
 		assertNull(testSupport.getRecommendedFormatterVersion(), "No formatter version is supported");
 
-		for (String fmtVersion : Arrays.asList("1.2", "1.2.3")) {
+		for (String fmtVersion : Arrays.asList("1.2", "1.2.3", "1.2-SNAPSHOT", "1.2.3-SNAPSHOT")) {
 			String proposal = assertThrows(Exception.class, () -> {
 				testSupport.assertFormatterSupported(fmtVersion);
 			}).getMessage();
@@ -111,7 +111,7 @@ void supportListsMinimumJvmIfOnlyHigherJvmSupported() {
 			assertThat(proposal).contains(String.format("try %s alternatives", TEST_NAME));
 		}
 
-		for (String fmtVersion : Arrays.asList("1.2.4", "2")) {
+		for (String fmtVersion : Arrays.asList("1.2.4", "2", "1.2.5-SNAPSHOT")) {
 			String proposal = assertThrows(Exception.class, () -> {
 				testSupport.assertFormatterSupported(fmtVersion);
 			}).getMessage();
@@ -132,7 +132,7 @@ void supportProposesFormatterUpgrade() {
 		testSupport.add(Jvm.version() - 2, "1");
 		testSupport.add(requiredJvm, "2");
 		testSupport.add(Jvm.version() + 1, "3");
-		for (String fmtVersion : Arrays.asList("0", "1", "1.9")) {
+		for (String fmtVersion : Arrays.asList("0", "1", "1.9", "1.9-SNAPSHOT")) {
 			testSupport.assertFormatterSupported(fmtVersion);
 
 			String proposal = assertThrows(Exception.class, () -> {
@@ -168,7 +168,7 @@ void supportProposesJvmUpgrade() {
 	@Test
 	void supportAllowsExperimentalVersions() {
 		testSupport.add(Jvm.version(), "1.0");
-		for (String fmtVersion : Arrays.asList("1", "2.0")) {
+		for (String fmtVersion : Arrays.asList("1", "2.0", "1.1-SNAPSHOT", "2.0-SNAPSHOT")) {
 			testSupport.assertFormatterSupported(fmtVersion);
 
 			Exception testException = new Exception("Some test exception");