diff --git a/build.gradle b/build.gradle
index dbcd602..e126d6d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -55,9 +55,11 @@ checkstyle {
 
 spotless {
     java {
-        googleJavaFormat()
+        googleJavaFormat('1.25.2').aosp()
         importOrder()
         removeUnusedImports()
+        trimTrailingWhitespace()
+        endWithNewline()
     }
 }