From 4d53c0dbc8c2ea4951446a3646029f85a2045ea6 Mon Sep 17 00:00:00 2001
From: Aosen Xiong <aosen.xiong@uwaterloo.ca>
Date: Mon, 6 Jan 2025 13:59:04 -0800
Subject: [PATCH] Use EISOP dependencies (#1)

Co-authored-by: Werner Dietl <wdietl@gmail.com>
---
 README.md                                              |  2 +-
 build.gradle                                           | 10 +++++-----
 .../checker/templatefora/qual/TemplateforaBottom.java  |  1 -
 templatefora-checker-qual/build.gradle                 |  4 ++--
 tests/templatefora/SubtypingTest.java                  |  2 +-
 5 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 328ee92..d1c60a2 100644
--- a/README.md
+++ b/README.md
@@ -102,7 +102,7 @@ repositories {
     mavenCentral()
 }
 dependencies {
-    annotationProcessor 'org.checkerframework:templatefora-checker:0.1-SNAPSHOT'
+    annotationProcessor 'io.github.eisop:templatefora-checker:0.1-SNAPSHOT'
 }
 ```
 
diff --git a/build.gradle b/build.gradle
index f65047e..e32bf88 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,7 +15,7 @@ configurations {
 }
 
 ext.versions = [
-    checkerFramework: "3.48.2",
+        eisopVersion: '3.42.0-eisop5',
 ]
 
 def checkerframework_local = false  // Set this variable to [true] while using local version of checker framework.
@@ -27,15 +27,15 @@ dependencies {
         implementation files('${CHECKERFRAMEWORK}/checker/dist/checker.jar')
     }
     else {
-        implementation "org.checkerframework:checker:${versions.checkerFramework}"
-        implementation "org.checkerframework:checker-qual:${versions.checkerFramework}"
+        implementation "io.github.eisop:checker:${versions.eisopVersion}"
+        implementation "io.github.eisop:checker-qual:${versions.eisopVersion}"
     }
 
     compileOnly "com.google.errorprone:javac:9+181-r4173-1"
 
     // Testing
     testImplementation 'junit:junit:4.13.2'
-    testImplementation "org.checkerframework:framework-test:${versions.checkerFramework}"
+    testImplementation "io.github.eisop:framework-test:${versions.eisopVersion}"
 
     errorproneJavac "com.google.errorprone:javac:9+181-r4173-1"
 }
@@ -50,7 +50,7 @@ tasks.withType(JavaCompile).all {
 publishing {
     publications {
         maven(MavenPublication) {
-            groupId = 'org.checkerframework'
+            groupId = 'io.github.eisop'
             artifactId = 'templatefora-checker'
             version = '0.1-SNAPSHOT'
 
diff --git a/src/main/java/org/checkerframework/checker/templatefora/qual/TemplateforaBottom.java b/src/main/java/org/checkerframework/checker/templatefora/qual/TemplateforaBottom.java
index b0b1d05..9d3e74b 100644
--- a/src/main/java/org/checkerframework/checker/templatefora/qual/TemplateforaBottom.java
+++ b/src/main/java/org/checkerframework/checker/templatefora/qual/TemplateforaBottom.java
@@ -15,5 +15,4 @@
 @SubtypeOf({TemplateforaUnknown.class})
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
-@TargetLocations({TypeUseLocation.EXPLICIT_LOWER_BOUND, TypeUseLocation.EXPLICIT_UPPER_BOUND})
 public @interface TemplateforaBottom {}
diff --git a/templatefora-checker-qual/build.gradle b/templatefora-checker-qual/build.gradle
index 918c8d9..4e78797 100644
--- a/templatefora-checker-qual/build.gradle
+++ b/templatefora-checker-qual/build.gradle
@@ -7,8 +7,8 @@ repositories {
 }
 
 dependencies {
-    implementation "org.checkerframework:checker:${versions.checkerFramework}"
-    implementation "org.checkerframework:checker-qual:${versions.checkerFramework}"
+    implementation "io.github.eisop:checker:${versions.eisopVersion}"
+    implementation "io.github.eisop:checker-qual:${versions.eisopVersion}"
 }
 
 task copySources(type: Copy) {
diff --git a/tests/templatefora/SubtypingTest.java b/tests/templatefora/SubtypingTest.java
index f6fbcdf..ff1dfaa 100644
--- a/tests/templatefora/SubtypingTest.java
+++ b/tests/templatefora/SubtypingTest.java
@@ -5,7 +5,7 @@ class SubtypeTest {
   void allSubtypingRelationships(@TemplateforaUnknown int x, @TemplateforaBottom int y) {
     @TemplateforaUnknown int a = x;
     @TemplateforaUnknown int b = y;
-    // :: error: assignment
+    // :: error: (assignment.type.incompatible)
     @TemplateforaBottom int c = x; // expected error on this line
     @TemplateforaBottom int d = y;
   }