Update google-java-format (#2570)

jianglai · web-flow · commit c0490f777714 · 2024-09-26T14:49:38.000Z
Also converted regex strings in the Python script to raw strings as future Python versions will start to reject them. See: https://docs.python.org/3/whatsnew/3.12.html#other-language-changes
diff --git a/java-format/google-java-format-1.23.0-all-deps.jar b/java-format/google-java-format-1.23.0-all-deps.jar
diff --git a/java-format/google-java-format-diff.py b/java-format/google-java-format-diff.py
@@ -63,7 +63,7 @@ def main():
   lines_by_file = {}
 
   for line in sys.stdin:
-    match = re.search('^\+\+\+\ (.*?/){%s}(\S*)' % args.p, line)
+    match = re.search(r"^\+\+\+\ (.*?/){%s}(\S*)" % args.p, line)
     if match:
       filename = match.group(2)
     if filename is None:
@@ -76,7 +76,7 @@ def main():
       if not re.match('^%s$' % args.iregex, filename, re.IGNORECASE):
         continue
 
-    match = re.search('^@@.*\+(\d+)(,(\d+))?', line)
+    match = re.search(r"^@@.*\+(\d+)(,(\d+))?", line)
     if match:
       start_line = int(match.group(1))
       line_count = 1
diff --git a/java-format/google-java-format-git-diff.sh b/java-format/google-java-format-git-diff.sh
@@ -40,7 +40,7 @@ where:
     show   show the effect of the formatting as unified diff"
 
 SCRIPT_DIR="$(realpath $(dirname $0))"
-JAR_NAME="google-java-format-1.19.2-all-deps.jar"
+JAR_NAME="google-java-format-1.23.0-all-deps.jar"
 
 # Make sure we have a valid python interpreter.
 if [ -z "$PYTHON" ]; then
