root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Configure source and target compatibility at the task level 

Closes gh-26350
This commit is contained in:
Andy Wilkinson 2021-05-04 10:20:55 +01:00
parent 4c42810df9
commit deca737b01
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
buildSrc/src/main/java/org/springframework/boot/build/JavaConventions.java
View File

@ -64,7 +64,6 @@ import org.springframework.boot.build.testing.TestFailuresPlugin;
* plugin is applied: * plugin is applied:
* *
* <ul> * <ul>
* <li>{@code sourceCompatibility} is set to {@code 1.8}
* <li>{@link SpringJavaFormatPlugin Spring Java Format}, {@link CheckstylePlugin * <li>{@link SpringJavaFormatPlugin Spring Java Format}, {@link CheckstylePlugin
* Checkstyle}, {@link TestFailuresPlugin Test Failures}, and {@link TestRetryPlugin Test * Checkstyle}, {@link TestFailuresPlugin Test Failures}, and {@link TestRetryPlugin Test
* Retry} plugins are applied * Retry} plugins are applied
@ -79,7 +78,11 @@ import org.springframework.boot.build.testing.TestFailuresPlugin;
* {@link JavaPlugin} applied * {@link JavaPlugin} applied
* <li>{@link JavaCompile}, {@link Javadoc}, and {@link FormatTask} tasks are configured * <li>{@link JavaCompile}, {@link Javadoc}, and {@link FormatTask} tasks are configured
* to use UTF-8 encoding * to use UTF-8 encoding
* <li>{@link JavaCompile} tasks are configured to use {@code -parameters} * <li>{@link JavaCompile} tasks are configured:
* <ul>
* <li>to use {@code -parameters}
* <li>with source and target compatibility of 1.8
* </ul>
* <li>{@link Jar} tasks are configured to produce jars with LICENSE.txt and NOTICE.txt * <li>{@link Jar} tasks are configured to produce jars with LICENSE.txt and NOTICE.txt
* files and the following manifest entries: * files and the following manifest entries:
* <ul> * <ul>
@ -101,11 +104,12 @@ import org.springframework.boot.build.testing.TestFailuresPlugin;
*/ */
class JavaConventions { class JavaConventions {
private static final String SOURCE_AND_TARGET_COMPATIBILITY = "1.8";
void apply(Project project) { void apply(Project project) {
project.getPlugins().withType(JavaBasePlugin.class, (java) -> { project.getPlugins().withType(JavaBasePlugin.class, (java) -> {
project.getPlugins().apply(TestFailuresPlugin.class); project.getPlugins().apply(TestFailuresPlugin.class);
configureSpringJavaFormat(project); configureSpringJavaFormat(project);
project.setProperty("sourceCompatibility", "1.8");
configureJavaCompileConventions(project); configureJavaCompileConventions(project);
configureJavadocConventions(project); configureJavadocConventions(project);
configureTestConventions(project); configureTestConventions(project);
@ -130,7 +134,7 @@ class JavaConventions {
jar.manifest((manifest) -> { jar.manifest((manifest) -> {
Map<String, Object> attributes = new TreeMap<>(); Map<String, Object> attributes = new TreeMap<>();
attributes.put("Automatic-Module-Name", project.getName().replace("-", ".")); attributes.put("Automatic-Module-Name", project.getName().replace("-", "."));
attributes.put("Build-Jdk-Spec", project.property("sourceCompatibility")); attributes.put("Build-Jdk-Spec", SOURCE_AND_TARGET_COMPATIBILITY);
attributes.put("Built-By", "Spring"); attributes.put("Built-By", "Spring");
attributes.put("Implementation-Title", attributes.put("Implementation-Title",
determineImplementationTitle(project, sourceJarTaskNames, javadocJarTaskNames, jar)); determineImplementationTitle(project, sourceJarTaskNames, javadocJarTaskNames, jar));
@ -195,6 +199,8 @@ class JavaConventions {
private void configureJavaCompileConventions(Project project) { private void configureJavaCompileConventions(Project project) {
project.getTasks().withType(JavaCompile.class, (compile) -> { project.getTasks().withType(JavaCompile.class, (compile) -> {
compile.getOptions().setEncoding("UTF-8"); compile.getOptions().setEncoding("UTF-8");
compile.setSourceCompatibility(SOURCE_AND_TARGET_COMPATIBILITY);
compile.setTargetCompatibility(SOURCE_AND_TARGET_COMPATIBILITY);
withOptionalBuildJavaHome(project, (javaHome) -> { withOptionalBuildJavaHome(project, (javaHome) -> {
compile.getOptions().setFork(true); compile.getOptions().setFork(true);
compile.getOptions().getForkOptions().setJavaHome(new File(javaHome)); compile.getOptions().getForkOptions().setJavaHome(new File(javaHome));