Browse Source

Apply nullability-plugin through ConventionsPlugin

See gh-46587
pull/46595/head
Moritz Halbritter 6 months ago
parent
commit
86f25012d6
  1. 1
      buildSrc/build.gradle
  2. 10
      buildSrc/src/main/java/org/springframework/boot/build/JavaConventions.java
  3. 1
      gradle.properties

1
buildSrc/build.gradle

@ -64,6 +64,7 @@ dependencies { @@ -64,6 +64,7 @@ dependencies {
implementation("org.springframework:spring-core")
implementation("org.springframework:spring-web")
implementation("org.yaml:snakeyaml:${snakeYamlVersion}")
implementation("io.spring.gradle.nullability:nullability-plugin:${nullabilityPluginVersion}")
testImplementation(platform("org.junit:junit-bom:${junitJupiterVersion}"))
testImplementation("org.assertj:assertj-core:${assertjVersion}")

10
buildSrc/src/main/java/org/springframework/boot/build/JavaConventions.java

@ -27,6 +27,7 @@ import java.util.stream.Collectors; @@ -27,6 +27,7 @@ import java.util.stream.Collectors;
import com.gradle.develocity.agent.gradle.test.DevelocityTestConfiguration;
import com.gradle.develocity.agent.gradle.test.PredictiveTestSelectionConfiguration;
import com.gradle.develocity.agent.gradle.test.TestRetryConfiguration;
import io.spring.gradle.nullability.NullabilityPlugin;
import io.spring.javaformat.gradle.SpringJavaFormatPlugin;
import io.spring.javaformat.gradle.tasks.CheckFormat;
import io.spring.javaformat.gradle.tasks.Format;
@ -68,8 +69,8 @@ import org.springframework.util.StringUtils; @@ -68,8 +69,8 @@ import org.springframework.util.StringUtils;
* <ul>
* <li>The project is configured with source and target compatibility of 17
* <li>{@link SpringJavaFormatPlugin Spring Java Format}, {@link CheckstylePlugin
* Checkstyle}, {@link TestFailuresPlugin Test Failures}, and {@link ArchitecturePlugin
* Architecture} plugins are applied
* Checkstyle}, {@link TestFailuresPlugin Test Failures}, {@link ArchitecturePlugin
* Architecture} and {@link NullabilityPlugin} plugins are applied
* <li>{@link Test} tasks are configured:
* <ul>
* <li>to use JUnit Platform
@ -140,6 +141,7 @@ class JavaConventions { @@ -140,6 +141,7 @@ class JavaConventions {
configureToolchain(project);
configureProhibitedDependencyChecks(project);
configureFactoriesFilesChecks(project);
configureNullability(project);
});
}
@ -335,4 +337,8 @@ class JavaConventions { @@ -335,4 +337,8 @@ class JavaConventions {
});
}
private void configureNullability(Project project) {
project.getPlugins().apply(NullabilityPlugin.class);
}
}

1
gradle.properties

@ -22,5 +22,6 @@ snakeYamlVersion=2.4 @@ -22,5 +22,6 @@ snakeYamlVersion=2.4
springFrameworkVersion=7.0.0-M7
springFramework60xVersion=6.0.23
tomcatVersion=11.0.9
nullabilityPluginVersion=0.0.2
kotlin.stdlib.default.dependency=false

Loading…
Cancel
Save