From 87ba9398d8301597856f5198540d862707adc5ee Mon Sep 17 00:00:00 2001
From: Alexey Kuznetsov <alexey.kuznetsov@datadoghq.com>
Date: Fri, 27 Jun 2025 13:15:08 -0400
Subject: [PATCH] Moved Spotless configuration for `removeUnusedImports()` into
 `spotless.gradle`.

---
 build.gradle           | 2 --
 gradle/spotless.gradle | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index ac0bd29d117..d997be5493b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -44,8 +44,6 @@ spotless {
 spotlessPredeclare {
   // these need to align with the types and versions in gradle/spotless.gradle
   java {
-    removeUnusedImports()
-
     // This is the last Google Java Format version that supports Java 8
     googleJavaFormat('1.7')
   }
diff --git a/gradle/spotless.gradle b/gradle/spotless.gradle
index 81e4c9d14a0..07fafc5f89a 100644
--- a/gradle/spotless.gradle
+++ b/gradle/spotless.gradle
@@ -16,6 +16,7 @@ spotless {
   if (project.plugins.hasPlugin('java')) {
     java {
       toggleOffOn()
+      removeUnusedImports()
       // set explicit target to workaround https://github.com/diffplug/spotless/issues/1163
       target 'src/**/*.java'
       // ignore embedded test projects