diff --git a/build.gradle b/build.gradle
index 9baa47df27..cc94f372e0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,37 +4,14 @@ equoIde {
 	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')
 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')
-
-spotless {
-	groovyGradle {
-		target '*.gradle', 'gradle/*.gradle'
-	}
-	format 'dotfiles', {
-		target '.gitignore', '.gitattributes', '.editorconfig'
-		leadingTabsToSpaces(2)
-		trimTrailingWhitespace()
-		endWithNewline()
-	}
-}
-
-dependencies {
-	rewrite(platform('org.openrewrite.recipe:rewrite-recipe-bom:3.16.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.29.0')
-}
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/spotless.gradle b/gradle/spotless.gradle
index f19bf46911..4202d3e62b 100644
--- a/gradle/spotless.gradle
+++ b/gradle/spotless.gradle
@@ -16,7 +16,13 @@ spotless {
 		}
 	}
 	groovyGradle {
-		target '*.gradle'
+		target '*.gradle', 'gradle/*.gradle'
 		greclipse().configFile rootProject.files('gradle/spotless.eclipseformat.xml', 'gradle/spotless.groovyformat.prefs')
 	}
+	format 'dotfiles', {
+		target '.gitignore', '.gitattributes', '.editorconfig'
+		leadingTabsToSpaces(2)
+		trimTrailingWhitespace()
+		endWithNewline()
+	}
 }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 8bdaf60c75..f8e1ee3125 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2e1113280e..50bfc3320d 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,8 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
 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
diff --git a/settings.gradle b/settings.gradle
index 7c6a7f9873..78e20ac921 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -18,7 +18,7 @@ plugins {
 	id 'io.github.davidburstrom.version-compatibility' version '0.5.0' apply false // https://github.com/davidburstrom/version-compatibility-gradle-plugin/tags
 	id 'io.github.gradle-nexus.publish-plugin' version '2.0.0' apply false // https://github.com/gradle-nexus/publish-plugin/releases
 	id 'net.ltgt.errorprone' version '4.3.0' apply false
-	id 'org.openrewrite.rewrite' version '7.18.0' apply false
+	id 'org.openrewrite.rewrite' version '7.20.0' apply false
 }
 
 dependencyResolutionManagement {