Merge branch 'main' into feat/prepare-for-lint-take-2

Author: nedtwigg

.github/workflows/changelog-print.yml

@@ -16,7 +16,5 @@ jobs:
           java-version: 11
           distribution: 'temurin'
       - name: gradle caching
-        uses: gradle/actions/setup-gradle@v3
-        with:
-          gradle-home-cache-cleanup: true
+        uses: gradle/actions/setup-gradle@v4
       - run: ./gradlew changelogPrint

.github/workflows/ci.yml

@@ -29,9 +29,7 @@ jobs:
           distribution: "temurin"
           java-version: 11
       - name: gradle caching
-        uses: gradle/actions/setup-gradle@v3
-        with:
-          gradle-home-cache-cleanup: true
+        uses: gradle/actions/setup-gradle@v4
       - name: spotlessCheck
         run: ./gradlew spotlessCheck
       - name: assemble testClasses
@@ -43,7 +41,7 @@ jobs:
       matrix:
         kind: [maven, gradle]
         # Test on the latest Java version once Gradle & Maven support it.
-        jre: [11, 17, 21]
+        jre: [11, 17, 21, 22]
         os: [ubuntu-latest]
         include:
           # test windows at the diagonals of the above matrix
@@ -71,9 +69,7 @@ jobs:
           distribution: "temurin"
           java-version: ${{ matrix.jre }}
       - name: gradle caching
-        uses: gradle/actions/setup-gradle@v3
-        with:
-          gradle-home-cache-cleanup: true
+        uses: gradle/actions/setup-gradle@v4
       - name: build (maven-only)
         if: matrix.kind == 'maven'
         run: ./gradlew :plugin-maven:build -x spotlessCheck

.github/workflows/deploy.yml

@@ -1,4 +1,3 @@
-# GH_TOKEN
 # NEXUS_USER
 # NEXUS_PASS64 (base64 NOTE: `base64` and `openssl base64` failed, had to use Java
 #   byte[] data = "{{password}}".getBytes(StandardCharsets.UTF_8);
@@ -29,8 +28,10 @@ jobs:
   build:
     runs-on: ubuntu-latest
     name: deploy
+    permissions:
+      contents: write
     env:
-      gh_token: ${{ secrets.GH_TOKEN }}
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       ORG_GRADLE_PROJECT_nexus_user: ${{ secrets.NEXUS_USER }}
       ORG_GRADLE_PROJECT_nexus_pass64: ${{ secrets.NEXUS_PASS64 }}
       ORG_GRADLE_PROJECT_gpg_passphrase: ${{ secrets.GPG_PASSPHRASE }}
@@ -43,9 +44,7 @@ jobs:
           java-version: 11
           distribution: 'temurin'
       - name: gradle caching
-        uses: gradle/actions/setup-gradle@v3
-        with:
-          gradle-home-cache-cleanup: true
+        uses: gradle/actions/setup-gradle@v4
       - name: git fetch origin main
         run: git fetch origin main
       - name: publish all

CHANGES.md

@@ -162,13 +162,13 @@ concerning what you are working on:
 
 ```shell
 # Run only from test from the "lib" project
-gradlew :testlib:test --tests com.diffplug.spotless.generic.IndentStepTest
+./gradlew :testlib:test --tests com.diffplug.spotless.generic.IndentStepTest
 
 # Run only one test from the "plugin-maven" project
-gradlew :plugin-maven:test --tests com.diffplug.spotless.maven.pom.SortPomMavenTest
+./gradlew :plugin-maven:test --tests com.diffplug.spotless.maven.pom.SortPomMavenTest
 
 # Run only one test from the "plugin-gradle" project
-gradlew :plugin-gradle:test --tests com.diffplug.gradle.spotless.FreshMarkExtensionTest
+./gradlew :plugin-gradle:test --tests com.diffplug.gradle.spotless.FreshMarkExtensionTest
 ```
 
 ## Check and format code

CONTRIBUTING.md

@@ -103,6 +103,7 @@ lib('npm.TsFmtFormatterStep')                    +'{{yes}}       | {{yes}}
 lib('pom.SortPomStep')                           +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
 lib('protobuf.BufStep')                          +'{{yes}}       | {{no}}       | {{no}}       | {{no}}  |',
 lib('python.BlackStep')                          +'{{yes}}       | {{no}}       | {{no}}       | {{no}}  |',
