Undo yaml formatting changes, update spotless to Spotless

Author: tbcrawford

.github/workflows/ci.yml

@@ -5,7 +5,7 @@
 on:
   pull_request:
   push:
-    branches: [ main ]
+    branches: [main]
   workflow_dispatch:
 
 concurrency:
@@ -23,32 +23,28 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-
       - name: Install JDK 11
         uses: actions/setup-java@v4
         with:
           distribution: "temurin"
           java-version: 11
-
       - name: gradle caching
         uses: gradle/actions/setup-gradle@v3
         with:
           gradle-home-cache-cleanup: true
-
       - name: spotlessCheck
         run: ./gradlew spotlessCheck
-
       - name: assemble testClasses
         run: ./gradlew assemble testClasses
   build:
     needs: sanityCheck
     strategy:
       fail-fast: false
       matrix:
-        kind: [ maven, gradle ]
+        kind: [maven, gradle]
         # Test on the latest Java version once Gradle & Maven support it.
-        jre: [ 11, 17, 21 ]
-        os: [ ubuntu-latest ]
+        jre: [11, 17, 21]
+        os: [ubuntu-latest]
         include:
           # test windows at the diagonals of the above matrix
           - kind: maven
@@ -69,40 +65,32 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-
       - name: Install JDK ${{ matrix.distribution }} ${{ matrix.java_version }}
         uses: actions/setup-java@v4
         with:
           distribution: "temurin"
           java-version: ${{ matrix.jre }}
-
       - name: gradle caching
         uses: gradle/actions/setup-gradle@v3
         with:
           gradle-home-cache-cleanup: true
-
       - name: build (maven-only)
         if: matrix.kind == 'maven'
         run: ./gradlew :plugin-maven:build -x spotlessCheck
-
       - name: build (everything-but-maven)
         if: matrix.kind == 'gradle'
         run: ./gradlew build -x spotlessCheck -PSPOTLESS_EXCLUDE_MAVEN=true
-
       - name: test npm
         if: matrix.kind == 'npm'
         run: ./gradlew testNpm
-
       - name: Install shfmt
         if: matrix.kind == 'shfmt'
         run: |
           curl -sSfL "https://github.com/mvdan/sh/releases/download/v${{ matrix.shfmt-version }}/shfmt_v${{ matrix.shfmt-version }}_linux_amd64" -o /usr/local/bin/shfmt
           chmod +x /usr/local/bin/shfmt
-
       - name: Test shfmt
         if: matrix.kind == 'shfmt'
         run: ./gradlew testShfmt
-
       - name: junit result
         uses: mikepenz/action-junit-report@v4
         if: always() # always run even if the previous step fails

lib/src/main/java/com/diffplug/spotless/shell/ShfmtStep.java

@@ -100,8 +100,8 @@ static class State implements Serializable {
 
 		String format(ProcessRunner runner, String input, File file) throws IOException, InterruptedException {
 			if (args == null) {
-				// args will be reused during a single spotless task execution,
-				// so this "prefix" is being "cached" for each spotless format with shfmt.
+				// args will be reused during a single Spotless task execution,
+				// so this "prefix" is being "cached" for each Spotless format with shfmt.
 				args = List.of(exe.confirmVersionAndGetAbsolutePath(), "--filename");
 			}