Use modern infra to support multiple JDK versions (#1226)

Use modern infra to support multiple JDK versions

Author: CRogers

build.gradle

@@ -30,6 +30,7 @@ apply plugin: 'com.palantir.jdks'
 apply plugin: 'com.palantir.jdks.latest'
 apply plugin: 'com.palantir.baseline'
 apply plugin: 'com.palantir.consistent-versions'
+apply plugin: 'com.palantir.baseline-java-versions'
 
 version System.env.CIRCLE_TAG ?: gitVersion()
 
@@ -49,15 +50,13 @@ subprojects {
     apply plugin: 'java-library'
     apply plugin: 'org.inferred.processors'
 
-    sourceCompatibility = 11
-    targetCompatibility = 11
-
     tasks.withType(Checkstyle).configureEach {
         enabled = false
     }
 
     tasks.withType(JavaCompile).configureEach {
         options.errorprone.disable 'PreconditionsConstantMessage', 'PreferSafeLoggableExceptions', 'PreferSafeLoggingPreconditions'
+        options.errorprone.disable 'StrictUnusedVariable'
     }
 
     // Run `./gradlew test -Drecreate=true` to recreate all the expected
@@ -67,33 +66,9 @@ subprojects {
     }
 }
 
-/**
- * There is a bunch of truly snowflaky stuff going on this project, because we have this Java14InputAstVisitor class
- * which needs to implement some interface methods defined in com.sun.source.util.TreePathScanner, which varies
- * depending on what JVM the formatter is running on!
- */
-idea.project.ipr.withXml { xml ->
-    /**
-     * Even though the p-j-f codebase has sourceCompat=11 and targetCompat=11, we have to convince IntelliJ to let us
-     * compile against methods from a newer JVM like visitYield, visitSwitchExpression etc. Hence why we turn off the
-     * --release flag (using USE_RELEASE_OPTION below)
-     */
-    def compilerConfiguration = xml.asNode().component.find({ it.'@name' == 'CompilerConfiguration' })
-    compilerConfiguration.value().add(new XmlParser().parseText('<option name="USE_RELEASE_OPTION" value="false" />'))
-    def module = compilerConfiguration.bytecodeTargetLevel.module.find({ it.'@name' == 'palantir-java-format' })
-    // Module is null on jdk11
-    if (module != null) {
-        module.attributes().target = "14"
-    }
-
-    xml.asNode().value().add(new XmlParser().parseText('''
-    <component name="JavacSettings">
-        <option name="PREFER_TARGET_JDK_COMPILER" value="false" />
-        <option name="ADDITIONAL_OPTIONS_OVERRIDE">
-        <module name="palantir-java-format" options="--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
-        </option>
-    </component>
-    '''))
+javaVersions {
+    libraryTarget = 17
+    runtime = 17
 }
 
 jdks {

changelog/@unreleased/pr-1226.v2.yml

@@ -0,0 +1,5 @@
+type: fix
+fix:
+  description: Use modern infra to support multiple JDK versions
+  links:
+  - https://github.com/palantir/palantir-java-format/pull/1226

gradle/javadoc.options

@@ -69,14 +69,6 @@ dependencies {
     testImplementation 'org.junit.platform:junit-platform-launcher'
 }
 
-tasks.withType(JavaCompile).configureEach {
-    options.errorprone.disable 'StrictUnusedVariable'
-    // opt out of safe-logging checks which don't map correctly to idea plugins
-    options.errorprone.disable 'PreferSafeLogger'
-    options.errorprone.disable 'PreferSafeLoggableExceptions'
-    options.errorprone.disable 'PreferSafeLoggingPreconditions'
-}
-
 // Javadoc fails if there are no public classes to javadoc, so make it stop complaining.
 tasks.named("javadoc", Javadoc) {
     failOnError = false

idea-plugin/build.gradle

@@ -11,3 +11,8 @@ 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-spi/build.gradle

@@ -30,40 +30,24 @@ dependencies {
     annotationProcessor 'org.derive4j:derive4j'
 }
 
-def exports = [
-        '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'
-]
-
-def jvmArgList = exports.collect { value -> "--add-exports=${value}=ALL-UNNAMED".toString() }
-
-tasks.withType(JavaCompile).configureEach {
-    options.errorprone.disable 'StrictUnusedVariable'
-
-    // Allow access to internal javac apis
-    options.compilerArgs += jvmArgList
-
-    if (JavaVersion.current() < JavaVersion.VERSION_14) {
-        excludes = ['**/Java14InputAstVisitor.java']
-    }
-}
-
-tasks.withType(Test).configureEach {
-    jvmArgs = jvmArgList
-}
-
-tasks.withType(Javadoc).configureEach {
-    // Allow access to internal javac apis
-    options.optionFiles << file('../gradle/javadoc.options')
-
-    if (JavaVersion.current() < JavaVersion.VERSION_14) {
-        exclude '**/Java14InputAstVisitor.java'
-    }
+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')
+}
+
+tasks.withType(JavaCompile).named('compileJava') {
+    // By setting the source and target compatibility to 11, while still using a higher level
+    // JDK for compilation, we can compile against the AST classes we need to support >11 source
+    // features but still run on 11 JDKs (with the addition of checking the java version at runtime
+    // and dynamically loading the correct formatter implementation)
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
 }
 
 // false positives due to org.junit.runners.* in the test cases
@@ -76,16 +60,3 @@ tasks.named("test") {
     // https://junit.org/junit5/docs/current/user-guide/#writing-tests-parallel-execution
     systemProperty 'junit.jupiter.execution.parallel.mode.default', 'concurrent'
 }
-
-// necessary to compile Java14InputAstVisitor
-idea {
-    module.languageLevel = new org.gradle.plugins.ide.idea.model.IdeaLanguageLevel(14)
-}
-
-// This block may be replaced by BaselineExportsExtension exports
-// once https://github.com/gradle/gradle/issues/18824 is resolved.
-tasks.named("jar", Jar) {
-    manifest {
-        attributes('Add-Exports': exports.join(' '))
-    }
-}

palantir-java-format/build.gradle

@@ -52,6 +52,7 @@
 /**
  * Extends {@link JavaInputAstVisitor} with support for AST nodes that were added or modified for Java 14.
  */
+@SuppressWarnings("Since15")
 public class Java14InputAstVisitor extends JavaInputAstVisitor {
     private static final Method COMPILATION_UNIT_TREE_GET_MODULE =
             maybeGetMethod(CompilationUnitTree.class, "getModule");