From 62bfa51af5634a9cb9a1029410e119f9c74a4dd2 Mon Sep 17 00:00:00 2001
From: Lars Simon Winzer <lars.winzer@stud.unibas.ch>
Date: Wed, 18 Mar 2026 17:34:33 +0100
Subject: [PATCH 1/3] Add: Change ImportOrder in Checkstyle to match configured
 styleguide in Spotless

---
 config/checkstyle/checkstyle.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
index 287cd3b..3667216 100644
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -62,7 +62,13 @@
 
         <!-- No unordered / ungrouped imports -->
         <!-- https://checkstyle.sourceforge.io/checks/imports/importorder.html -->
-        <module name="ImportOrder"/>
+        <module name="ImportOrder">
+            <property name="option" value="top"/>
+            <property name="groups" value="/^import static\..+/,*"/>
+            <property name="separated" value="true"/>
+            <property name="separatedStaticGroups" value="true"/>
+            <property name="sortStaticImportsAlphabetically" value="true"/>
+        </module>
 
         <!-- Classes, enums, records, ... as PascalCase -->
         <!-- https://checkstyle.sourceforge.io/checks/naming/typename.html -->
-- 
2.52.0


From 97c2dc6a02a557e4e16e3aaaff8b224846dfc1a2 Mon Sep 17 00:00:00 2001
From: Lars Simon Winzer <lars.winzer@stud.unibas.ch>
Date: Wed, 18 Mar 2026 17:36:53 +0100
Subject: [PATCH 2/3] Docs: Add comment to LineLength regarding difference
 between AOSP and Google Java Style Guide

---
 config/checkstyle/checkstyle.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
index 3667216..b910a2e 100644
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -20,7 +20,7 @@
     <!-- https://checkstyle.sourceforge.io/checks/whitespace/filetabcharacter.html -->
     <module name="FileTabCharacter"/>
 
-    <!-- Maximale Zeilenlänge -->
+    <!-- Maximale Zeilenlänge (AOSP enforces 100 lines, the Google Java Style Guide 80)-->
     <!-- https://checkstyle.sourceforge.io/checks/sizes/linelength.html -->
     <module name="LineLength">
         <property name="max" value="100"/>
-- 
2.52.0


From e1500845ebda90d625151c572a32a0b64d7cbbbc Mon Sep 17 00:00:00 2001
From: Lars Simon Winzer <lars.winzer@stud.unibas.ch>
Date: Wed, 18 Mar 2026 17:41:38 +0100
Subject: [PATCH 3/3] Remove: Indentation module, as Checkstyle can not match
 Spotless

Explanation: Spotless uses the context to calculate the required indentation
---
 config/checkstyle/checkstyle.xml | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
index b910a2e..f51f87a 100644
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -42,16 +42,6 @@
             "/>
         </module>
 
-        <!-- Enforce indentation of four whitespaces -->
-        <!-- https://checkstyle.sourceforge.io/checks/misc/indentation.html -->
-        <module name="Indentation">
-            <property name="basicOffset" value="4"/>
-            <property name="caseIndent" value="4"/>
-            <property name="throwsIndent" value="4"/>
-            <property name="arrayInitIndent" value="4"/>
-            <property name="lineWrappingIndentation" value="8"/>
-        </module>
-
         <!-- No wildcard imports (import x.*) -->
         <!-- https://checkstyle.sourceforge.io/checks/imports/avoidstarimport.html -->
         <module name="AvoidStarImport"/>
-- 
2.52.0