eisop release 3.25.0-eisop1 (#408)

Author: wmdietl

scripts/inference-dev

@@ -34,7 +34,7 @@ libDir="$cfiDir"/lib
 CFBuild="${cfDir}"/dataflow/"${classes}":"${cfDir}"/javacutil/"${classes}":"${cfDir}"/framework/"${classes}":"${cfDir}"/framework/"${resources}"
 CFBuild="${CFBuild}":"${cfDir}"/checker/"${classes}":"${cfDir}"/checker/"${resources}":"${annoToolsDir}"/scene-lib/bin
 
-CFDepJars="${stubparserDir}"/javaparser-core/target/stubparser-3.24.2.jar:"${afuDir}"/annotation-file-utilities-all.jar
+CFDepJars="${stubparserDir}"/javaparser-core/target/stubparser-3.24.3.jar:"${afuDir}"/annotation-file-utilities-all.jar
 
 # sanity check: ensure each jar in CFDepJars actually exists in the file system
 # total number of jars

src/checkers/inference/InferenceLauncher.java

@@ -166,7 +166,7 @@ public void infer() {
             argList.add("-Xbootclasspath/p:" + bcp);
         }
 
-        if (SystemUtil.getJreVersion() > 8) {
+        if (SystemUtil.jreVersion > 8) {
             // Keep in sync with build.gradle
             argList.addAll(Arrays.asList("--add-exports", "jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
                     "--add-exports", "jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED",

src/checkers/inference/InferenceMain.java

@@ -167,7 +167,7 @@ private void startCheckerFramework() {
                 "-XDignore.symbol.file",
                 "-Awarns"));
 
-        if (SystemUtil.getJreVersion() == 8) {
+        if (SystemUtil.jreVersion == 8) {
             checkerFrameworkArgs.addAll(Arrays.asList("-source", "8", "-target", "8"));
         }
 

tests/checkers/inference/test/CFInferenceTest.java

@@ -18,7 +18,7 @@ public abstract class CFInferenceTest extends CheckerFrameworkPerFileTest {
     public static final boolean isAtMost7Jvm;
 
     static {
-        isAtMost7Jvm = org.checkerframework.javacutil.SystemUtil.getJreVersion() <= 1.7d;
+        isAtMost7Jvm = SystemUtil.jreVersion <= 7;
     }
 
     public CFInferenceTest(File testFile, Class<? extends AbstractProcessor> checker,