Merge branch 'rm-path-error-message' into fix/ktfmt-0.57+

Author: nedtwigg

gradle.properties

@@ -31,6 +31,6 @@ VER_SLF4J=[1.6,2.0[
 VER_DURIAN=1.2.0
 VER_JGIT=7.3.0.202506031305-r
 VER_JUNIT=5.13.4
-VER_ASSERTJ=3.27.4
-VER_MOCKITO=5.19.0
-VER_SELFIE=2.5.3
+VER_ASSERTJ=3.27.6
+VER_MOCKITO=5.20.0
+VER_SELFIE=2.5.4

gradle/special-tests.gradle

@@ -14,9 +14,11 @@ def special = [
 boolean isCiServer = System.getenv().containsKey("CI")
 tasks.withType(Test).configureEach {
 	if (isCiServer) {
-		retry {
-			maxRetries = 2
-			maxFailures = 10
+		develocity {
+			testRetry {
+				maxRetries = 2
+				maxFailures = 10
+			}
 		}
 	}
 	// selfie https://selfie.dev/jvm/get-started#gradle

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -114,7 +114,6 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -172,7 +171,6 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
     APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
     JAVACMD=$( cygpath --unix "$JAVACMD" )
 
@@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
         -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 

gradlew.bat

@@ -70,11 +70,10 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

plugin-gradle/CHANGES.md

@@ -10,6 +10,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `google-java-format` version to latest `1.24.0` -> `1.28.0`. ([#2345](https://github.com/diffplug/spotless/pull/2345))
 * Bump default `ktlint` version to latest `1.5.0` -> `1.7.1`. ([#2555](https://github.com/diffplug/spotless/pull/2555))
 * Bump default `jackson` version to latest `2.19.2` -> `2.20.0`. ([#2606](https://github.com/diffplug/spotless/pull/2606))
+* Running `spotlessCheck` with violations unilaterally produces the error message `Run './gradlew spotlessApply' to fix these violations`. ([#2592](https://github.com/diffplug/spotless/issues/2592))
 * **BREAKING** Bump default `ktfmt` version to latest `0.53` -> `0.58` ([#2613](https://github.com/diffplug/spotless/pull/2613))
   * use `TrailingCommaManagementStrategy` enum instead of `manageTrailingCommas` boolean configuration option
 

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

@@ -138,12 +138,7 @@ void init(SpotlessTaskImpl impl) {
 		getProjectPath().set(getProject().getPath());
 		getEncoding().set(impl.getEncoding());
 		getRunToFixMessage().convention(
-				"Run '" + calculateGradleCommand() + " " + getTaskPathPrefix() + "spotlessApply' to fix these violations.");
-	}
-
-	private String getTaskPathPrefix() {
-		String path = getProjectPath().get();
-		return path.equals(":") ? ":" : path + ":";
+				"Run '" + calculateGradleCommand() + " spotlessApply' to fix all violations.");
 	}
 
 	private static String calculateGradleCommand() {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2024 DiffPlug
+ * Copyright 2016-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -117,8 +117,8 @@ private void assertCheckFailure(Bundle spotless, String... expectedLines) throws
 	}
 
 	static final String EXPECTED_RUN_SPOTLESS_APPLY_SUGGESTION = FileSignature.machineIsWin()
-			? "Run 'gradlew.bat :spotlessApply' to fix these violations."
-			: "Run './gradlew :spotlessApply' to fix these violations.";
+			? "Run 'gradlew.bat spotlessApply' to fix all violations."
+			: "Run './gradlew spotlessApply' to fix all violations.";
 
 	@Test
 	void lineEndingProblem() throws Exception {

settings.gradle

@@ -12,7 +12,7 @@ plugins {
 	// https://github.com/gradle-nexus/publish-plugin/releases
 	id 'io.github.gradle-nexus.publish-plugin' version '2.0.0' apply false
 	// https://github.com/spotbugs/spotbugs-gradle-plugin/releases
-	id 'com.github.spotbugs' version '6.2.3' apply false
+	id 'com.github.spotbugs' version '6.4.2' apply false
 	// https://github.com/diffplug/spotless-changelog/blob/main/CHANGELOG.md
 	id 'com.diffplug.spotless-changelog' version '3.1.2' apply false
 	// https://github.com/radarsh/gradle-test-logger-plugin/blob/develop/CHANGELOG.md