From 343e38a5fdd9813e21595b34718da5efe9d9077e Mon Sep 17 00:00:00 2001 From: Ludy87 Date: Tue, 17 Dec 2024 11:01:17 +0100 Subject: [PATCH] Bump googleJavaFormat from 1.22.0 to 1.25.2 --- .vscode/settings.json | 4 +++- build.gradle | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index b0d31dae..c8ef9888 100644 --- 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 index 2a717c25..ff22d976 100644 --- 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()