Switch to Google Java formatter 1.24.0
Change-Id: I517df1509f42841ef8ae83df9b6ad925530c8bda
diff --git a/.gitignore b/.gitignore
index 8b18a69..8bd1412 100644
--- a/.gitignore
+++ b/.gitignore
@@ -113,8 +113,6 @@
third_party/framework
third_party/framework.tar.gz
third_party/gmscore/*
-third_party/google/google-java-format/1.14.0
-third_party/google/google-java-format/1.14.0.tar.gz
third_party/google/google-java-format/1.24.0
third_party/google/google-java-format/1.24.0.tar.gz
third_party/google/yapf/20231013
diff --git a/PRESUBMIT.py b/PRESUBMIT.py
index 2312362..986d67c 100644
--- a/PRESUBMIT.py
+++ b/PRESUBMIT.py
@@ -19,16 +19,16 @@
'third_party',
'google',
'google-java-format',
- '1.14.0',
- 'google-java-format-1.14.0',
+ '1.24.0',
+ 'google-java-format-1.24.0',
'scripts',
'google-java-format-diff.py')
FMT_CMD_JDK17 = path.join('tools','google-java-format-diff.py')
FMT_SHA1 = path.join(
- 'third_party', 'google', 'google-java-format', '1.14.0.tar.gz.sha1')
+ 'third_party', 'google', 'google-java-format', '1.24.0.tar.gz.sha1')
FMT_TGZ = path.join(
- 'third_party', 'google', 'google-java-format', '1.14.0.tar.gz')
+ 'third_party', 'google', 'google-java-format', '1.24.0.tar.gz')
def CheckDoNotMerge(input_api, output_api):
for l in input_api.change.FullDescriptionText().splitlines():
@@ -73,7 +73,7 @@
FMT_CMD,
FMT_CMD_JDK17,
'--google-java-format-jar',
- 'third_party/google/google-java-format/1.14.0/google-java-format-1.14.0-all-deps.jar'
+ 'third_party/google/google-java-format/1.24.0/google-java-format-1.24.0-all-deps.jar'
)))
return results
diff --git a/d8_r8/commonBuildSrc/src/main/kotlin/DependenciesPlugin.kt b/d8_r8/commonBuildSrc/src/main/kotlin/DependenciesPlugin.kt
index 5691378..2c639c2 100644
--- a/d8_r8/commonBuildSrc/src/main/kotlin/DependenciesPlugin.kt
+++ b/d8_r8/commonBuildSrc/src/main/kotlin/DependenciesPlugin.kt
@@ -623,10 +623,6 @@
"google-java-format",
Paths.get("third_party", "google-java-format").toFile(),
Paths.get("third_party", "google-java-format.tar.gz.sha1").toFile())
- val googleJavaFormat_1_14 = ThirdPartyDependency(
- "google-java-format-1.14",
- Paths.get("third_party", "google", "google-java-format", "1.14.0").toFile(),
- Paths.get("third_party", "google", "google-java-format", "1.14.0.tar.gz.sha1").toFile())
val googleJavaFormat_1_24 = ThirdPartyDependency(
"google-java-format-1.24",
Paths.get("third_party", "google", "google-java-format", "1.24.0").toFile(),
diff --git a/third_party/google/google-java-format/1.14.0.tar.gz.sha1 b/third_party/google/google-java-format/1.14.0.tar.gz.sha1
deleted file mode 100644
index 4989c27..0000000
--- a/third_party/google/google-java-format/1.14.0.tar.gz.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b26f4b8c825401d198d54d5e230779fe7fc3c132
\ No newline at end of file
diff --git a/tools/fmt-diff.py b/tools/fmt-diff.py
index 0e4ada7..3a63fcf 100755
--- a/tools/fmt-diff.py
+++ b/tools/fmt-diff.py
@@ -13,8 +13,8 @@
from subprocess import Popen, PIPE
GOOGLE_JAVA_FORMAT_DIFF = os.path.join(utils.THIRD_PARTY, 'google',
- 'google-java-format', '1.14.0',
- 'google-java-format-1.14.0', 'scripts',
+ 'google-java-format', '1.24.0',
+ 'google-java-format-1.24.0', 'scripts',
'google-java-format-diff.py')
GOOGLE_YAPF = os.path.join(utils.THIRD_PARTY, 'google/yapf/20231013')