+lib('rdf.RdfFormatterStep')                      +'{{no}}        | {{yes}}      | {{no}}       | {{no}}  |',
 lib('scala.ScalaFmtStep')                        +'{{yes}}       | {{yes}}      | {{yes}}      | {{no}}  |',
 lib('shell.ShfmtStep')                           +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
 lib('sql.DBeaverSQLFormatterStep')               +'{{yes}}       | {{yes}}      | {{yes}}      | {{no}}  |',
@@ -157,6 +158,7 @@ lib('yaml.JacksonYamlStep')                      +'{{yes}}       | {{yes}}
 | [`pom.SortPomStep`](lib/src/main/java/com/diffplug/spotless/pom/SortPomStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`protobuf.BufStep`](lib/src/main/java/com/diffplug/spotless/protobuf/BufStep.java) | :+1:       | :white_large_square:       | :white_large_square:       | :white_large_square:  |
 | [`python.BlackStep`](lib/src/main/java/com/diffplug/spotless/python/BlackStep.java) | :+1:       | :white_large_square:       | :white_large_square:       | :white_large_square:  |
+| [`rdf.RdfFormatterStep`](lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterStep.java) | :white_large_square:        | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`scala.ScalaFmtStep`](lib/src/main/java/com/diffplug/spotless/scala/ScalaFmtStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |
 | [`shell.ShfmtStep`](lib/src/main/java/com/diffplug/spotless/shell/ShfmtStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`sql.DBeaverSQLFormatterStep`](lib/src/main/java/com/diffplug/spotless/sql/DBeaverSQLFormatterStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |

README.md

@@ -28,7 +28,7 @@ VER_SLF4J=[1.6,2.0[
 
 # Used in multiple places
 VER_DURIAN=1.2.0
-VER_JGIT=6.7.0.202309050840-r
-VER_JUNIT=5.10.2
-VER_ASSERTJ=3.26.0
-VER_MOCKITO=5.12.0
+VER_JGIT=6.10.0.202406032230-r
+VER_JUNIT=5.11.2
+VER_ASSERTJ=3.26.3
+VER_MOCKITO=5.14.2

gradle.properties

@@ -1,13 +1,15 @@
 String kind
+String releaseTitle
 if (project.name == 'plugin-gradle') {
 	kind = 'gradle'
+	releaseTitle = 'Gradle Plugin'
 } else if (project.name == 'plugin-maven') {
 	kind = 'maven'
-} else if (project.name.startsWith('eclipse')) {
-	kind = 'ext-' + project.name
+	releaseTitle = 'Maven Plugin'
 } else {
 	assert project == rootProject
 	kind = 'lib'
+	releaseTitle = 'Lib'
 }
 
 // the root project and plugins have their own changelogs
@@ -20,11 +22,15 @@ spotlessChangelog {
 	branch        'release'
 	tagPrefix     "${kind}/"
 	commitMessage "Published ${kind}/{{version}}" // {{version}} will be replaced
-}
+	tagMessage "{{changes}}"
+	runAfterPush "gh release create ${kind}/{{version}} --title '${releaseTitle} v{{version}}' --notes-from-tag"
 
-if (gradle.startParameter.projectProperties.get('com.diffplug.spotless.include.ext.nop2') == 'true') {
-	tasks.named('changelogPrint') {
-		enabled = kind.startsWith('ext-')
+	if (kind == 'gradle') {
+		forceNextVersion '7.0.0.BETA3'
+	} else if (kind == 'maven') {
+		forceNextVersion '2.44.0.BETA3'
+	} else {
+		forceNextVersion '3.0.0.BETA3'
 	}
 }
 

gradle/changelog.gradle

@@ -17,13 +17,10 @@ tasks.withType(Test).configureEach {
 			maxRetries = 2
 			maxFailures = 10
 		}
-
-		// There are only 2 cores in each GitHub Action Runner, we use all of them here.
-		maxParallelForks = Runtime.getRuntime().availableProcessors()
-	} else {
-		// https://docs.gradle.org/8.4/userguide/performance.html#execute_tests_in_parallel
-		maxParallelForks = Runtime.runtime.availableProcessors().intdiv(2) ?: 1
 	}
+
+	// https://docs.gradle.org/8.8/userguide/performance.html#execute_tests_in_parallel
+	maxParallelForks = Runtime.runtime.availableProcessors().intdiv(2) ?: 1
 }
 tasks.named('test').configure {
 	useJUnitPlatform {