Merge branch 'develop' into cr/fix-missing-native-image-dir

Author: crogoz

build.gradle

@@ -1,25 +1,24 @@
 buildscript {
     repositories {
-        mavenCentral() { metadataSources { mavenPom(); ignoreGradleMetadataRedirection() } }
-        gradlePluginPortal() { metadataSources { mavenPom(); ignoreGradleMetadataRedirection() } }
+        mavenCentral()
+        gradlePluginPortal()
     }
 
     dependencies {
         classpath 'com.palantir.jakartapackagealignment:jakarta-package-alignment:0.6.0'
         classpath 'com.gradle.publish:plugin-publish-plugin:1.3.1'
-        classpath 'com.palantir.baseline:gradle-baseline-java:6.29.0'
-        classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:2.34.0'
+        classpath 'com.palantir.baseline:gradle-baseline-java:6.42.0'
+        classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:2.36.0'
         classpath 'com.palantir.gradle.externalpublish:gradle-external-publish-plugin:1.19.0'
-        classpath 'com.palantir.gradle.failure-reports:gradle-failure-reports:1.13.0'
-        classpath 'com.palantir.gradle.gitversion:gradle-git-version:3.2.0'
-        classpath 'com.palantir.gradle.idea-configuration:gradle-idea-configuration:0.4.0'
-        classpath 'com.palantir.gradle.jdks:gradle-jdks:0.67.0'
-        classpath 'com.palantir.gradle.jdkslatest:gradle-jdks-latest:0.18.0'
+        classpath 'com.palantir.gradle.failure-reports:gradle-failure-reports:1.14.0'
+        classpath 'com.palantir.gradle.gitversion:gradle-git-version:4.0.0'
+        classpath 'com.palantir.gradle.idea-configuration:gradle-idea-configuration:0.5.0'
+        classpath 'com.palantir.gradle.jdks:gradle-jdks:0.69.0'
+        classpath 'com.palantir.gradle.jdkslatest:gradle-jdks-latest:0.21.0'
         classpath 'com.palantir.gradle.plugintesting:gradle-plugin-testing:0.6.0'
-        classpath 'com.palantir.javaformat:gradle-palantir-java-format:2.67.0'
+        classpath 'com.palantir.javaformat:gradle-palantir-java-format:2.71.0'
         classpath 'com.palantir.gradle.revapi:gradle-revapi:1.8.0'
-        classpath 'com.palantir.suppressible-error-prone:gradle-suppressible-error-prone:2.9.0'
-        classpath 'gradle.plugin.org.inferred:gradle-processors:3.7.0'
+        classpath 'com.palantir.suppressible-error-prone:gradle-suppressible-error-prone:2.11.0'
         classpath 'me.champeau.jmh:jmh-gradle-plugin:0.7.3'
     }
 }
@@ -50,7 +49,6 @@ allprojects {
 
 subprojects {
     apply plugin: 'java-library'
-    apply plugin: 'org.inferred.processors'
 
     tasks.withType(Checkstyle).configureEach {
         enabled = false

changelog/@unreleased/pr-1298.v2.yml changelog/2.68.0/pr-1298.v2.ymlchangelog/@unreleased/pr-1298.v2.yml renamed to changelog/2.68.0/pr-1298.v2.yml

@@ -0,0 +1,5 @@
+type: fix
+fix:
+  description: Support for var in record patterns
+  links:
+  - https://github.com/palantir/palantir-java-format/pull/1312

changelog/2.68.0/pr-1312.v2.yml

@@ -0,0 +1,6 @@
+type: improvement
+improvement:
+  description: Make palantir-java-format support spotless 6.22.0, which is [transitively
+    brought in from baseline to support the configuration cache](https://github.com/palantir/gradle-baseline/pull/3119)
+  links:
+  - https://github.com/palantir/palantir-java-format/pull/1313

changelog/2.69.0/pr-1313.v2.yml

@@ -0,0 +1,5 @@
+type: fix
+fix:
+  description: Update to use the new configuration cache safe `GradleOperatingSystem`
+  links:
+  - https://github.com/palantir/palantir-java-format/pull/1338

changelog/2.70.0/pr-1338.v2.yml

@@ -0,0 +1,11 @@
+type: fix
+fix:
+  description: |-
+    Fix the following error when running under JDK 25 EA:
+
+    ```
+    'java.util.Queue com.sun.tools.javac.util.Log$DeferredDiagnosticHandler.getDiagnostics()'
+    java.lang.NoSuchMethodError: 'java.util.Queue com.sun.tools.javac.util.Log$DeferredDiagnosticHandler.getDiagnostics()'
+    ```
+  links:
+  - https://github.com/palantir/palantir-java-format/pull/1367

changelog/2.71.0/pr-1367.v2.yml

@@ -60,6 +60,7 @@ public String createIndentationString(int indentationLevel) {
     }
 
     /** Runs the Google Java formatter on the given source, with only the given ranges specified. */
+    @SuppressWarnings("for-rollout:StatementSwitchToExpressionSwitch")
     @Nullable
     private TextEdit formatInternal(int kind, String source, IRegion[] regions, int initialIndent) {
         try {

eclipse_plugin/src/main/java/com/palantir/javaformat/java/PalantirJavaFormatter.java

@@ -153,6 +153,7 @@ private static List<Replacement> toReplacements(String source, String replacemen
         return replacements;
     }
 
+    @SuppressWarnings("for-rollout:StatementSwitchToExpressionSwitch")
     private SnippetWrapper snippetWrapper(SnippetKind kind, String source, int initialIndent) {
         /*
          * Synthesize a dummy class around the code snippet provided by Eclipse. The

eclipse_plugin/src/main/java/com/palantir/javaformat/java/SnippetFormatter.java

@@ -115,5 +115,5 @@ tasks.named("test").configure {
 }
 
 gradleTestUtils {
-    gradleVersions = ['7.6.4', '8.8', '8.12.1']
+    gradleVersions = ['8.14.3']
 }

gradle-palantir-java-format/build.gradle

@@ -27,7 +27,6 @@
 import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
 import java.nio.file.StandardOpenOption;
-import java.util.Optional;
 import org.gradle.api.logging.Logger;
 import org.gradle.api.logging.Logging;
 
@@ -79,10 +78,5 @@ public static URI copyToCacheDir(URI srcUri, File cacheDir) {
         }
     }
 
-    private static Path getGradleCacheDir() {
-        return Path.of(Optional.ofNullable(System.getenv("GRADLE_USER_HOME"))
-                .orElseGet(() -> System.getenv("HOME") + "/.gradle"));
-    }
-
     private NativeImageAtomicCopy() {}
 }