For #533. Spotless uses Gradle version catalog

binkley · Aug 13, 2024 · 6f12958 · 6f12958
1 parent 3ee62e2
commit 6f12958
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/build.gradle b/build.gradle
@@ -6,19 +6,19 @@ plugins {
     id "build-dashboard" // See build/reports/buildDashboard/index.html
     // TODO: project-report is presently broken because of pitest task
     id "project-report" // Try the `projectReport` task
-    alias libs.plugins.com.dorongold.task.tree
-    alias libs.plugins.com.github.ben.manes.versions
-    alias libs.plugins.nl.littlerobots.version.catalog.update
+    alias libs.plugins.com.dorongold.task.tree.plugin
+    alias libs.plugins.com.github.ben.manes.versions.plugin
+    alias libs.plugins.nl.littlerobots.version.catalog.update.plugin
     id "java" // Gradle support for Java
     id "checkstyle" // To check that code follow style standards
     id "jacoco" // To run test coverage
     id "pmd" // Static analysis based on source (does not check compiled code)
     id "com.github.spotbugs" // Static analysis based on compiled code (does not check source)
-    id "com.diffplug.spotless" version "7.0.0.BETA1"
+    alias libs.plugins.com.diffplug.spotless.plugin
     alias libs.plugins.com.github.andygoossens.gradle.modernizer.plugin
     id "info.solidsoft.pitest" // To run mutation testing
-    alias libs.plugins.org.kordamp.gradle.jdeps
-    alias libs.plugins.org.owasp.dependencycheck
+    alias libs.plugins.org.kordamp.gradle.jdeps.plugin
+    alias libs.plugins.org.owasp.dependencycheck.plugin
     id "application" // To build the executable jar
 }
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,4 +1,5 @@
 [versions]
+com-diffplug-spotless-plugin = "6.25.0"
 com-dorongold-task-tree-plugin = "4.0.0"
 com-github-andygoossens-gradle-modernizer-plugin = "1.9.3"
 com-github-ben-manes-versions-plugin = "0.51.0"
@@ -36,9 +37,10 @@ org-pitest-pitest-junit5-plugin = { module = "org.pitest:pitest-junit5-plugin",
 org-projectlombok-lombok = { module = "org.projectlombok:lombok", version.ref = "org-projectlombok" }
 
 [plugins]
-com-dorongold-task-tree = { id = "com.dorongold.task-tree", version.ref = "com-dorongold-task-tree-plugin" }
+com-diffplug-spotless-plugin = { id = "com.diffplug.spotless", version.ref = "com-diffplug-spotless-plugin" }
+com-dorongold-task-tree-plugin = { id = "com.dorongold.task-tree", version.ref = "com-dorongold-task-tree-plugin" }
 com-github-andygoossens-gradle-modernizer-plugin = { id = "com.github.andygoossens.gradle-modernizer-plugin", version.ref = "com-github-andygoossens-gradle-modernizer-plugin" }
-com-github-ben-manes-versions = { id = "com.github.ben-manes.versions", version.ref = "com-github-ben-manes-versions-plugin" }
-nl-littlerobots-version-catalog-update = { id = "nl.littlerobots.version-catalog-update", version.ref = "nl-littlerobots-version-catalog-update-plugin" }
-org-kordamp-gradle-jdeps = { id = "org.kordamp.gradle.jdeps", version.ref = "org-kordamp-gradle-jdeps-plugin" }
-org-owasp-dependencycheck = { id = "org.owasp.dependencycheck", version.ref = "org-owasp-dependencycheck-plugin" }
+com-github-ben-manes-versions-plugin = { id = "com.github.ben-manes.versions", version.ref = "com-github-ben-manes-versions-plugin" }
+nl-littlerobots-version-catalog-update-plugin = { id = "nl.littlerobots.version-catalog-update", version.ref = "nl-littlerobots-version-catalog-update-plugin" }
+org-kordamp-gradle-jdeps-plugin = { id = "org.kordamp.gradle.jdeps", version.ref = "org-kordamp-gradle-jdeps-plugin" }
+org-owasp-dependencycheck-plugin = { id = "org.owasp.dependencycheck", version.ref = "org-owasp-dependencycheck-plugin" }