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

Apply Java conventions to projects that only apply Java base plugin

Browse Source 
Fixes gh-19806
This commit is contained in:
Andy Wilkinson 2020-01-19 20:02:13 +00:00
parent bfdb49f2a2
commit 468eca91e9
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
buildSrc/src/main/java/org/springframework/boot/build/ConventionsPlugin.java
View File

@ -26,6 +26,7 @@ import org.asciidoctor.gradle.jvm.AsciidoctorJPlugin;
import org.gradle.api.Plugin; import org.gradle.api.Plugin;
import org.gradle.api.Project; import org.gradle.api.Project;
import org.gradle.api.artifacts.DependencySet; import org.gradle.api.artifacts.DependencySet;
import org.gradle.api.plugins.JavaBasePlugin;
import org.gradle.api.plugins.JavaPlugin; import org.gradle.api.plugins.JavaPlugin;
import org.gradle.api.plugins.JavaPluginExtension; import org.gradle.api.plugins.JavaPluginExtension;
import org.gradle.api.plugins.quality.CheckstyleExtension; import org.gradle.api.plugins.quality.CheckstyleExtension;
@ -53,7 +54,7 @@ import org.springframework.boot.build.testing.TestFailuresPlugin;
* *
* <p/> * <p/>
* *
* When the {@link JavaPlugin Java plugin} is applied: * When the {@link JavaBasePlugin Java base plugin} is applied:
* *
* <ul> * <ul>
* <li>{@code sourceCompatibility} is set to {@code 1.8} * <li>{@code sourceCompatibility} is set to {@code 1.8}
@ -106,7 +107,7 @@ public class ConventionsPlugin implements Plugin<Project> {
} }
private void applyJavaConventions(Project project) { private void applyJavaConventions(Project project) {
project.getPlugins().withType(JavaPlugin.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"); project.setProperty("sourceCompatibility", "1.8");