Merge branch 'main' into markdownExtConfig

Author: nedtwigg

.github/workflows/ci.yml

@@ -97,9 +97,25 @@ jobs:
           cd ..
           ./gradlew testIdea
       - name: junit result
-        uses: mikepenz/action-junit-report@v5
+        uses: mikepenz/action-junit-report@v6
         if: always() # always run even if the previous step fails
         with:
           check_name: JUnit ${{ matrix.kind }} ${{ matrix.jre }} ${{ matrix.os }}
           report_paths: '*/build/test-results/*/TEST-*.xml'
           check_retries: true
+
+  # Status check that is required in branch protection rules.
+  final-status:
+    needs:
+      - build
+    runs-on: ubuntu-latest
+    if: always()
+    steps:
+      - name: Check
+        run: |
+          results=$(tr -d '\n' <<< '${{ toJSON(needs.*.result) }}')
+          if ! grep -q -v -E '(failure|cancelled)' <<< "$results"; then
+            echo "One or more required jobs failed"
+            exit 1
+          fi
+          echo "All required jobs completed successfully."

CHANGES.md

@@ -12,10 +12,15 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Changes
 * Bump default `ktfmt` version to latest `0.58` -> `0.59`. ([#2681](https://github.com/diffplug/spotless/pull/2681)
+* Use Task Providers for task initialization. [#2719](https://github.com/diffplug/spotless/pull/2719)
+* **BREAKING** Bump minimum supported Gradle version from 7.3 to 8.1. [#2719](https://github.com/diffplug/spotless/pull/2719)
+* Bump default `jackson` version to latest `2.20.0` -> `2.20.1`. ([#2730](https://github.com/diffplug/spotless/pull/2730))
+* Bump default `cleanthat` version to latest `2.23` -> `2.24`. ([#2620](https://github.com/diffplug/spotless/pull/2620))
 ### Fixed
-- palantirJavaFormat is no longer arbitrarily set to outdated versions on Java 17, latest available version is always used ([#2686](https://github.com/diffplug/spotless/pull/2686) fixes [#2685](https://github.com/diffplug/spotless/issues/2685))
+* palantirJavaFormat is no longer arbitrarily set to outdated versions on Java 17, latest available version is always used ([#2686](https://github.com/diffplug/spotless/pull/2686) fixes [#2685](https://github.com/diffplug/spotless/issues/2685))
+* Use Provider API for Gradle properties. ([#2718](https://github.com/diffplug/spotless/pull/2718)
 ### Added
-- new options to customize Flexmark, e.g. to allow YAML front matter ([#2616](https://github.com/diffplug/spotless/issues/2616))
+* new options to customize Flexmark, e.g. to allow YAML front matter ([#2616](https://github.com/diffplug/spotless/issues/2616))
 ### Removed
 * **BREAKING** Drop support for older Ktlint versions. ([#2711](https://github.com/diffplug/spotless/pull/2711))
 

build.gradle

@@ -31,10 +31,10 @@ spotless {
 }
 
 dependencies {
-	rewrite(platform('org.openrewrite.recipe:rewrite-recipe-bom:3.16.0'))
+	rewrite(platform('org.openrewrite.recipe:rewrite-recipe-bom:3.18.0'))
 	rewrite('org.openrewrite.recipe:rewrite-migrate-java:3.19.0')
 	rewrite('org.openrewrite.recipe:rewrite-java-security:3.19.2')
 	rewrite('org.openrewrite.recipe:rewrite-rewrite:0.14.0')
 	rewrite('org.openrewrite.recipe:rewrite-static-analysis:2.19.0')
-	rewrite('org.openrewrite.recipe:rewrite-third-party:0.29.0')
+	rewrite('org.openrewrite.recipe:rewrite-third-party:0.31.1')
 }

gradle.properties

@@ -30,7 +30,7 @@ VER_SLF4J=[1.6,2.0[
 # Used in multiple places
 VER_DURIAN=1.2.0
 VER_JGIT=7.4.0.202509020913-r
-VER_JUNIT=5.14.0
+VER_JUNIT=5.14.1
 VER_ASSERTJ=3.27.6
 VER_MOCKITO=5.20.0
 VER_SELFIE=2.5.4

gradle/error-prone.gradle

@@ -2,7 +2,7 @@ apply plugin: 'net.ltgt.errorprone'
 
 dependencies {
 	errorprone('com.google.errorprone:error_prone_core:2.42.0')
-	errorprone('tech.picnic.error-prone-support:error-prone-contrib:0.25.0')
+	errorprone('tech.picnic.error-prone-support:error-prone-contrib:0.26.0')
 }
 
 tasks.withType(JavaCompile).configureEach {

gradle/wrapper/gradle-wrapper.jar

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

gradle/wrapper/gradle-wrapper.properties

@@ -38,10 +38,8 @@ spotless {
 
 apply from: rootProject.file('gradle/special-tests.gradle')
 tasks.withType(Test).configureEach {
-	if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_16)) {
-		// needed for EclipseCdtFormatterStepTest
-		jvmArgs '--add-opens=java.base/java.lang=ALL-UNNAMED'
-	}
+	// needed for EclipseCdtFormatterStepTest
+	jvmArgs '--add-opens=java.base/java.lang=ALL-UNNAMED'
 }
 
 def NEEDS_P2_DEPS = [
@@ -50,9 +48,6 @@ def NEEDS_P2_DEPS = [
 	'groovy',
 	'jdt'
 ]
-if (!JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)) {
-	NEEDS_P2_DEPS.remove('cdt')
-}
 for (needsP2 in NEEDS_P2_DEPS) {
 	sourceSets.register(needsP2) {
 		compileClasspath += sourceSets.main.output

lib-extra/build.gradle

@@ -80,7 +80,7 @@ dependencies {
 
 	// GLUE CODE (alphabetic order please)
 	// cleanthat
-	String VER_CLEANTHAT='2.23'
+	String VER_CLEANTHAT='2.24'
 	cleanthatCompileOnly "io.github.solven-eu.cleanthat:java:$VER_CLEANTHAT"
 	compatCleanthat2Dot1CompileAndTestOnly "io.github.solven-eu.cleanthat:java:$VER_CLEANTHAT"
 	// diktat old supported version 1.x
@@ -97,7 +97,7 @@ dependencies {
 	// gson
 	gsonCompileOnly 'com.google.code.gson:gson:2.13.2'
 	// jackson
-	String VER_JACKSON='2.20.0'
+	String VER_JACKSON='2.20.1'
 	jacksonCompileOnly "com.fasterxml.jackson.core:jackson-databind:$VER_JACKSON"
 	jacksonCompileOnly "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:$VER_JACKSON"
 	// ktfmt
@@ -131,15 +131,9 @@ spotbugs {
 
 apply from: rootProject.file('gradle/special-tests.gradle')
 tasks.withType(Test).configureEach {
-	if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_16)) {
-		// https://docs.gradle.org/7.5/userguide/upgrading_version_7.html#removes_implicit_add_opens_for_test_workers
-		jvmArgs "--add-opens=java.base/java.lang=ALL-UNNAMED"
-	}
+	jvmArgs "--add-opens=java.base/java.lang=ALL-UNNAMED"
 
-	if (GradleVersion.current() >= GradleVersion.version('9.0')) {
-		// https://github.com/gradle/gradle/issues/33619
-		failOnNoDiscoveredTests = false
-	}
+	failOnNoDiscoveredTests = false
 }
 
 jar {

lib/build.gradle

@@ -45,7 +45,7 @@ public final class CleanthatJavaStep implements Serializable {
 	/**
 	 * CleanThat changelog is available at <a href="https://github.com/solven-eu/cleanthat/blob/master/CHANGES.MD">here</a>.
 	 */
-	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "2.23");
+	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "2.24");
 
 	private final JarState.Promised jarState;
 	private final String version;