Browse Source

Polishing

pull/24494/head
Sam Brannen 6 years ago
parent
commit
c640d28a82
  1. 6
      buildSrc/src/main/java/org/springframework/build/compile/CompilerConventionsPlugin.java

6
buildSrc/src/main/java/org/springframework/build/compile/CompilerConventionsPlugin.java

@ -89,14 +89,14 @@ public class CompilerConventionsPlugin implements Plugin<Project> {
java.setTargetCompatibility(DEFAULT_COMPILER_VERSION); java.setTargetCompatibility(DEFAULT_COMPILER_VERSION);
project.getTasks().withType(JavaCompile.class) project.getTasks().withType(JavaCompile.class)
.matching(javaCompile -> javaCompile.getName().equals(JavaPlugin.COMPILE_JAVA_TASK_NAME)) .matching(compileTask -> compileTask.getName().equals(JavaPlugin.COMPILE_JAVA_TASK_NAME))
.forEach(compileTask -> { .forEach(compileTask -> {
compileTask.getOptions().setCompilerArgs(COMPILER_ARGS); compileTask.getOptions().setCompilerArgs(COMPILER_ARGS);
compileTask.getOptions().setEncoding("UTF-8"); compileTask.getOptions().setEncoding("UTF-8");
}); });
project.getTasks().withType(JavaCompile.class) project.getTasks().withType(JavaCompile.class)
.matching(javaCompile -> javaCompile.getName().equals(JavaPlugin.COMPILE_TEST_JAVA_TASK_NAME) .matching(compileTask -> compileTask.getName().equals(JavaPlugin.COMPILE_TEST_JAVA_TASK_NAME)
|| javaCompile.getName().equals("compileTestFixturesJava")) || compileTask.getName().equals("compileTestFixturesJava"))
.forEach(compileTask -> { .forEach(compileTask -> {
compileTask.getOptions().setCompilerArgs(TEST_COMPILER_ARGS); compileTask.getOptions().setCompilerArgs(TEST_COMPILER_ARGS);
compileTask.getOptions().setEncoding("UTF-8"); compileTask.getOptions().setEncoding("UTF-8");

Loading…
Cancel
Save