From 69d7d17e316c525a9846489740eed4cb6db794ad Mon Sep 17 00:00:00 2001 From: Vincent Potucek Date: Thu, 20 Nov 2025 12:59:46 +0100 Subject: [PATCH 1/2] [rewrite] fix `GradleBestPractices` Signed-off-by: Vincent Potucek --- build.gradle | 15 +++------------ gradle/rewrite.gradle | 9 ++++++++- gradle/wrapper/gradle-wrapper.properties | 1 + .../npm/NpmStepsWithNpmInstallCacheTest.java | 2 +- rewrite.yml | 2 +- 5 files changed, 14 insertions(+), 15 deletions(-) diff --git a/build.gradle b/build.gradle index a13a8bdb9c..30238308f8 100644 --- a/build.gradle +++ b/build.gradle @@ -9,21 +9,12 @@ repositories { mavenCentral() } -apply from: rootProject.file('gradle/java-publish.gradle') -apply from: rootProject.file('gradle/changelog.gradle') allprojects { apply from: rootProject.file('gradle/error-prone.gradle') - apply from: rootProject.file('gradle/rewrite.gradle') apply from: rootProject.file('gradle/spotless.gradle') } +apply from: rootProject.file('gradle/changelog.gradle') +apply from: rootProject.file('gradle/java-publish.gradle') +apply from: rootProject.file('gradle/rewrite.gradle') apply from: rootProject.file('gradle/spotless-freshmark.gradle') - -dependencies { - rewrite(platform('org.openrewrite.recipe:rewrite-recipe-bom:3.18.0')) - rewrite('org.openrewrite.recipe:rewrite-migrate-java:3.19.0') - rewrite('org.openrewrite.recipe:rewrite-java-security:3.19.2') - rewrite('org.openrewrite.recipe:rewrite-rewrite:0.14.0') - rewrite('org.openrewrite.recipe:rewrite-static-analysis:2.19.0') - rewrite('org.openrewrite.recipe:rewrite-third-party:0.31.1') -} diff --git a/gradle/rewrite.gradle b/gradle/rewrite.gradle index 9f75f75e96..05fc1ddf44 100644 --- a/gradle/rewrite.gradle +++ b/gradle/rewrite.gradle @@ -1,5 +1,4 @@ apply plugin: 'org.openrewrite.rewrite' - rewrite { activeRecipe('com.diffplug.spotless.openrewrite.SanityCheck') exclusions.addAll( @@ -21,3 +20,11 @@ rewrite { exportDatatables = true failOnDryRunResults = true } +dependencies { + rewrite(platform('org.openrewrite.recipe:rewrite-recipe-bom:3.18.0')) + rewrite('org.openrewrite.recipe:rewrite-migrate-java:3.20.0') + rewrite('org.openrewrite.recipe:rewrite-java-security:3.20.0') + rewrite('org.openrewrite.recipe:rewrite-rewrite:0.14.1') + rewrite('org.openrewrite.recipe:rewrite-static-analysis:2.20.0') + rewrite('org.openrewrite.recipe:rewrite-third-party:0.31.1') +} diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 23449a2b54..50bfc3320d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -5,3 +5,4 @@ networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists +distributionSha256Sum=72f44c9f8ebcb1af43838f45ee5c4aa9c5444898b3468ab3f4af7b6076c5bc3f diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/npm/NpmStepsWithNpmInstallCacheTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/npm/NpmStepsWithNpmInstallCacheTest.java index 75d4b3f693..173565db5c 100644 --- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/npm/NpmStepsWithNpmInstallCacheTest.java +++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/npm/NpmStepsWithNpmInstallCacheTest.java @@ -165,7 +165,7 @@ public RecursiveDelete(String exclusionDirectory) { @Override public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException { - if (exclusionDirectory != null && dir.toFile().getName().equals(exclusionDirectory)) { + if (dir.toFile().getName().equals(exclusionDirectory)) { return FileVisitResult.SKIP_SUBTREE; } return super.preVisitDirectory(dir, attrs); diff --git a/rewrite.yml b/rewrite.yml index 387b1137d7..00f05a6fa4 100644 --- a/rewrite.yml +++ b/rewrite.yml @@ -11,7 +11,7 @@ tags: recipeList: - org.openrewrite.gradle.EnableGradleBuildCache - org.openrewrite.gradle.EnableGradleParallelExecution - # - org.openrewrite.gradle.GradleBestPractices https://github.com/openrewrite/rewrite/issues/6237 + - org.openrewrite.gradle.GradleBestPractices - org.openrewrite.java.RemoveUnusedImports - org.openrewrite.java.format.NormalizeFormat - org.openrewrite.java.format.NormalizeLineBreaks From 638b0a8261c0b028b01d4b026bd2ede34df8b0cf Mon Sep 17 00:00:00 2001 From: Vincent Potucek Date: Thu, 20 Nov 2025 13:09:22 +0100 Subject: [PATCH 2/2] [rewrite] fix `GradleBestPractices` Signed-off-by: Vincent Potucek --- build.gradle | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index 30238308f8..0c05e307ce 100644 --- a/build.gradle +++ b/build.gradle @@ -1,20 +1,16 @@ apply plugin: 'dev.equo.ide' + equoIde { branding().title('Spotless').icon(file('_images/spotless_logo.png')) welcome().openUrl('https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md') gradleBuildship().autoImport('.') } -repositories { - mavenCentral() -} - +apply from: rootProject.file('gradle/java-publish.gradle') +apply from: rootProject.file('gradle/changelog.gradle') +apply from: rootProject.file('gradle/rewrite.gradle') allprojects { apply from: rootProject.file('gradle/error-prone.gradle') apply from: rootProject.file('gradle/spotless.gradle') } -apply from: rootProject.file('gradle/changelog.gradle') -apply from: rootProject.file('gradle/java-publish.gradle') -apply from: rootProject.file('gradle/rewrite.gradle') apply from: rootProject.file('gradle/spotless-freshmark.gradle') -