JDK 17 support (#75)

opprop · Jun 13, 2022 · da6008f · da6008f
1 parent 9605b9f
commit da6008f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -12,7 +12,7 @@ jobs:
   build:
     strategy:
       matrix:
-        jdk: [ 8, 11 ]
+        jdk: [ 8, 11, 17 ]
     runs-on: ubuntu-latest
     steps:
       - name: Pull Request Checkout

diff --git a/build.gradle b/build.gradle
@@ -13,6 +13,20 @@ ext {
     ontologyPath = "${jsr308}/ontology"
 
     isJava8 = JavaVersion.current() == JavaVersion.VERSION_1_8
+
+    // Keep in sync with checker-framework/build.gradle.
+    // TODO: find a way to directly use that variable.
+    compilerArgsForRunningCF = [
+            "--add-exports", "jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
+            "--add-exports", "jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED",
+            "--add-exports", "jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED",
+            "--add-exports", "jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED",
+            "--add-exports", "jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED",
+            "--add-exports", "jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED",
+            "--add-exports", "jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",
+            "--add-exports", "jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
+            "--add-opens", "jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED",
+    ]
 }
 
 println '==================================='
@@ -96,15 +110,12 @@ afterEvaluate {
                 'path.inference.script': "${cfiPath}/scripts/inference"
         ]
 
-        if (isJava8) {
-            systemProperties += [JDK_JAR: "${cfPath}/checker/dist/jdk8.jar"]
-        }
-
         environment "external_checker_classpath", "${ontologyPath}/build/classes/java/main:${ontologyPath}/build/libs/ontology.jar"
 
-
         if (isJava8) {
             jvmArgs "-Xbootclasspath/p:${cfiPath}/dist/javac.jar"
+        } else {
+            jvmArgs += compilerArgsForRunningCF
         }
 
         testLogging {