Skip to content

Commit

Permalink
Migrate google java format from 1.7 -> 1.21.0 (#122)
Browse files Browse the repository at this point in the history
Summary:
X-link: facebookexternal/OculusManufacturing#524

X-link: facebookexternal/fbpay#3

X-link: facebook/screenshot-tests-for-android#324

X-link: pytorch/executorch#1771

X-link: facebook/igl#68

X-link: facebook/mariana-trench#153

X-link: facebook/fresco#2757

X-link: facebook/litho#974

X-link: facebook/react-native#42754

X-link: facebook/hhvm#9431

X-link: WhatsApp/eqwalizer#52

X-link: facebookincubator/spectrum#1858

X-link: fbsamples/metapay#1

X-link: facebookincubator/fbjni#95

X-link: facebookincubator/Battery-Metrics#30

X-link: facebook/ktfmt#440

X-link: facebook/flipper#5456

X-link: facebook/hermes#1290

X-link: facebook/TextLayoutBuilder#35

Pull Request resolved: #122

allow-large-files

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

fbshipit-source-id: b675ae215084f340b93dfe628e329e696ca0616e
  • Loading branch information
j-bahr authored and facebook-github-bot committed Mar 23, 2024
1 parent 50dc99c commit 995bf5a
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 5 deletions.
6 changes: 4 additions & 2 deletions java/com/facebook/soloader/NativeDeps.java
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,8 @@ public void run() {
sWaitForDepsFileLock.writeLock().unlock();
sUseDepsFileAsync = false;
}
};
}
;
};

new Thread(runnable, "soloader-nativedeps-init").start();
Expand Down Expand Up @@ -183,7 +184,8 @@ private static boolean useDepsFileFromApkSync(final Context context, boolean ext
if (!success) {
LogUtil.w(
LOG_TAG,
"Failed to extract native deps from APK, falling back to using MinElf to get library dependencies.");
"Failed to extract native deps from APK, falling back to using MinElf to get library"
+ " dependencies.");
}

return success;
Expand Down
4 changes: 3 additions & 1 deletion java/com/facebook/soloader/SoSource.java
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,9 @@ public String[] getSoSourceAbis() {
return SysUtil.getSupportedAbis();
}

/** @return the name of this SoSource for logging purposes */
/**
* @return the name of this SoSource for logging purposes
*/
public abstract String getName();

/**
Expand Down
3 changes: 2 additions & 1 deletion java/com/facebook/soloader/SysUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,8 @@ public static String[] getSupportedAbis() {
LogUtil.e(
TAG,
String.format(
"Could not read /proc/self/exe. Falling back to default ABI list: %s. errno: %d Err msg: %s",
"Could not read /proc/self/exe. Falling back to default ABI list: %s. errno: %d Err"
+ " msg: %s",
Arrays.toString(supportedAbis), e.errno, e.getMessage()));
return Build.SUPPORTED_ABIS;
}
Expand Down
4 changes: 3 additions & 1 deletion java/com/facebook/soloader/SystemLoadLibraryWrapper.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@

package com.facebook.soloader;

/** @see SoLoader#setSystemLoadLibraryWrapper */
/**
* @see SoLoader#setSystemLoadLibraryWrapper
*/
public interface SystemLoadLibraryWrapper {
void loadLibrary(String libName);
}

0 comments on commit 995bf5a

Please sign in to comment.