From 930340e8f0091971cecb3be613cf75182d9cd5ef Mon Sep 17 00:00:00 2001
From: Gold856 <117957790+Gold856@users.noreply.github.com>
Date: Fri, 24 Apr 2026 01:52:19 -0400
Subject: [PATCH] [build] Always run Checkstyle after spotlessApply (#8794)

This avoids issues where Checkstyle will error on line length by having
Spotless run first and fix up line lengths before Checkstyle sees the
files.
---
 shared/java/javastyle.gradle | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/shared/java/javastyle.gradle b/shared/java/javastyle.gradle
index b8771616c3..9df2d5f338 100644
--- a/shared/java/javastyle.gradle
+++ b/shared/java/javastyle.gradle
@@ -85,5 +85,9 @@ spotbugs {
 task javaFormat {
     dependsOn(tasks.withType(Checkstyle))
     dependsOn(tasks.withType(Pmd))
+    dependsOn 'spotlessApply'
+}
+
+tasks.withType(Checkstyle) {
+    it.mustRunAfter 'spotlessApply'
 }
-javaFormat.dependsOn 'spotlessApply'