From efa018598d141132e941427edba3e9ed7a964a6a Mon Sep 17 00:00:00 2001 From: Michael Ernst Date: Fri, 12 Dec 2025 10:38:33 -0800 Subject: [PATCH 1/4] Better definition `requireJavadoc` task --- build.gradle | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 1fb03f5..5fffe3c 100644 --- a/build.gradle +++ b/build.gradle @@ -243,9 +243,10 @@ dependencies { tasks.register("requireJavadoc", JavaExec) { group = "Documentation" description = "Ensures that Javadoc documentation exists." + inputs.files(sourceSets.main.allJava) mainClass = "org.plumelib.javadoc.RequireJavadoc" classpath = configurations.requireJavadoc - args("src/main/java") + args(sourceSets.main.allJava.srcDirs.collect{it.getAbsolutePath()}) jvmArgs += [ "--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED", "--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED", From f703403e976430424bd39eb6eae0339be3062956 Mon Sep 17 00:00:00 2001 From: Michael Ernst Date: Fri, 12 Dec 2025 10:42:21 -0800 Subject: [PATCH 2/4] Fix indentation --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 5fffe3c..d14c895 100644 --- a/build.gradle +++ b/build.gradle @@ -243,7 +243,7 @@ dependencies { tasks.register("requireJavadoc", JavaExec) { group = "Documentation" description = "Ensures that Javadoc documentation exists." - inputs.files(sourceSets.main.allJava) + inputs.files(sourceSets.main.allJava) mainClass = "org.plumelib.javadoc.RequireJavadoc" classpath = configurations.requireJavadoc args(sourceSets.main.allJava.srcDirs.collect{it.getAbsolutePath()}) From c6f9147e4a416779f2d7fd480d78716dc3ab1b2b Mon Sep 17 00:00:00 2001 From: Michael Ernst Date: Fri, 12 Dec 2025 10:47:34 -0800 Subject: [PATCH 3/4] Add `def` to task registration --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index d14c895..11913b8 100644 --- a/build.gradle +++ b/build.gradle @@ -240,7 +240,7 @@ configurations { dependencies { requireJavadoc("org.plumelib:require-javadoc:2.0.0") } -tasks.register("requireJavadoc", JavaExec) { +def requireJavadoc = tasks.register("requireJavadoc", JavaExec) { group = "Documentation" description = "Ensures that Javadoc documentation exists." inputs.files(sourceSets.main.allJava) From 48b2eeb1e3f66406a168a73b2170fc60543cadd6 Mon Sep 17 00:00:00 2001 From: Michael Ernst Date: Sat, 20 Dec 2025 08:44:51 -0800 Subject: [PATCH 4/4] No longer Java source version 8 --- build.gradle | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 11913b8..58b0fda 100644 --- a/build.gradle +++ b/build.gradle @@ -23,6 +23,7 @@ plugins { } repositories { + mavenLocal() mavenCentral() maven { url = "https://central.sonatype.com/repository/maven-snapshots/" } gradlePluginPortal() @@ -95,14 +96,11 @@ 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" + options.compilerArgs << "-Xlint:all,-processing,-this-escape" } else { - options.compilerArgs << "-Xlint:all,-processing,-options" + options.compilerArgs << "-Xlint:all,-processing" } - // // Only needed when debugging. - // options.compilerArgs << "-g" } if (isJava21orHigher) { apply plugin: "net.ltgt.errorprone" @@ -205,7 +203,7 @@ javadoc { } check.dependsOn(javadoc) -tasks.register("javadocWeb", DefaultTask) { +tasks.register("javadocWeb", Javadoc) { description = "Upload API documentation to website." dependsOn(javadocWebUpload, javadocWebChgrp, javadocWebChmod) }