Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-15 01:07:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove add-opens workaround in ToolchainPlugin

Browse Source 
See gh-26465
This commit is contained in:
dreis2211 2021-05-14 16:01:03 +02:00 committed by Andy Wilkinson
parent e3f36ee6de
commit 6179b99710
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
buildSrc/src/main/java/org/springframework/boot/build/toolchain/ToolchainPlugin.java
View File

@ -16,7 +16,6 @@
package org.springframework.boot.build.toolchain;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
@ -58,8 +57,7 @@ public class ToolchainPlugin implements Plugin<Project> {
JavaToolchainSpec toolchainSpec = project.getExtensions().getByType(JavaPluginExtension.class)
.getToolchain();
toolchainSpec.getLanguageVersion().set(toolchain.getJavaVersion());
configureJavaCompileToolchain(project, toolchain);
configureTestToolchain(project, toolchain);
configureTestToolchain(project);
}
}
@ -75,16 +73,7 @@ public class ToolchainPlugin implements Plugin<Project> {
project.getTasks().withType(GradleBuild.class, (task) -> task.setEnabled(false));
}
private void configureJavaCompileToolchain(Project project, ToolchainExtension toolchain) {
project.getTasks().withType(JavaCompile.class, (compile) -> {
compile.getOptions().setFork(true);
// See https://github.com/gradle/gradle/issues/15538
List<String> forkArgs = Arrays.asList("--add-opens", "jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED");
compile.getOptions().getForkOptions().getJvmArgs().addAll(forkArgs);
});
}
private void configureTestToolchain(Project project, ToolchainExtension toolchain) {
private void configureTestToolchain(Project project) {
project.getTasks().withType(Test.class, (test) -> {
List<String> arguments = Collections.singletonList("--illegal-access=warn");
test.jvmArgs(arguments);