Merge pull request #2481 from Ludy87/bump_googleJavaFormat_1_25_2

Bump googleJavaFormat from 1.22.0 to 1.25.2
Stirling-Tools · Dec 17, 2024 · 317d985 · 317d985
2 parents 7f045db + 64f8348
commit 317d985
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -49,5 +49,7 @@
   "editor.indentSize": "tabSize",
   "editor.stickyScroll.enabled": false,
   "editor.minimap.enabled": false,
-  "editor.formatOnSave": true
+  "editor.formatOnSave": true,
+  "java.format.settings.google.mode": "jar-file",
+  "java.format.settings.google.extra": "--aosp --skip-sorting-imports"
 }
diff --git a/build.gradle b/build.gradle
@@ -247,7 +247,7 @@ spotless {
     java {
         target project.fileTree('src/main/java')
 
-        googleJavaFormat("1.22.0").aosp().reorderImports(false)
+        googleJavaFormat("1.25.2").aosp().reorderImports(false)
 
         importOrder("java", "javax", "org", "com", "net", "io")
         toggleOffOn()