Merge branch 'master' into performance-optimize-001

zyf265600 · web-flow · commit e8671e9de009 · 2025-08-13T10:22:45.000-04:00
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,22 +1,12 @@
 version: 2
 updates:
 - package-ecosystem: "gradle"
-  directory: "/"
-  schedule:
-    interval: "daily"
-
-- package-ecosystem: "gradle"
-  directory: "/docs/examples/errorprone/"
-  schedule:
-    interval: "daily"
-
-- package-ecosystem: "gradle"
-  directory: "/docs/examples/jspecify/"
-  schedule:
-    interval: "daily"
-
-- package-ecosystem: "gradle"
-  directory: "/docs/examples/lombok/"
+  directories:
+    - "/"
+    - "/docs/examples/errorprone/"
+    - "/docs/examples/jspecify/"
+    - "/docs/examples/lombok/"
+    - "/docs/examples/nullaway/"
   schedule:
     interval: "daily"
 
@@ -25,11 +15,6 @@ updates:
   schedule:
     interval: "daily"
 
-- package-ecosystem: "gradle"
-  directory: "/docs/examples/nullaway/"
-  schedule:
-    interval: "daily"
-
 - package-ecosystem: "github-actions"
   directory: "/"
   schedule:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -37,7 +37,7 @@ jobs:
     # Configure Gradle for optimal use in GitHub Actions, including caching of downloaded dependencies.
     # See: https://github.com/gradle/actions/blob/main/setup-gradle/README.md
     - name: Setup Gradle
-      uses: gradle/actions/setup-gradle@v4.4.1
+      uses: gradle/actions/setup-gradle@v4.4.2
 
     - name: Setup Bazel
       uses: bazel-contrib/setup-bazel@0.15.0
@@ -93,7 +93,7 @@ jobs:
     # Configure Gradle for optimal use in GitHub Actions, including caching of downloaded dependencies.
     # See: https://github.com/gradle/actions/blob/main/setup-gradle/README.md
     - name: Setup Gradle
-      uses: gradle/actions/setup-gradle@v4.4.1
+      uses: gradle/actions/setup-gradle@v4.4.2
       # Setup for misc tests
     - name: Install misc dependencies
       if: ${{ matrix.script == 'misc' }}
@@ -207,7 +207,7 @@ jobs:
     # Configure Gradle for optimal use in GitHub Actions, including caching of downloaded dependencies.
     # See: https://github.com/gradle/actions/blob/main/setup-gradle/README.md
     - name: Setup Gradle
-      uses: gradle/actions/setup-gradle@v4.4.1
+      uses: gradle/actions/setup-gradle@v4.4.2
     - name: Install misc dependencies
       if: ${{ matrix.script == 'misc' }}
       run: |
@@ -266,7 +266,7 @@ jobs:
     # Configure Gradle for optimal use in GitHub Actions, including caching of downloaded dependencies.
     # See: https://github.com/gradle/actions/blob/main/setup-gradle/README.md
     - name: Setup Gradle
-      uses: gradle/actions/setup-gradle@v4.4.1
+      uses: gradle/actions/setup-gradle@v4.4.2
 
     - name: Install coreutils on MacOS
       if: ${{ matrix.os == 'macos-latest' }}
diff --git a/build.gradle b/build.gradle
@@ -17,7 +17,7 @@ plugins {
     // Code formatting; defines targets "spotlessApply" and "spotlessCheck".
     // https://github.com/diffplug/spotless/tags ; see tags starting "gradle/"
     // Only works on JDK 11+ (even including the plugin crashes Gradle on JDK 8).
-    id 'com.diffplug.spotless' version '7.0.4'
+    id 'com.diffplug.spotless' version '7.2.1'
 }
 
 // There is another `repositories { ... }` block below; if you change this one, change that one as well.
