diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 8caae3bbb..065b49418 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -112,7 +112,7 @@ repos:
     hooks:
       - id: pretty-format-java
         # Keep this version in sync with the same version in .vscode/settings.json
-        args: [--autofix, --aosp, --google-java-formatter-version=1.20.0]
+        args: [--autofix, --aosp, --google-java-formatter-version=1.21.0]
 
   - repo: https://github.com/DavidAnson/markdownlint-cli2
     rev: v0.12.1
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 6eb590f54..89ea48b8b 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -71,9 +71,7 @@
   "java.format.settings.google.extra": "--aosp", // For 4 instead of 2 spaces!
   // Keep this version in sync with the same version in .pre-commit-config.yaml
   // NB: Changes to this are only taken into account on start-up, so need to restart.
-  "java.format.settings.google.version": "1.20.0",
-  // TODO Remove when https://github.com/google/google-java-format/issues/1072 is fixed:
-  "java.format.settings.google.mode": "jar-file",
+  "java.format.settings.google.version": "1.21.0",
   // TODO https://github.com/eclipse-jdtls/eclipse.jdt.ls/issues/3050
   "java.compile.nullAnalysis.mode": "automatic",
   "java.completion.importOrder": ["#", "", "javax", "java"], //# is static