Merge branch 'master' into invoke-viewpointadapter-constructor

eisop · Sep 30, 2024 · 56dde2f · 56dde2f
2 parents 8228faa + 79827b2
commit 56dde2f
Show file tree

Hide file tree

Showing 8 changed files with 49 additions and 13 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -36,10 +36,10 @@ 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.0.1
+      uses: gradle/actions/setup-gradle@v4.1.0
 
     - name: Setup Bazel
-      uses: bazel-contrib/setup-bazel@0.8.5
+      uses: bazel-contrib/setup-bazel@0.9.0
       if: matrix.script == 'cftests-nonjunit'
       with:
         # Avoid downloading Bazel every time.
@@ -80,7 +80,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.0.1
+      uses: gradle/actions/setup-gradle@v4.1.0
 
     - name: Run test script checker/bin-devel/test-${{ matrix.script }}
       run: ./checker/bin-devel/test-${{ matrix.script }}.sh
@@ -125,10 +125,10 @@ 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.0.1
+      uses: gradle/actions/setup-gradle@v4.1.0
 
     - name: Setup Bazel
-      uses: bazel-contrib/setup-bazel@0.8.5
+      uses: bazel-contrib/setup-bazel@0.9.0
       if: matrix.script == 'cftests-nonjunit'
       with:
         # Avoid downloading Bazel every time.
@@ -179,7 +179,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.0.1
+      uses: gradle/actions/setup-gradle@v4.1.0
 
     - name: Install coreutils on MacOS
       if: matrix.os == 'macos-latest'

diff --git a/build.gradle b/build.gradle
@@ -74,7 +74,7 @@ ext {
 
     versions = [
         autoValue       : '1.11.0',
-        errorprone      : '2.31.0',
+        errorprone      : '2.32.0',
         hashmapUtil     : '0.0.1',
         junit           : '4.13.2',
         lombok          : '1.18.34',
@@ -873,7 +873,12 @@ subprojects {
         //  * Temporarily comment out "-Werror" elsewhere in this file
         //  * Repeatedly run `./gradlew clean compileJava` and fix all errors
         //  * Uncomment "-Werror"
-        errorprone group: 'com.google.errorprone', name: 'error_prone_core', version: versions.errorprone
+        if (currentRuntimeJavaVersion >= 17) {
+            errorprone group: 'com.google.errorprone', name: 'error_prone_core', version: versions.errorprone
+        } else {
+            // EP 2.31.0 is the last release that works on Java < 17.
+            errorprone group: 'com.google.errorprone', name: 'error_prone_core', version: '2.31.0'
+        }
 
         // TODO: it's a bug that annotatedlib:guava requires the error_prone_annotations dependency.
         annotatedGuava "com.google.errorprone:error_prone_annotations:${versions.errorprone}"

diff --git a/checker/build.gradle b/checker/build.gradle
@@ -84,9 +84,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.16.1'
+    testImplementation 'commons-io:commons-io:2.17.0'
     // For the Nullness Checker test of junit-assertions.astub in JUnitNull.java
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.11.0'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.11.1'
     testImplementation 'org.apiguardian:apiguardian-api:1.1.2'
     // For tests that use JSpecify annotations
     testImplementation 'org.jspecify:jspecify:1.0.0'

diff --git a/docs/examples/errorprone/build.gradle b/docs/examples/errorprone/build.gradle
@@ -26,8 +26,10 @@ dependencies {
     // Must use at least version 2.4.0 of Error Prone.
     if (JavaVersion.current() == JavaVersion.VERSION_1_8) {
         errorprone 'com.google.errorprone:error_prone_core:2.10.0'
-    } else {
+    } else if (JavaVersion.current() < JavaVersion.VERSION_17) {
         errorprone 'com.google.errorprone:error_prone_core:2.31.0'
+    } else {
+        errorprone 'com.google.errorprone:error_prone_core:2.32.0'
     }
 }
 

diff --git a/docs/manual/contributors.tex b/docs/manual/contributors.tex
@@ -2,6 +2,7 @@
 Adian Qian,
 Aditya Singh,
 Akash Srivastava,
+Alex Cook,
 Alex Liu,
 Alvin Abdagic,
 Anant Jain,

diff --git a/docs/manual/external-tools.tex b/docs/manual/external-tools.tex
@@ -795,6 +795,34 @@
 \ahreforurl{https://github.com/kelloggm/checkerframework-gradle-plugin}{Checker
   Framework Gradle plugin}.  Its documentation explains how to use it.
 
+For example, to use Gradle with the EISOP Checker Framework Nullness Checker,
+add the following configuration to your \<build.gradle> file.
+\begin{Verbatim}
+plugins {
+    // Checker Framework pluggable type-checking
+    id 'org.checkerframework' version '0.6.44'
+}
+
+apply plugin: 'org.checkerframework'
+
+checkerFramework {
+  checkers = [
+    'org.checkerframework.checker.nullness.NullnessChecker',
+  ]
+}
+
+ext {
+    versions = [
+        eisopVersion: '3.42.0-eisop1',
+    ]
+}
+
+dependencies {
+    compileOnly "io.github.eisop:checker-qual:${versions.eisopVersion}"
+    testCompileOnly "io.github.eisop:checker-qual:${versions.eisopVersion}"
+    checkerFramework "io.github.eisop:checker:${versions.eisopVersion}"
+}
+\end{Verbatim}
 
 \sectionAndLabel{IntelliJ IDEA}{intellij}
 

diff --git a/docs/tutorial/webpages/user-input-cmd.html b/docs/tutorial/webpages/user-input-cmd.html
@@ -185,7 +185,7 @@ <h4>4. Fix the Code</h4>
         You need to make two changes to <code>RegexExample.java</code>
         to correctly handle invalid user input.  At the top of the file, add</p>
         <pre>
-import org.checkerframework.checker.regex.RegexUtil;
+import org.checkerframework.checker.regex.util.RegexUtil;
 </pre>
         <p>
         After variable <code>regex</code> is defined but before it is

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME