Merge branch 'develop' into cr/21-with-graal

build.gradle

@@ -51,6 +51,9 @@ subprojects {
     apply plugin: 'java-library'
     apply plugin: 'org.inferred.processors'
 
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
+
     tasks.withType(Checkstyle).configureEach {
         enabled = false
     }
@@ -68,21 +71,16 @@ subprojects {
 }
 
 javaVersions {
-    libraryTarget = 17
-    runtime = 17
+    libraryTarget = 21
+    runtime = 21
 }
 
 jdks {
-    daemonTarget = 17
+    daemonTarget = 21
 
     jdk(23) {
         distribution = 'graalvm-ce'
         jdkVersion = '23.0.1'
     }
 
 }
-
-javaVersions {
-    libraryTarget = 17
-    runtime = 17
-}

eclipse_plugin/build.gradle

@@ -26,7 +26,7 @@ p2deps {
 }
 
 dependencies {
-    implementation project(':palantir-java-format-all')
+    implementation project(':palantir-java-format')
 }
 
 tasks.named("jar", Jar) {

gradle-palantir-java-format/build.gradle

@@ -101,7 +101,7 @@ tasks.register("copyNativeImage", Copy.class) {
     into("$buildDir/nativeImage")
 }
 
-def writeClasspathsForTests = tasks.register("writeClasspathsForTests") {
+def writeImplClasspath = tasks.register("writeImplClasspath") {
     inputs.files(tasks.named("copyNativeImage"))
     doLast {
         file("$buildDir/impl.classpath").text = configurations.impl.asPath
@@ -110,6 +110,5 @@ def writeClasspathsForTests = tasks.register("writeClasspathsForTests") {
 }
 
 tasks.named("test").configure {
-    dependsOn(writeClasspathsForTests)
+    dependsOn(writeImplClasspath)
 }
-

gradle-palantir-java-format/src/test/groovy/com/palantir/javaformat/gradle/FormatDiffTest.groovy

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.palantir.javaformat.gradle
+package com.palantir.javaformat.gradle;
 
 import com.google.common.base.Splitter
 import com.palantir.javaformat.bootstrap.BootstrappingFormatterService

idea-plugin/build.gradle

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+apply plugin: 'java'
 apply plugin: 'com.palantir.external-publish-intellij'
 
 def name = "palantir-java-format"

idea-plugin/src/test/java/com/palantir/javaformat/intellij/PalantirJavaFormatFormattingServiceTest.java

@@ -78,10 +78,10 @@ public void tearDown() throws Exception {
 
     @Test
     public void defaultFormatSettings() throws Exception {
-        String input = Files.readString(Paths.get(
-                "../palantir-java-format-tests/src/test/resources/com/palantir/javaformat/java/testdata/A.input"));
-        String output = Files.readString(Path.of(
-                "../palantir-java-format-tests/src/test/resources/com/palantir/javaformat/java/testdata/A.output"));
+        String input = Files.readString(
+                Paths.get("../palantir-java-format/src/test/resources/com/palantir/javaformat/java/testdata/A.input"));
+        String output = Files.readString(
+                Path.of("../palantir-java-format/src/test/resources/com/palantir/javaformat/java/testdata/A.output"));
         PsiFile file = createPsiFile("com/foo/FormatTest.java", input);
         ReformatCodeProcessor processor = new ReformatCodeProcessor(file, false);
         WriteCommandAction.runWriteCommandAction(file.getProject(), () -> {

palantir-java-format-benchmarks/src/jmh/java/com/palantir/javaformat/BenchmarkMultiFiles.java

@@ -50,7 +50,7 @@ public static class BenchmarkState {
         private static List<String> getFilesToFormat() {
             Path srcJavaFormatFiles = Paths.get(".")
                     .toAbsolutePath()
-                    .resolve("../palantir-java-format-all/src/main/java/com/palantir/javaformat/java");
+                    .resolve("../palantir-java-format/src/main/java/com/palantir/javaformat/java");
             try (Stream<String> paths = Files.list(srcJavaFormatFiles)
                     .filter(Files::isRegularFile)
                     .map(path -> path.toAbsolutePath().toString())) {

palantir-java-format-jdk-bootstrap/build.gradle

@@ -16,7 +16,6 @@ dependencies {
     implementation 'com.fasterxml.jackson.core:jackson-databind'
 
     // So that we have pjf on our test classpath
-    // TODO(crogoz)
     testImplementation project(':palantir-java-format')
     testImplementation 'org.junit.jupiter:junit-jupiter'
     testImplementation 'org.assertj:assertj-core'

palantir-java-format-native/build.gradle

@@ -129,8 +129,3 @@ configurations {
         }
     }
 }
-
-javaVersion {
-    target = 21
-    runtime = 21
-}

palantir-java-format-spi/build.gradle

@@ -11,8 +11,3 @@ dependencies {
     testImplementation 'org.junit.jupiter:junit-jupiter'
     testImplementation 'com.fasterxml.jackson.core:jackson-databind'
 }
-
-tasks.withType(JavaCompile).named('compileJava') {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
-}

palantir-java-format/build.gradle

@@ -1,7 +1,53 @@
 apply plugin: 'application'
 apply plugin: 'com.palantir.external-publish-jar'
 
+mainClassName = 'com.palantir.javaformat.java.Main'
+
+description = 'Palantir Java Format'
+
 dependencies {
-    api project(':palantir-java-format-all')
-    api project(':palantir-java-format-21')
+    api project(':palantir-java-format-spi')
+    api 'com.google.guava:guava'
+    implementation 'org.functionaljava:functionaljava'
+    implementation 'com.fasterxml.jackson.core:jackson-core'
+    implementation 'com.fasterxml.jackson.core:jackson-databind'
+    implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jdk8'
+    implementation 'com.fasterxml.jackson.module:jackson-module-parameter-names'
+
+    testImplementation 'com.google.guava:guava-testlib'
+    testImplementation 'com.google.truth:truth'
+    testImplementation 'com.google.testing.compile:compile-testing'
+    testImplementation 'org.assertj:assertj-core'
+    testImplementation 'org.junit.jupiter:junit-jupiter-migrationsupport'
+    testImplementation 'org.junit.jupiter:junit-jupiter'
+
+    compileOnly 'com.google.auto.service:auto-service'
+    annotationProcessor 'com.google.auto.service:auto-service'
+    compileOnly "org.immutables:value::annotations"
+    annotationProcessor "org.immutables:value"
+
+    compileOnly 'org.derive4j:derive4j-annotation'
+    annotationProcessor 'org.derive4j:derive4j'
+}
+
+moduleJvmArgs {
+    exports().addAll(
+            'jdk.compiler/com.sun.tools.javac.file',
+            'jdk.compiler/com.sun.tools.javac.main',
+            'jdk.compiler/com.sun.tools.javac.parser',
+            'jdk.compiler/com.sun.tools.javac.tree',
+            'jdk.compiler/com.sun.tools.javac.util',
+            'jdk.compiler/com.sun.tools.javac.code',
+            'jdk.compiler/com.sun.tools.javac.api')
+}
+
+// false positives due to org.junit.runners.* in the test cases
+tasks.named("checkJUnitDependencies") {
+    enabled = false
+}
+
+tasks.named("test") {
+    // Run all classes and tests in parallel
+    // https://junit.org/junit5/docs/current/user-guide/#writing-tests-parallel-execution
+    systemProperty 'junit.jupiter.execution.parallel.mode.default', 'concurrent'
 }

palantir-java-format-21/src/main/java/com/palantir/javaformat/java/java21/Java21InputAstVisitor.java → palantir-java-format/src/main/java/com/palantir/javaformat/java/java21/Java21InputAstVisitor.java

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright 2024 Palantir Technologies Inc. All rights reserved.
+ * (c) Copyright 2025 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,6 +30,7 @@
  * Extends {@link Java14InputAstVisitor} with support for AST nodes that were added or modified in
  * Java 21.
  */
+@SuppressWarnings("Since21")
 public class Java21InputAstVisitor extends Java14InputAstVisitor {
     public Java21InputAstVisitor(OpsBuilder builder, int indentMultiplier) {
         super(builder, indentMultiplier);