Skip to content

Fix: CheckerFramework version bump #393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
byd110 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix: CheckerFramework version bump #393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a86995
initial commit to adapt the changes in PR #349
byd110 Sep 19, 2025
2d42c22
Change the expected errors in GlbLubTest.java to adapt a smarter boun…
byd110 Oct 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ configurations {

ext {
versions = [
checkerFramework: "3.42.0-eisop5",
checkerFramework: "3.49.3-eisop1",
errorproneJavacVersion: "9+181-r4173-1",
errorproneCoreVersion: "2.40.0",
]
Expand Down
3 changes: 3 additions & 0 deletions crypto-checker-qual-android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ ext.versions = [
checkerFramework: "3.42.0-eisop5",

@wmdietl wmdietl Feb 1, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you look for all uses of the version string and update them together?

]

//def checkerframework_local = true // Set this variable to [true] while using local version of checker framework.

@wmdietl wmdietl Feb 1, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think these can be removed, as nobody uses the variables.

//def CHECKERFRAMEWORK = "/home/billybai/code/vehiloco/local_CF"

dependencies {
implementation "io.github.eisop:checker:${versions.checkerFramework}"
implementation "io.github.eisop:checker-qual:${versions.checkerFramework}"
Expand Down
2 changes: 1 addition & 1 deletion crypto-checker-qual/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ repositories {
}

ext.versions = [
checkerFramework: "3.42.0-eisop5",
checkerFramework: "3.49.3-eisop1",
]

dependencies {
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/org/checkerframework/checker/crypto/CryptoChecker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import org.checkerframework.common.basetype.BaseTypeChecker;
import org.checkerframework.common.value.ValueChecker;
import org.checkerframework.framework.source.SourceChecker;
import org.checkerframework.framework.source.SupportedLintOptions;

import java.util.Set;
Expand All @@ -10,8 +11,8 @@
public class CryptoChecker extends BaseTypeChecker {

@Override
protected Set<Class<? extends BaseTypeChecker>> getImmediateSubcheckerClasses() {
Set<Class<? extends BaseTypeChecker>> checkers = super.getImmediateSubcheckerClasses();
protected Set<Class<? extends SourceChecker>> getImmediateSubcheckerClasses() {
Set<Class<? extends SourceChecker>> checkers = super.getImmediateSubcheckerClasses();
checkers.add(ValueChecker.class);
return checkers;
}
Expand Down
3 changes: 0 additions & 3 deletions tests/general/GlbLubTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ public class MyClass1<T extends @AllowedAlgorithms({"a", "b", "c", "d"}) String>
}

void testGlb1() {
// ::error: (assignment.type.incompatible)

@wmdietl wmdietl Feb 1, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For the removed errors, can you instead say what the effective bound is?
I think it's fine that we no longer get the assignment errors, but the effective bounds should still give us the desired behavior. Is that the case?

MyClass1<? extends @AllowedAlgorithms({"a", "c", "e"}) String> f1 = new MyClass1<>();
@AllowedAlgorithms({"a", "c"})
String x = f1.key;
Expand All @@ -78,7 +77,6 @@ public class MyClass2<T extends @Bottom String> {
}

void testGlb2() {
// ::error: (assignment.type.incompatible)
MyClass2<? extends @AllowedAlgorithms("a") String> f2 = new MyClass2<>();
@AllowedAlgorithms({"e"})
String x = f2.key;
Expand All @@ -89,7 +87,6 @@ public class MyClass3<T extends @AllowedProviders("a") String> {
}

void testGlb3() {
// ::error: (assignment.type.incompatible)
MyClass3<? extends @AllowedAlgorithms("a") String> f3 = new MyClass3<>();
@AllowedAlgorithms({"b"})
String x = f3.key;
Expand Down