Skip to content

Commit b8b88e6

Browse files
committed
Upgrade to Checkstyle 10.12
1 parent 837327f commit b8b88e6

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

buildSrc/src/main/java/org/springframework/build/CheckstyleConventions.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@
1616

1717
package org.springframework.build;
1818

19+
import java.io.File;
20+
import java.nio.file.Path;
21+
import java.util.List;
22+
1923
import io.spring.javaformat.gradle.SpringJavaFormatPlugin;
2024
import io.spring.nohttp.gradle.NoHttpExtension;
2125
import io.spring.nohttp.gradle.NoHttpPlugin;
@@ -27,12 +31,9 @@
2731
import org.gradle.api.plugins.quality.CheckstyleExtension;
2832
import org.gradle.api.plugins.quality.CheckstylePlugin;
2933

30-
import java.io.File;
31-
import java.nio.file.Path;
32-
import java.util.List;
33-
3434
/**
3535
* {@link Plugin} that applies conventions for checkstyle.
36+
*
3637
* @author Brian Clozel
3738
*/
3839
public class CheckstyleConventions {
@@ -49,7 +50,7 @@ public void apply(Project project) {
4950
project.getPlugins().apply(CheckstylePlugin.class);
5051
project.getTasks().withType(Checkstyle.class).forEach(checkstyle -> checkstyle.getMaxHeapSize().set("1g"));
5152
CheckstyleExtension checkstyle = project.getExtensions().getByType(CheckstyleExtension.class);
52-
checkstyle.setToolVersion("10.10.0");
53+
checkstyle.setToolVersion("10.12.0");
5354
checkstyle.getConfigDirectory().set(project.getRootProject().file("src/checkstyle"));
5455
String version = SpringJavaFormatPlugin.class.getPackage().getImplementationVersion();
5556
DependencySet checkstyleDependencies = project.getConfigurations().getByName("checkstyle").getDependencies();

buildSrc/src/main/java/org/springframework/build/ConventionsPlugin.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
* Plugin to apply conventions to projects that are part of Spring Framework's build.
2626
* Conventions are applied in response to various plugins being applied.
2727
*
28-
* When the {@link JavaBasePlugin} is applied, the conventions in {@link CheckstyleConventions},
28+
* <p>When the {@link JavaBasePlugin} is applied, the conventions in {@link CheckstyleConventions},
2929
* {@link TestConventions} and {@link JavaConventions} are applied.
3030
* When the {@link KotlinBasePlugin} is applied, the conventions in {@link KotlinConventions}
3131
* are applied.
@@ -41,4 +41,5 @@ public void apply(Project project) {
4141
new KotlinConventions().apply(project);
4242
new TestConventions().apply(project);
4343
}
44+
4445
}

0 commit comments

Comments
 (0)