From 36b365f1e87d240ea1c1c49f5ba12ab75d97b008 Mon Sep 17 00:00:00 2001
From: Werner Dietl <wdietl@gmail.com>
Date: Thu, 26 Dec 2024 15:49:14 -0500
Subject: [PATCH] Use EISOP CF release again (#216)

---
 .github/workflows/build.yml | 19 ++++++++++++-------
 settings.gradle             |  2 +-
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 78bc797..b22f6f9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,11 +19,12 @@ jobs:
         with:
           repository: jspecify/jspecify
           path: jspecify
-      - name: Check out eisop/checker-framework
-        uses: actions/checkout@v4
-        with:
-          repository: eisop/checker-framework
-          path: checker-framework
+# Clone the EISOP CF if necessary:
+#      - name: Check out eisop/checker-framework
+#        uses: actions/checkout@v4
+#        with:
+#          repository: eisop/checker-framework
+#          path: checker-framework
       - name: Set up Java
         uses: actions/setup-java@v4
         with:
@@ -32,7 +33,9 @@ jobs:
       - name: Set up Gradle
         uses: gradle/gradle-build-action@v3
       - name: Build and Test
-        run: ./gradlew build conformanceTests demoTest --include-build ../jspecify --include-build ../checker-framework
+        run: ./gradlew build conformanceTests demoTest --include-build ../jspecify
+# If a cloned EISOP CF is needed, use the following:
+#        run: ./gradlew build conformanceTests demoTest --include-build ../jspecify --include-build ../checker-framework
         env:
           SHALLOW: 1
           JSPECIFY_CONFORMANCE_TEST_MODE: details
@@ -44,7 +47,9 @@ jobs:
         working-directory: jspecify
       - name: Run Samples Tests
         if: always()
-        run: ./gradlew jspecifySamplesTest --include-build ../jspecify --include-build ../checker-framework
+        run: ./gradlew jspecifySamplesTest --include-build ../jspecify
+# If a cloned EISOP CF is needed, use the following:
+#        run: ./gradlew jspecifySamplesTest --include-build ../jspecify --include-build ../checker-framework
 
   publish-snapshot:
     name: Publish Conformance Test Framework Snapshot
diff --git a/settings.gradle b/settings.gradle
index 2874741..ff46e82 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -13,7 +13,7 @@ exec {
 dependencyResolutionManagement {
     versionCatalogs {
         libs {
-            version("checkerFramework", "3.42.0-eisop4")
+            version("checkerFramework", "3.42.0-eisop5")
 
             library("checkerFramework-checker", "io.github.eisop", "checker").versionRef("checkerFramework")
             library("checkerFramework-checker-qual", "io.github.eisop", "checker-qual").versionRef("checkerFramework")