@@ -86,7 +86,7 @@ ext {
         //  * Temporarily comment out "-Werror" elsewhere in this file
         //  * Repeatedly run `./gradlew clean compileJava` and fix all errors
         //  * Uncomment "-Werror"
-        errorprone      : '2.39.0',
+        errorprone      : '2.40.0',
         // NOTE: Google Java Format requires JDK 17 or higher as of version 1.25.0.
         googleJavaFormat : '1.25.2',
         hashmapUtil     : '0.0.1',
@@ -333,6 +333,19 @@ allprojects { currentProj ->
             formatAnnotations().addTypeAnnotation("PolyInitialized").addTypeAnnotation("PolyVP").addTypeAnnotation("ReceiverDependentQual")
         }
 
+        java {
+            if (currentProj != currentProj.rootProject) {
+                // not the root project; format all .java files in the sub-project src folders
+                target 'src/**/*.java'
+            }
+            targetExclude doNotFormat
+
+            // This really just removes the wildcard imports - they are not expanded.
+            // That is fine for src files, which should then be manually fixed.
+            // There are currently many tests with wildcard imports, so do not enable this for tests.
+            removeWildcardImports()
+        }
+
         // Only define a groovyGradle task on the root project, for simplicity in setting the target pattern
         if (currentProj == currentProj.rootProject) {
             groovyGradle {
diff --git a/checker/build.gradle b/checker/build.gradle
@@ -3,7 +3,7 @@ plugins {
     id 'base'
     // https://github.com/n0mer/gradle-git-properties
     // Generates file build/resources/main/git.properties when the `classes` task runs.
-    id 'com.gorylenko.gradle-git-properties' version '2.5.0'
+    id 'com.gorylenko.gradle-git-properties' version '2.5.2'
 }
 
 sourceSets {
@@ -81,9 +81,9 @@ dependencies {
     // For the Resource Leak Checker's support for JavaEE.
     testImplementation 'javax.servlet:javax.servlet-api:4.0.1'
     // For the Resource Leak Checker's support for IOUtils.
-    testImplementation 'commons-io:commons-io:2.19.0'
+    testImplementation 'commons-io:commons-io:2.20.0'
     // For the Nullness Checker test of junit-assertions.astub in JUnitNull.java
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.13.3'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.13.4'
     testImplementation 'org.apiguardian:apiguardian-api:1.1.2'
     // For tests that use JSpecify annotations
     testImplementation 'org.jspecify:jspecify:1.0.0'
diff --git a/checker/tests/README b/checker/tests/README
@@ -78,7 +78,7 @@ a comment at the top of the file, in this format:
   // @skip-test until the issue is fixed
 
 
-Specifying expected warnings and errors
+Specifying expected errors and warnings
 =======================================
 
 A test case is a Java file that uses stylized comments to indicate expected
diff --git a/docs/examples/MavenExample-framework-all/pom.xml b/docs/examples/MavenExample-framework-all/pom.xml
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
-      <version>3.1</version>
+      <version>3.18.0</version>
     </dependency>
     <dependency>
         <groupId>javax.servlet</groupId>
diff --git a/docs/examples/MavenExample/pom.xml b/docs/examples/MavenExample/pom.xml
@@ -38,7 +38,7 @@
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
-      <version>3.17.0</version>
+      <version>3.18.0</version>
     </dependency>
     <dependency>
         <groupId>javax.servlet</groupId>
diff --git a/docs/examples/errorprone/build.gradle b/docs/examples/errorprone/build.gradle
@@ -34,7 +34,7 @@ if (false) {
 
 dependencies {
     if (JavaVersion.current() >= JavaVersion.VERSION_17) {
-        errorprone 'com.google.errorprone:error_prone_core:2.39.0'
+        errorprone 'com.google.errorprone:error_prone_core:2.41.0'
     }
 }
 
diff --git a/docs/examples/jspecify/build.gradle b/docs/examples/jspecify/build.gradle
@@ -35,7 +35,7 @@ if (false) {
 dependencies {
     compileOnly 'org.jspecify:jspecify:1.0.0'
     if (JavaVersion.current() >= JavaVersion.VERSION_17) {
-        errorprone 'com.google.errorprone:error_prone_core:2.39.0'
+        errorprone 'com.google.errorprone:error_prone_core:2.41.0'
     }
 }
 
diff --git a/docs/examples/nullaway/build.gradle b/docs/examples/nullaway/build.gradle
@@ -34,9 +34,9 @@ if (false) {
 
 dependencies {
     if (JavaVersion.current() >= JavaVersion.VERSION_17) {
-        errorprone 'com.google.errorprone:error_prone_core:2.39.0'
+        errorprone 'com.google.errorprone:error_prone_core:2.41.0'
     }
-    errorprone 'com.uber.nullaway:nullaway:0.12.7'
+    errorprone 'com.uber.nullaway:nullaway:0.12.8'
 }
 
 repositories {
diff --git a/docs/manual/constant-value-checker.tex b/docs/manual/constant-value-checker.tex
@@ -371,7 +371,7 @@
 \end{figure}
 
 As with any unsound behavior in the Checker Framework, this option reduces
-the number of warnings and errors produced, and may reduce the number of
+the number of errors and warnings produced, and may reduce the number of
 \<@IntRange> qualifiers that you need to write in the source code.
 However, it is possible that at run time, an expression might evaluate to a
 value that is not in its \<@IntRange> qualifier.  You should either accept
diff --git a/docs/manual/faq.tex b/docs/manual/faq.tex
@@ -475,7 +475,7 @@
 
 
 
-\sectionAndLabel{How to handle warnings and errors}{faq-warnings-section}
+\sectionAndLabel{How to handle errors and warnings}{faq-warnings-section}
 
 \subsectionAndLabel{What should I do if a checker issues a warning about my code?}{faq-handling-warnings}
 
diff --git a/docs/manual/troubleshooting.tex b/docs/manual/troubleshooting.tex
@@ -768,11 +768,11 @@
 \begin{Verbatim}
 brew update
 brew install git graphviz ant hevea maven librsvg unzip make
-brew install --cask temurin17
+brew install --cask temurin@17
 brew install --cask mactex
 \end{Verbatim}
 
-Note: Running \<brew install --cask temurin17> is only necessary if you do not
+Note: Running \<brew install --cask temurin@17> is only necessary if you do not
 already have a JDK that is compatible with the Checker Framework installed.
 
 Make a \<latex> directory and copy \<hevea.sty> file into it.
diff --git a/docs/manual/warnings.tex b/docs/manual/warnings.tex
@@ -573,10 +573,10 @@
 You can also use these options to affect entire packages or directories/folders.
 
 Set the \code{-AskipUses} command-line option to a
-regular expression that matches fully-qualified class names (not file names) for which warnings and errors
+regular expression that matches fully-qualified class names (not file names) for which errors and warnings
 should be suppressed.
 Or, set the \code{-AonlyUses} command-line option to a
-regular expression that matches fully-qualified class names (not file names) for which warnings and errors
+regular expression that matches fully-qualified class names (not file names) for which errors and warnings
 should be emitted; warnings about uses of all other classes will be suppressed.
 The regular expressions are unanchored, unless you anchor them yourself
 with ``\codesize\verb|^|'' and/or ``\codesize\verb|$|''.
@@ -625,7 +625,7 @@
 You can also use these options to affect entire packages or directories/folders.
 
 Set the \code{-AskipDefs} command-line option to a
-regular expression that matches fully-qualified class names (not file names) in whose definition warnings and errors
+regular expression that matches fully-qualified class names (not file names) in whose definition errors and warnings
 should be suppressed.
 Or, set the \code{-AonlyDefs} command-line option to a
 regular expression that matches fully-qualified class names (not file names) whose

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ if (false) {`
`34`	`34`
`35`	`35`	`dependencies {`
`36`	`36`	`if (JavaVersion.current() >= JavaVersion.VERSION_17) {`
`37`		`- errorprone 'com.google.errorprone:error_prone_core:2.39.0'`
	`37`	`+ errorprone 'com.google.errorprone:error_prone_core:2.41.0'`
`38`	`38`	`}`
`39`	`39`	`}`
`40`	`40`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ if (false) {`
`35`	`35`	`dependencies {`
`36`	`36`	`compileOnly 'org.jspecify:jspecify:1.0.0'`
`37`	`37`	`if (JavaVersion.current() >= JavaVersion.VERSION_17) {`
`38`		`- errorprone 'com.google.errorprone:error_prone_core:2.39.0'`
	`38`	`+ errorprone 'com.google.errorprone:error_prone_core:2.41.0'`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`
Original file line number	Diff line number	Diff line change
`@@ -34,9 +34,9 @@ if (false) {`
`34`	`34`
`35`	`35`	`dependencies {`
`36`	`36`	`if (JavaVersion.current() >= JavaVersion.VERSION_17) {`
`37`		`- errorprone 'com.google.errorprone:error_prone_core:2.39.0'`
	`37`	`+ errorprone 'com.google.errorprone:error_prone_core:2.41.0'`
`38`	`38`	`}`
`39`		`- errorprone 'com.uber.nullaway:nullaway:0.12.7'`
	`39`	`+ errorprone 'com.uber.nullaway:nullaway:0.12.8'`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`repositories {`