[rewrite] fix GradleBestPractices (#2742)

Author: nedtwigg

build.gradle

@@ -1,29 +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/rewrite.gradle')
 	apply from: rootProject.file('gradle/spotless.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')
-}

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')
+}

gradle/wrapper/gradle-wrapper.properties

@@ -5,3 +5,4 @@ networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionSha256Sum=72f44c9f8ebcb1af43838f45ee5c4aa9c5444898b3468ab3f4af7b6076c5bc3f

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);

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