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

Apply nullability-plugin through ConventionsPlugin 

See gh-46587
This commit is contained in:
Moritz Halbritter 2025-06-11 10:34:19 +02:00
parent c0f1f641ce
commit 86f25012d6
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
buildSrc/build.gradle
View File

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

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

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

1
gradle.properties
View File

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