Add google-java-format 1.24.0
Use it for formatting generated code.
Bug: b/380038007
Change-Id: Id137f0898f3b06f96ccbd03ad9935b0d01513d22
diff --git a/.gitignore b/.gitignore
index b62cc8f..8b18a69 100644
--- a/.gitignore
+++ b/.gitignore
@@ -115,6 +115,8 @@
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
third_party/google/yapf/20231013.tar.gz
third_party/google-java-format
diff --git a/d8_r8/commonBuildSrc/src/main/kotlin/DependenciesPlugin.kt b/d8_r8/commonBuildSrc/src/main/kotlin/DependenciesPlugin.kt
index 16fa3e8..5691378 100644
--- a/d8_r8/commonBuildSrc/src/main/kotlin/DependenciesPlugin.kt
+++ b/d8_r8/commonBuildSrc/src/main/kotlin/DependenciesPlugin.kt
@@ -627,6 +627,10 @@
"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(),
+ Paths.get("third_party", "google", "google-java-format", "1.24.0.tar.gz.sha1").toFile())
val googleYapf_20231013 = ThirdPartyDependency(
"google-yapf-20231013",
Paths.get("third_party", "google", "yapf", "20231013").toFile(),
diff --git a/src/test/java/com/android/tools/r8/cfmethodgeneration/CodeGenerationBase.java b/src/test/java/com/android/tools/r8/cfmethodgeneration/CodeGenerationBase.java
index 2617cb6..2925557 100644
--- a/src/test/java/com/android/tools/r8/cfmethodgeneration/CodeGenerationBase.java
+++ b/src/test/java/com/android/tools/r8/cfmethodgeneration/CodeGenerationBase.java
@@ -20,9 +20,9 @@
public abstract class CodeGenerationBase extends TestBase {
private static final Path GOOGLE_FORMAT_DIR =
- Paths.get(ToolHelper.THIRD_PARTY_DIR, "google", "google-java-format", "1.14.0");
+ Paths.get(ToolHelper.THIRD_PARTY_DIR, "google", "google-java-format", "1.24.0");
private static final Path GOOGLE_FORMAT_JAR =
- GOOGLE_FORMAT_DIR.resolve("google-java-format-1.14.0-all-deps.jar");
+ GOOGLE_FORMAT_DIR.resolve("google-java-format-1.24.0-all-deps.jar");
protected final DexItemFactory factory = new DexItemFactory();
diff --git a/third_party/google/google-java-format/1.24.0.tar.gz.sha1 b/third_party/google/google-java-format/1.24.0.tar.gz.sha1
new file mode 100644
index 0000000..a5ed90d
--- /dev/null
+++ b/third_party/google/google-java-format/1.24.0.tar.gz.sha1
@@ -0,0 +1 @@
+f15e5757395aaeb77e9940884c46b29f1abfade7
\ No newline at end of file
