Merge branch 'main' into local-cf

eisop · Apr 1, 2024 · 26dc4b8 · 26dc4b8
2 parents 7dbd256 + bcc3f2d
commit 26dc4b8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -25,4 +25,4 @@ jobs:
       - name: Set up Gradle
         uses: gradle/gradle-build-action@v3
       - name: Build and Test
-        run: gradle clean test
+        run: gradle test
diff --git a/build.gradle b/build.gradle
@@ -41,6 +41,7 @@ dependencies {
 
   testImplementation libs.checkerframework.checker
   testImplementation libs.checkerframework.framework.test
+  testImplementation libs.checkerframework.qual
 }
 
 // To use a locally-built Checker Framework, run gradle with "-PcfLocal".

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -2,12 +2,13 @@
 junitVer = "5.9.1"
 guavaVer = "31.1-jre"
 jSpecifyConformanceTestVer = "0.0.0-SNAPSHOT"
-checkerFrameworkVer = "3.42.0"
+checkerFrameworkVer = "3.42.0-eisop3"
 
 [libraries]
 junit = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junitVer" }
 guava = { module = "com.google.guava:guava", version.ref = "guavaVer" }
 jspecify-conformance-tests = { module = "org.jspecify.conformance:conformance-tests", version.ref = "jSpecifyConformanceTestVer" }
 jspecify-conformance-framework = { module = "org.jspecify.conformance:conformance-test-framework", version.ref = "jSpecifyConformanceTestVer" }
-checkerframework-checker = { module = "org.checkerframework:checker", version.ref = "checkerFrameworkVer" }
-checkerframework-framework-test = { module = "org.checkerframework:framework-test", version.ref = "checkerFrameworkVer" }
+checkerframework-checker = { module = "io.github.eisop:checker", version.ref = "checkerFrameworkVer" }
+checkerframework-framework-test = { module = "io.github.eisop:framework-test", version.ref = "checkerFrameworkVer" }
+checkerframework-qual = { module = "io.github.eisop:checker-qual", version.ref = "checkerFrameworkVer" }