From d587454c1b2258fe9ce43bc24b06cd0e831d8c53 Mon Sep 17 00:00:00 2001 From: Jeff Bahr Date: Wed, 20 Mar 2024 15:54:27 -0700 Subject: [PATCH] Migrate google java format from 1.7 -> 1.21.0 Summary: X-link: https://github.com/facebook/fresco/pull/2757 X-link: https://github.com/facebook/litho/pull/974 X-link: https://github.com/facebook/react-native/pull/42754 X-link: https://github.com/facebook/hhvm/pull/9431 X-link: https://github.com/WhatsApp/eqwalizer/pull/52 X-link: https://github.com/facebookincubator/spectrum/pull/1858 X-link: https://github.com/fbsamples/metapay/pull/1 X-link: https://github.com/facebookincubator/fbjni/pull/95 X-link: https://github.com/facebookincubator/Battery-Metrics/pull/30 X-link: https://github.com/facebook/ktfmt/pull/440 X-link: https://github.com/facebook/flipper/pull/5456 X-link: https://github.com/facebook/hermes/pull/1290 X-link: https://github.com/facebook/TextLayoutBuilder/pull/35 X-link: https://github.com/facebook/SoLoader/pull/122 This diff migrates google java format form 1.7 to 1.21.0. This update will allow for new language features from java 17 and 21. This diff also formats all necessary files. Changelog: [Internal][Changed] - Updated format from google-java-format 1.7 -> 1.21.0 Reviewed By: IanChilds Differential Revision: D52786052 --- .../app/src/main/java/com/facebook/igl/sample/SampleLib.java | 1 + shell/android/java/com/facebook/igl/sample/SampleLib.java | 1 + 2 files changed, 2 insertions(+) diff --git a/build/android/app/src/main/java/com/facebook/igl/sample/SampleLib.java b/build/android/app/src/main/java/com/facebook/igl/sample/SampleLib.java index 4183c57a1e..5b5aee7518 100644 --- a/build/android/app/src/main/java/com/facebook/igl/sample/SampleLib.java +++ b/build/android/app/src/main/java/com/facebook/igl/sample/SampleLib.java @@ -16,6 +16,7 @@ public class SampleLib { static { System.loadLibrary("ColorSession"); } + // should match with IDs in TinyRenderer.h protected static final int gl3ID = 0; protected static final int gl2ID = 1; diff --git a/shell/android/java/com/facebook/igl/sample/SampleLib.java b/shell/android/java/com/facebook/igl/sample/SampleLib.java index 8a0585ad8e..0c1c38893a 100644 --- a/shell/android/java/com/facebook/igl/sample/SampleLib.java +++ b/shell/android/java/com/facebook/igl/sample/SampleLib.java @@ -16,6 +16,7 @@ public class SampleLib { static { System.loadLibrary("sampleJni"); } + // should match with IDs in TinyRenderer.h protected static final int gl3ID = 0; protected static final int gl2ID = 1;