Add and run tidy in included projects

apache · Jul 29, 2024 · 8ec9b9c · 8ec9b9c
1 parent 89fa0eb
commit 8ec9b9c
Show file tree

Hide file tree

Showing 19 changed files with 983 additions and 782 deletions.
diff --git a/build-tools/build-infra/build.gradle b/build-tools/build-infra/build.gradle
@@ -17,6 +17,7 @@
 
 plugins {
   id "java-gradle-plugin"
+  alias(libs.plugins.diffplug.spotless) apply false
 }
 
 repositories {
@@ -25,6 +26,19 @@ repositories {
 
 group = "org.apache"
 
+// Make sure the build environment is consistent.
+apply from: file('../../gradle/conventions.gradle')
+apply from: file('../../gradle/validation/check-environment.gradle')
+
+// Add spotless/ tidy.
+tasks.register("checkJdkInternalsExportedToGradle") {}
+apply from: file('../../gradle/validation/spotless.gradle')
+
+java {
+  sourceCompatibility = JavaVersion.toVersion(libs.versions.minJava.get())
+  targetCompatibility = JavaVersion.toVersion(libs.versions.minJava.get())
+}
+
 gradlePlugin {
   automatedPublishing = false
 
@@ -36,14 +50,6 @@ gradlePlugin {
   }
 }
 
-// Make sure the build environment is consistent.
-apply from: file('../../gradle/validation/check-environment.gradle')
-
-java {
-  sourceCompatibility = JavaVersion.toVersion(libs.versions.minJava.get())
-  targetCompatibility = JavaVersion.toVersion(libs.versions.minJava.get())
-}
-
 dependencies {
   implementation gradleApi()
   implementation localGroovy()

diff --git a/build-tools/build-infra/settings.gradle b/build-tools/build-infra/settings.gradle
@@ -20,7 +20,7 @@ rootProject.name = 'build-infra'
 // Use project's version catalog for centralized dependency management
 dependencyResolutionManagement {
     versionCatalogs {
-        create("libs") {
+        libs {
             from(files("../../gradle/libs.versions.toml"))
         }
     }

diff --git a/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/Checksum.java b/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/Checksum.java
@@ -27,6 +27,11 @@
 
 package org.apache.lucene.gradle;
 
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.util.Locale;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.gradle.api.DefaultTask;
 import org.gradle.api.GradleException;
@@ -39,12 +44,6 @@
 import org.gradle.work.Incremental;
 import org.gradle.work.InputChanges;
 
-import java.io.File;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.util.Locale;
-
 public class Checksum extends DefaultTask {
   private FileCollection files;
   private File outputDir;