Skip to content

Properly fix issue with checkerframework Gradle plugin. #315

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

Merged
merged 1 commit into from
Aug 26, 2021
Merged

Properly fix issue with checkerframework Gradle plugin. #315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 1 addition & 11 deletions lsif-java/src/main/scala/com/sourcegraph/lsif_java/buildtools/GradleBuildTool.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,17 +78,7 @@ class GradleBuildTool(index: IndexCommand) extends BuildTool("Gradle", index) {
buildCommand +=
s"-Porg.gradle.java.installations.paths=${toolchains.paths()}"
}
buildCommand ++=
index.finalBuildCommand(
List(
// Disable the checkerframework plugin because it updates the processorpath
// in a way that causes the error "plug-in not found: semanticdb".
// Details: https://github.com/kelloggm/checkerframework-gradle-plugin/blob/76d1926ae22144b082dfcfde1abe625750469398/src/main/groovy/org/checkerframework/gradle/plugin/CheckerFrameworkPlugin.groovy#L374-L376
"-PskipCheckerFramework",
"clean",
"compileTestJava"
)
)
buildCommand ++= index.finalBuildCommand(List("clean", "compileTestJava"))
buildCommand += lsifJavaDependencies

val result = index.process(buildCommand, env = Map("TERM" -> "dumb"))
Expand Down
28 changes: 28 additions & 0 deletions semanticdb-agent/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbAgent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,17 @@ public static void premain(String agentArgs, Instrumentation inst) {
named("getCompileClasspath"),
DefaultJvmLanguageCompileSpecAdvice.class.getName()))
.installOn(inst);
new AgentBuilder.Default()
.disableClassFormatChanges()
.type(
named("org.gradle.api.internal.tasks.compile.DefaultJavaCompileSpec")
.or(named("tests.GradleDefaultJavaCompileSpec")))
.transform(
new AgentBuilder.Transformer.ForAdvice()
.advice(
named("getAnnotationProcessorPath"),
DefaultJavaCompileSpecAdvice.class.getName()))
.installOn(inst);
new AgentBuilder.Default()
.type(
named("org.gradle.api.internal.tasks.compile.JavaCompilerArgumentsBuilder")
Expand Down Expand Up @@ -92,6 +103,23 @@ public static void getClasspath(
}
}

@SuppressWarnings("all")
public static class DefaultJavaCompileSpecAdvice {
@Advice.OnMethodExit
public static void getAnnotationProcessorPath(
@Advice.Return(readOnly = false, typing = DYNAMIC) List<File> classpath) {
if (classpath == null) return;
String PLUGINPATH = System.getProperty("semanticdb.pluginpath");
if (PLUGINPATH == null) throw new NoSuchElementException("-Dsemanticdb.pluginpath");
File semanticdbJar = new File(PLUGINPATH);
if (!classpath.contains(semanticdbJar)) {
List<File> newClasspath = new ArrayList<>(classpath);
newClasspath.add(semanticdbJar);
classpath = newClasspath;
}
}
}

@SuppressWarnings("all")
public static class JavaCompilerArgumentsBuilderAdvice {

Expand Down