From a70354df12ef71aec08583cca4f1fed5fb77d874 Mon Sep 17 00:00:00 2001 From: Chatura Atapattu Date: Sun, 24 Jul 2022 13:46:21 -0700 Subject: [PATCH] Apply lint updates from buildifier in xplat Summary: In D37873933, we update the buildifier binaries, which apply some minor changes to existing lint. Specifically, entries are now properly sorted. Update the files in xplat such that updating buildifier does not cause lint changes in users diffs. drop-conflicts allow_many_files #nocancel #forcetdhashing (Note: this ignores all push blocking failures!) Reviewed By: d16r Differential Revision: D37873936 fbshipit-source-id: f31d9c50d64ae99f99298977b471bf13e7ed5262 --- BUCK | 4 ++-- ReactAndroid/src/main/libraries/fbjni/BUCK | 2 +- .../main/libraries/soloader/java/com/facebook/soloader/BUCK | 2 +- ReactAndroid/src/main/third-party/kotlin/BUCK | 4 ++-- packages/react-native-codegen/BUCK | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/BUCK b/BUCK index d9ee7b3fc65c7b..d860f24002a20c 100644 --- a/BUCK +++ b/BUCK @@ -57,9 +57,9 @@ fb_native.genrule( ) + [ react_native_root_target("packages/rn-tester:nativecomponent-srcs"), ], - labels = ["uses_hg"], - cmd = "$(exe {}) $OUT $SRCS".format(react_native_root_target("packages/react-native-codegen:write_to_json")), out = "schema-rncore.json", + cmd = "$(exe {}) $OUT $SRCS".format(react_native_root_target("packages/react-native-codegen:write_to_json")), + labels = ["uses_hg"], ) rn_codegen_components( diff --git a/ReactAndroid/src/main/libraries/fbjni/BUCK b/ReactAndroid/src/main/libraries/fbjni/BUCK index 4d6d134811ab5a..f9b1d33925cd15 100644 --- a/ReactAndroid/src/main/libraries/fbjni/BUCK +++ b/ReactAndroid/src/main/libraries/fbjni/BUCK @@ -2,10 +2,10 @@ load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native") fb_native.android_library( name = "java", + visibility = ["PUBLIC"], exported_deps = [ ":fbjni-binary", ], - visibility = ["PUBLIC"], ) fb_native.android_prebuilt_aar( diff --git a/ReactAndroid/src/main/libraries/soloader/java/com/facebook/soloader/BUCK b/ReactAndroid/src/main/libraries/soloader/java/com/facebook/soloader/BUCK index 2421d56d1c1754..7b29b51867109e 100644 --- a/ReactAndroid/src/main/libraries/soloader/java/com/facebook/soloader/BUCK +++ b/ReactAndroid/src/main/libraries/soloader/java/com/facebook/soloader/BUCK @@ -2,12 +2,12 @@ load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native") fb_native.android_library( name = "soloader", + visibility = ["PUBLIC"], exported_deps = [ ":annotation-binary", ":nativeloader-binary", ":soloader-binary", ], - visibility = ["PUBLIC"], ) fb_native.prebuilt_jar( diff --git a/ReactAndroid/src/main/third-party/kotlin/BUCK b/ReactAndroid/src/main/third-party/kotlin/BUCK index c1d09721a55377..b96b7417e97d27 100644 --- a/ReactAndroid/src/main/third-party/kotlin/BUCK +++ b/ReactAndroid/src/main/third-party/kotlin/BUCK @@ -83,7 +83,6 @@ fb_native.remote_file( fb_native.genrule( name = "kotlin-compiler-download", - type = "copy", srcs = [ ":annotations-13.0.jar", ":kotlin-annotation-processing.jar", @@ -94,9 +93,10 @@ fb_native.genrule( ":kotlin-stdlib.jar", ":trove4j.jar", ], + out = "kotlin-compiler-out", cmd = "mkdir ${OUT} && cp ${SRCS} ${OUT}", cmd_exe = "@powershell -Command Copy-Item '${SRCS}' '${OUT}'", - out = "kotlin-compiler-out", + type = "copy", ) fb_native.remote_file( diff --git a/packages/react-native-codegen/BUCK b/packages/react-native-codegen/BUCK index 4a7708056982d5..d06563f4a08c04 100644 --- a/packages/react-native-codegen/BUCK +++ b/packages/react-native-codegen/BUCK @@ -17,8 +17,8 @@ fb_native.genrule( "**/e2e/__test_fixtures__/modules/Native*.js", ], ), - cmd = "$(exe {}) $OUT $SRCS".format(react_native_root_target("packages/react-native-codegen:write_to_json")), out = "schema-codegen_tests.json", + cmd = "$(exe {}) $OUT $SRCS".format(react_native_root_target("packages/react-native-codegen:write_to_json")), ) rn_codegen_components(