From 59d030fb8a28bfa06ae619bcc8e987442e00a105 Mon Sep 17 00:00:00 2001 From: Werner Dietl Date: Sun, 5 Jan 2025 15:49:56 -0500 Subject: [PATCH] Also add `checker-qual` to the Checker Framework gradle plugin call (#1046) --- docs/CHANGELOG.md | 2 +- docs/developer/release/README-release-process.html | 6 ++++-- docs/examples/errorprone/build.gradle | 5 +++-- docs/manual/external-tools.tex | 1 + 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 66633190053..43c0d06238a 100644 --- 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 index 03254a9c69a..3932425d042 100644 --- a/docs/developer/release/README-release-process.html +++ b/docs/developer/release/README-release-process.html @@ -299,10 +299,11 @@

Gradle Groovy (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 @@

Gradle Kotlin (build.gradle. to use the snapshot version of the Checker Framework:
-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
index e7d03d70248..e1916676847 100644
--- 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
index fe7fbc81abd..12fc7f236de 100644
--- 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}