Reduce diffs between buildfiles

Author: mernst

build.gradle

@@ -5,12 +5,16 @@ plugins {
   id("com.gradleup.shadow").version("9.2.2")
 
   // Code formatting; defines targets "spotlessApply" and "spotlessCheck"
-  // Requires JDK 11 or higher; the plugin crashes under JDK 8.
+  // Version 8.0.0 and later requires Java 17+.
   id("com.diffplug.spotless").version("8.0.0")
 
   // Error Prone linter
   id("net.ltgt.errorprone").version("4.3.0") apply false
 
+  // TODO: reinstate when all PMD warnings have been addressed.
+  // // PMD linter
+  // id("pmd")
+
   // Checker Framework pluggable type-checking
   id("org.checkerframework").version("0.6.60")
 }
@@ -81,17 +85,27 @@ spotless {
 
 // Error Prone linter
 
+tasks.withType(JavaCompile).configureEach {
+  options.forkOptions.jvmArgs += "-Xmx6g"
+  options.compilerArgs << "-Werror"
+  // "-processing" avoids javac warning "No processor claimed any of these annotations".
+  // "-options" is because of JDK 21 warning "source value 8 is obsolete..."
+  if (isJava21orHigher) {
+    options.compilerArgs << "-Xlint:all,-processing,-options,-this-escape"
+  } else {
+    options.compilerArgs << "-Xlint:all,-processing,-options"
+  }
+  // // Only needed when debugging.
+  // options.compilerArgs << "-g"
+}
 if (isJava21orHigher) {
   apply plugin: "net.ltgt.errorprone"
   dependencies {
     errorprone("com.google.errorprone:error_prone_core:${errorproneVersion}")
   }
   tasks.withType(JavaCompile).configureEach {
-    // "-processing" avoids javac warning "No processor claimed any of these annotations".
-    // "-options" avoids javac warning "source value 8 is obsolete and will be removed in a future release"; remove it when we no longer support Java 8.
-    options.compilerArgs << "-Xlint:all,-processing,-options" << "-Werror"
     options.errorprone {
-      disable("ExtendsObject")  // Incorrect when using the Checker Framework
+      disable("ExtendsObject")  // Incorrect when using the Checker Framework.
       disable("ReferenceEquality") // Use Interning Checker instead.
       // disable("StringSplitter") // Obscure case isn't likely.
       disable("AnnotateFormatMethod") // Error Prone doesn't know about Checker Framework @FormatMethod.
@@ -100,6 +114,18 @@ if (isJava21orHigher) {
   }
 }
 
+// TODO: reinstate when all PMD warnings have been addressed.
+// // PMD linter
+//
+// pmd {
+//   toolVersion = "7.17.0"
+//   ruleSetFiles =(files("${rootDir}/.pmd-ruleset.xml"))
+//   consoleOutput = true
+//   ignoreFailures = false
+//   incrementalAnalysis = true
+// }
+
+
 // Checker Framework pluggable type-checking
 
 apply plugin: "org.checkerframework"
@@ -121,6 +147,8 @@ checkerFramework {
   ]
   extraJavacArgs = [
     "-Werror",
+    "-Aversion",
+    // "-verbose",
     "-AcheckPurityAnnotations",
     "-ArequirePrefixInWarningSuppressions",
     "-AwarnRedundantAnnotations",

gradle.properties

@@ -0,0 +1 @@
+org.gradle.jvmargs=-Xmx6g