Merge branch 'master' into update-changelog

.github/workflows/ci.yml

@@ -62,6 +62,7 @@ jobs:
     permissions:
       contents: read
     strategy:
+      fail-fast: true
       matrix:
         # No need to run 'cftests-junit-jdk21' on JDK 21.
         script: ['typecheck-part1', 'typecheck-part2', 'guava', 'plume-lib', 'daikon-part1', 'daikon-part2', 'jspecify-conformance', 'jspecify-reference-checker']
@@ -91,7 +92,7 @@ jobs:
     permissions:
       contents: read
     strategy:
-      fail-fast: false
+      fail-fast: true
       matrix:
         # jspecify-conformance and jspecify-reference-checker only tested on JDK 21.
         script: ['cftests-junit', 'cftests-nonjunit', 'cftests-junit-jdk21', 'typecheck-part1', 'typecheck-part2', 'guava', 'plume-lib', 'daikon-part1', 'daikon-part2']

build.gradle

@@ -617,6 +617,30 @@ task htmlValidate(type: Exec, group: 'Format') {
     ]
 }
 
+def javadocDirs = [
+    project(':checker').sourceSets.main.allJava,
+    project(':checker').sourceSets.test.allJava,
+    project(':checker-qual').sourceSets.main.allJava,
+    project(':checker-util').sourceSets.main.allJava,
+    project(':checker-util').sourceSets.test.allJava,
+    project(':dataflow').sourceSets.main.allJava,
+    project(':dataflow').sourceSets.test.allJava,
+    project(':framework').sourceSets.main.allJava,
+    project(':framework').sourceSets.test.allJava,
+    project(':framework-test').sourceSets.main.allJava,
+    project(':framework-test').sourceSets.test.allJava,
+    project(':javacutil').sourceSets.main.allJava
+]
+
+def requireJavadocDirs = javadocDirs
+
+project(':checker').afterEvaluate {
+    requireJavadocDirs += project(':checker').sourceSets.testannotations.allJava
+}
+
+project(':framework').afterEvaluate {
+    requireJavadocDirs += project(':framework').sourceSets.testannotations.allJava
+}
 
 // `gradle allJavadoc` builds the Javadoc for all modules in `docs/api`.
 //   This is what is published to checkerframework.org.
@@ -628,20 +652,7 @@ task allJavadoc(type: Javadoc, group: 'Documentation') {
     description = 'Generates API documentation that includes all the modules.'
     dependsOn(':checker:shadowJar', 'getPlumeScripts', 'getHtmlTools')
     destinationDir = file("${rootDir}/docs/api")
-    source(
-            project(':checker-util').sourceSets.main.allJava,
-            project(':checker-util').sourceSets.test.allJava,
-            project(':checker-qual').sourceSets.main.allJava,
-            project(':checker').sourceSets.main.allJava,
-            project(':checker').sourceSets.test.allJava,
-            project(':framework').sourceSets.main.allJava,
-            project(':framework').sourceSets.test.allJava,
-            project(':dataflow').sourceSets.main.allJava,
-            project(':dataflow').sourceSets.test.allJava,
-            project(':javacutil').sourceSets.main.allJava,
-            project(':framework-test').sourceSets.main.allJava,
-            project(':framework-test').sourceSets.test.allJava
-            )
+    source javadocDirs
 
     doFirst {
         source(
@@ -685,7 +696,8 @@ task requireJavadoc(type: JavaExec, group: 'Documentation') {
     description = 'Ensures that Javadoc documentation exists in source code.'
     mainClass = 'org.plumelib.javadoc.RequireJavadoc'
     classpath = configurations.requireJavadoc
-    args 'checker/src/main/java', 'checker-qual/src/main/java', 'checker-util/src/main/java', 'dataflow/src/main/java', 'framework/src/main/java', 'framework-test/src/main/java', 'javacutil/src/main/java'
+    // Convert each srcDir to its absolute path and flatten the list
+    args requireJavadocDirs.collect { it.srcDirs*.absolutePath }.flatten()
 }
 
 

checker/build.gradle

@@ -21,7 +21,11 @@ sourceSets {
             exclude '**/org/checkerframework/checker/resourceleak/MustCallInference.java'
         }
     }
-    testannotations
+    testannotations {
+        java {
+            srcDirs = ['src/testannotations/java']
+        }
+    }
 }
 
 sourcesJar {

framework/build.gradle

@@ -28,7 +28,11 @@ sourceSets {
             exclude '**/org/checkerframework/framework/stub/ToIndexFileConverter.java'
         }
     }
-    testannotations
+    testannotations {
+        java {
+            srcDirs = ['src/testannotations/java']
+        }
+    }
 }
 
 sourcesJar {