Merge branch 'master' into use-eisop-dependency

eisop · Jan 5, 2025 · a3a2ee7 · a3a2ee7
2 parents c110c6a + 59d030f
commit a3a2ee7
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -7,7 +7,7 @@ Version 3.42.0-eisop6 (January ??, 2025)
 
 **Closed issues:**
 
-eisop#1033.
+eisop#1003, eisop#1033.
 
 
 Version 3.42.0-eisop5 (December 20, 2024)

diff --git a/docs/developer/release/README-release-process.html b/docs/developer/release/README-release-process.html
@@ -299,10 +299,11 @@ <h4 id="using_snapshot_release_gradle_groovy">Gradle Groovy (<code>build.gradle<
   maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
 }
 
-ext.checkerFrameworkVersion = '3.28.1-SNAPSHOT'
+ext.checkerFrameworkVersion = '3.42.0-eisop5-SNAPSHOT'
 dependencies {
   compileOnly "io.github.eisop:checker-qual:${checkerFrameworkVersion}"
   testCompileOnly "io.github.eisop:checker-qual:${checkerFrameworkVersion}"
+  checkerFramework "io.github.eisop:checker-qual:${checkerFrameworkVersion}"
   checkerFramework "io.github.eisop:checker:${checkerFrameworkVersion}"
 }
 configurations.all {
@@ -315,10 +316,11 @@ <h4 id="using_snapshot_release_gradle_kotlin">Gradle Kotlin (<code>build.gradle.
   to use the snapshot version of the Checker Framework:
 
   <pre>
-val checkerFrameworkVersion = "3.41.1-SNAPSHOT"
+val checkerFrameworkVersion = "3.42.0-eisop5-SNAPSHOT"
 dependencies {
    compileOnly("io.github.eisop:checker-qual:${checkerFrameworkVersion}")
    testCompileOnly("io.github.eisop:checker-qual:${checkerFrameworkVersion}")
+   checkerFramework("io.github.eisop:checker-qual:${checkerFrameworkVersion}")
    checkerFramework("io.github.eisop:checker:${checkerFrameworkVersion}")
 }
 configurations.all({

diff --git a/docs/examples/errorprone/build.gradle b/docs/examples/errorprone/build.gradle
@@ -6,7 +6,7 @@ plugins {
     id 'java'
     id 'net.ltgt.errorprone' version '4.1.0'
     // Checker Framework pluggable type-checking
-    id 'org.checkerframework' version '0.6.48'
+    id 'org.checkerframework' version '0.6.48' apply false
 }
 
 ext {
@@ -16,7 +16,7 @@ ext {
 }
 
 apply plugin: 'org.checkerframework'
-if (true) {
+if (false) {
     def cfHome = "${projectDir}/../../.."
     dependencies {
         compileOnly files(cfHome + '/checker/dist/checker-qual.jar')
@@ -27,6 +27,7 @@ if (true) {
     dependencies {
         compileOnly "io.github.eisop:checker-qual:${versions.eisopVersion}"
         testCompileOnly "io.github.eisop:checker-qual:${versions.eisopVersion}"
+        checkerFramework "io.github.eisop:checker-qual:${versions.eisopVersion}"
         checkerFramework "io.github.eisop:checker:${versions.eisopVersion}"
     }
 }

diff --git a/docs/manual/external-tools.tex b/docs/manual/external-tools.tex
@@ -820,6 +820,7 @@
 dependencies {
     compileOnly "io.github.eisop:checker-qual:${versions.eisopVersion}"
     testCompileOnly "io.github.eisop:checker-qual:${versions.eisopVersion}"
+    checkerFramework "io.github.eisop:checker-qual:${versions.eisopVersion}"
     checkerFramework "io.github.eisop:checker:${versions.eisopVersion}"
 }
 \end{Verbatim}