Skip to content

Commit 5a3fd46

Browse files
committed
checker framework / javacc problems
1 parent dfca3ed commit 5a3fd46

File tree

1 file changed

+21
-12
lines changed

1 file changed

+21
-12
lines changed

buildSrc/src/main/kotlin/java-convention.gradle.kts

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,17 @@ dependencies {
4444
implementation(libs.findLibrary("slf4j").get())
4545
api(libs.findLibrary("jspecify").get())
4646

47-
compileOnly(libs.findLibrary("eisopCheckerQual").get())
48-
compileOnly(libs.findLibrary("eisopUtil").get())
49-
checkerFramework(libs.findLibrary("eisopCheckerQual").get())
50-
checkerFramework(libs.findLibrary("eisopUtil").get())
47+
val checkerQual = libs.findLibrary("eisopCheckerQual").get()
48+
val eisopUtil = libs.findLibrary("eisopUtil").get()
49+
50+
compileOnly(checkerQual)
51+
compileOnly(eisopUtil)
52+
checkerFramework(checkerQual)
53+
checkerFramework(eisopUtil)
54+
checkerFramework(libs.findLibrary("eisopChecker").get())
5155

5256
// Testing
53-
testCompileOnly(libs.findLibrary("eisopCheckerQual").get())
57+
testCompileOnly(checkerQual)
5458

5559
testImplementation(platform(libs.findLibrary("junit-bom").get()))
5660
testImplementation(libs.findBundle("testing").get())
@@ -66,7 +70,7 @@ tasks.withType<JavaCompile>().configureEach {
6670
options.encoding = "UTF-8"
6771
}
6872

69-
tasks.withType<Javadoc>() {
73+
tasks.withType<Javadoc> {
7074
isFailOnError = false
7175
val o = options as CoreJavadocOptions
7276
o.addBooleanOption("Xdoclint:none", true)
@@ -76,8 +80,8 @@ tasks.withType<Javadoc>() {
7680
}
7781

7882
tasks.withType<Test>().configureEach {
79-
val examplesDir = rootProject.layout.projectDirectory.dir("key.ui/examples").getAsFile()
80-
val runAllProofsReportDir = layout.buildDirectory.dir("report/runallproves/").get().getAsFile()
83+
val examplesDir = rootProject.layout.projectDirectory.dir("key.ui/examples").asFile
84+
val runAllProofsReportDir = layout.buildDirectory.dir("report/runallproves/").get().asFile
8185

8286
systemProperty("test-resources", "src/test/resources")
8387
systemProperty("testcases", "src/test/resources/testcase")
@@ -347,17 +351,22 @@ signing {
347351
}
348352

349353

350-
val CHECKER_FRAMEWORK_PACKAGES_REGEX: String? by project
351354
extra["CHECKER_FRAMEWORK_PACKAGES_REGEX"] = "^org\\.key_project"
352355

353356
checkerFramework {
354357
if(System.getProperty("ENABLE_NULLNESS").toBoolean()) {
355358
checkers = listOf("org.checkerframework.checker.nullness.NullnessChecker")
359+
val stubsEntries = listOf(
360+
"$rootDir/key.util/src/main/checkerframework",
361+
"permit-nullness-assertion-exception.astub",
362+
"checker.jar/junit-assertions.astub"
363+
)
364+
val stubs = stubsEntries.joinToString(File.pathSeparator)
365+
356366
extraJavacArgs = listOf(
357-
CHECKER_FRAMEWORK_PACKAGES_REGEX?.let { "-AonlyDefs=$it" }
358-
?: "",
367+
extra["CHECKER_FRAMEWORK_PACKAGES_REGEX"]?.let { "-AonlyDefs=$it" } ?: "",
359368
"-Xmaxerrs", "10000",
360-
"-Astubs=$projectDir/src/main/checkerframework:permit-nullness-assertion-exception.astub:checker.jar/junit-assertions.astub",
369+
"-Astubs=$stubs",
361370
"-AstubNoWarnIfNotFound",
362371
"-Werror",
363372
"-Aversion",

0 commit comments

Comments
 (0)