Skip to content

Commit dfdf8ae

Browse files
committed
Drop unneeded --add-exports flags and fork from gradle plugin
1 parent c8b0157 commit dfdf8ae

1 file changed

Lines changed: 3 additions & 28 deletions

File tree

scip-gradle-plugin/src/main/java/com/sourcegraph/gradle/scip/ScipGradlePlugin.java

Lines changed: 3 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,15 @@
44
import java.util.ArrayList;
55
import java.util.List;
66
import java.util.Map;
7-
import java.util.stream.Collectors;
87
import org.gradle.api.Plugin;
98
import org.gradle.api.Project;
109
import org.gradle.api.Task;
1110
import org.gradle.api.artifacts.Configuration;
1211
import org.gradle.api.plugins.ExtraPropertiesExtension;
13-
import org.gradle.api.tasks.compile.ForkOptions;
1412
import org.gradle.api.tasks.compile.JavaCompile;
1513

1614
public class ScipGradlePlugin implements Plugin<Project> {
1715

18-
// `--add-exports` flags required so our compiler plugin can access javac
19-
// internals. Required on JDK 17+ (JEP 403), no-op on 11-16. Kept in sync with
20-
// `javacModuleOptions` in build.sbt.
21-
private static final List<String> JAVAC_MODULE_OPTIONS =
22-
List.of(
23-
"-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
24-
"-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED",
25-
"-J--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED",
26-
"-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",
27-
"-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED");
28-
2916
@Override
3017
public void apply(Project project) {
3118
project.afterEvaluate(this::configureProject);
@@ -105,21 +92,9 @@ private void configureProject(Project project) {
10592
.withType(JavaCompile.class)
10693
.configureEach(
10794
task -> {
108-
// Add --add-exports JVM args so our compiler plugin can access
109-
// javac internals. Required on JDK 17+ (JEP 403), no-op on
110-
// 11-16.
111-
ForkOptions forkOptions = task.getOptions().getForkOptions();
112-
List<String> jvmArgs =
113-
JAVAC_MODULE_OPTIONS.stream()
114-
.map(arg -> arg.startsWith("-J") ? arg.substring(2) : arg)
115-
.collect(Collectors.toList());
116-
if (forkOptions.getJvmArgs() == null) {
117-
forkOptions.setJvmArgs(jvmArgs);
118-
} else {
119-
forkOptions.getJvmArgs().addAll(jvmArgs);
120-
}
121-
122-
task.getOptions().setFork(true);
95+
// Disable incremental compilation so the random timestamp added
96+
// below forces a full recompile and Gradle doesn't cache stale
97+
// SCIP state.
12398
task.getOptions().setIncremental(false);
12499

125100
if (pluginAdded) {

0 commit comments

Comments
 (0)