From d42697bcf3c9ad4e51c4ef57f01bf4710decf30b Mon Sep 17 00:00:00 2001 From: Andres Suarez Date: Fri, 25 May 2018 11:09:49 -0700 Subject: [PATCH] Run buildifier over BUCK and TARGETS files Reviewed By: scottrice Differential Revision: D8163151 fbshipit-source-id: 700a77c09c6ab1bef8fd24a2a3133a4b50e3b3a3 --- .../src/main/java/com/facebook/debug/holder/BUCK | 6 +++--- .../src/main/java/com/facebook/debug/tags/BUCK | 6 +++--- .../src/main/java/com/facebook/react/bridge/BUCK | 10 +++++----- .../src/main/java/com/facebook/react/common/BUCK | 6 +++--- .../src/main/java/com/facebook/react/fabric/jsc/BUCK | 8 ++++---- .../java/com/facebook/react/modules/systeminfo/BUCK | 6 +++--- .../src/main/java/com/facebook/react/uimanager/BUCK | 10 +++++----- .../src/main/java/com/facebook/react/views/image/BUCK | 6 +++--- .../java/com/facebook/react/views/imagehelper/BUCK | 6 +++--- .../src/main/java/com/facebook/common/logging/BUCK | 2 +- .../fbcore/src/test/java/com/facebook/powermock/BUCK | 2 +- .../src/main/libraries/fresco/fresco-react-native/BUCK | 2 +- ReactAndroid/src/main/libraries/textlayoutbuilder/BUCK | 2 +- .../third-party/android/support/v7/appcompat-orig/BUCK | 6 +++--- ReactAndroid/src/main/third-party/java/asm/BUCK | 2 +- ReactAndroid/src/main/third-party/java/fest/BUCK | 2 +- ReactAndroid/src/main/third-party/java/junit/BUCK | 2 +- ReactAndroid/src/main/third-party/java/mockito/BUCK | 2 +- .../third-party/java/robolectric3/robolectric/BUCK | 2 +- ReactAndroid/src/main/third-party/java/sqlite/BUCK | 2 +- .../src/test/java/com/facebook/common/logging/BUCK | 6 +++--- ReactCommon/jschelpers/BUCK | 6 +++--- 22 files changed, 51 insertions(+), 51 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/debug/holder/BUCK b/ReactAndroid/src/main/java/com/facebook/debug/holder/BUCK index 57a3818bb..e28e0062d 100644 --- a/ReactAndroid/src/main/java/com/facebook/debug/holder/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/debug/holder/BUCK @@ -3,13 +3,13 @@ load("//ReactNative:DEFS.bzl", "react_native_dep", "rn_android_library") rn_android_library( name = "holder", srcs = glob(["*.java"]), - exported_deps = [ - react_native_dep("java/com/facebook/debug/debugoverlay/model:model"), - ], visibility = [ "PUBLIC", ], deps = [ react_native_dep("third-party/java/jsr-305:jsr-305"), ], + exported_deps = [ + react_native_dep("java/com/facebook/debug/debugoverlay/model:model"), + ], ) diff --git a/ReactAndroid/src/main/java/com/facebook/debug/tags/BUCK b/ReactAndroid/src/main/java/com/facebook/debug/tags/BUCK index 7349e68dc..85aaf21d9 100644 --- a/ReactAndroid/src/main/java/com/facebook/debug/tags/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/debug/tags/BUCK @@ -3,13 +3,13 @@ load("//ReactNative:DEFS.bzl", "react_native_dep", "rn_android_library") rn_android_library( name = "tags", srcs = glob(["*.java"]), - exported_deps = [ - react_native_dep("java/com/facebook/debug/debugoverlay/model:model"), - ], visibility = [ "PUBLIC", ], deps = [ react_native_dep("third-party/java/jsr-305:jsr-305"), ], + exported_deps = [ + react_native_dep("java/com/facebook/debug/debugoverlay/model:model"), + ], ) diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK b/ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK index be6ee9980..d473c9cf2 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK @@ -3,11 +3,6 @@ load("//ReactNative:DEFS.bzl", "IS_OSS_BUILD", "react_native_dep", "react_native rn_android_library( name = "bridge", srcs = glob(["**/*.java"]), - exported_deps = [ - react_native_dep("java/com/facebook/jni:jni"), - react_native_dep("java/com/facebook/proguard/annotations:annotations"), - react_native_dep("third-party/java/jsr-330:jsr-330"), - ], proguard_config = "reactnative.pro", provided_deps = [ react_native_dep("third-party/android/support/v4:lib-support-v4"), @@ -29,4 +24,9 @@ rn_android_library( react_native_target("java/com/facebook/react/module/model:model"), react_native_target("java/com/facebook/react/uimanager/common:common"), ] + ([react_native_target("jni/react/jni:jni")] if not IS_OSS_BUILD else []), + exported_deps = [ + react_native_dep("java/com/facebook/jni:jni"), + react_native_dep("java/com/facebook/proguard/annotations:annotations"), + react_native_dep("third-party/java/jsr-330:jsr-330"), + ], ) diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/BUCK b/ReactAndroid/src/main/java/com/facebook/react/common/BUCK index 969220830..3cdee118d 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/common/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/common/BUCK @@ -10,9 +10,6 @@ rn_android_library( ["**/*.java"], excludes = SUB_PROJECTS, ), - exported_deps = [ - react_native_dep("java/com/facebook/proguard/annotations:annotations"), - ], provided_deps = [ react_native_dep("third-party/android/support/v4:lib-support-v4"), ], @@ -26,6 +23,9 @@ rn_android_library( react_native_dep("third-party/java/infer-annotations:infer-annotations"), react_native_dep("third-party/java/jsr-305:jsr-305"), ], + exported_deps = [ + react_native_dep("java/com/facebook/proguard/annotations:annotations"), + ], ) rn_android_build_config( diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsc/BUCK b/ReactAndroid/src/main/java/com/facebook/react/fabric/jsc/BUCK index 9373a8400..18312ac1c 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsc/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jsc/BUCK @@ -3,10 +3,6 @@ load("//ReactNative:DEFS.bzl", "IS_OSS_BUILD", "react_native_dep", "react_native rn_android_library( name = "jsc", srcs = glob(["**/*.java"]), - exported_deps = [ - react_native_dep("java/com/facebook/jni:jni"), - react_native_dep("java/com/facebook/proguard/annotations:annotations"), - ], provided_deps = [ react_native_dep("third-party/android/support/v4:lib-support-v4"), ], @@ -21,4 +17,8 @@ rn_android_library( react_native_target("java/com/facebook/react/fabric:fabric"), react_native_target("java/com/facebook/react/fabric/jsc/jni:jni"), ], + exported_deps = [ + react_native_dep("java/com/facebook/jni:jni"), + react_native_dep("java/com/facebook/proguard/annotations:annotations"), + ], ) diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/BUCK index 6563321a2..cd24044b7 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/BUCK @@ -6,9 +6,6 @@ rn_android_library( "AndroidInfoModule.java", "ReactNativeVersion.java", ], - exported_deps = [ - ":systeminfo-moduleless", - ], visibility = [ "PUBLIC", ], @@ -18,6 +15,9 @@ rn_android_library( react_native_target("java/com/facebook/react/common:common"), react_native_target("java/com/facebook/react/module/annotations:annotations"), ], + exported_deps = [ + ":systeminfo-moduleless", + ], ) rn_android_library( diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/BUCK b/ReactAndroid/src/main/java/com/facebook/react/uimanager/BUCK index 6020ec7df..0a449cfd1 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/BUCK @@ -11,11 +11,6 @@ rn_android_library( ], excludes = ["DisplayMetricsHolder.java"], ), - exported_deps = [ - ":DisplayMetrics", - react_native_dep("third-party/java/jsr-305:jsr-305"), - react_native_target("java/com/facebook/react/uimanager/common:common"), - ], provided_deps = [ react_native_dep("third-party/android/support/v4:lib-support-v4"), react_native_dep("third-party/android/support-annotations:android-support-annotations"), @@ -44,6 +39,11 @@ rn_android_library( react_native_target("java/com/facebook/react/uimanager/common:common"), react_native_target("res:uimanager"), ], + exported_deps = [ + ":DisplayMetrics", + react_native_dep("third-party/java/jsr-305:jsr-305"), + react_native_target("java/com/facebook/react/uimanager/common:common"), + ], ) rn_android_library( diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/image/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/image/BUCK index 223141141..ead269cd5 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/image/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/image/BUCK @@ -26,9 +26,6 @@ rn_android_library( ["*.java"], excludes = IMAGE_EVENT_FILES, ), - exported_deps = [ - ":imageevents", - ], provided_deps = [ react_native_dep("third-party/android/support-annotations:android-support-annotations"), react_native_dep("third-party/android/support/v4:lib-support-v4"), @@ -52,4 +49,7 @@ rn_android_library( react_native_target("java/com/facebook/react/uimanager/annotations:annotations"), react_native_target("java/com/facebook/react/views/imagehelper:withmultisource"), ], + exported_deps = [ + ":imageevents", + ], ) diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/BUCK index 31b024ea9..310841c6d 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/BUCK @@ -18,9 +18,6 @@ rn_android_library( rn_android_library( name = "withmultisource", srcs = ["MultiSourceHelper.java"], - exported_deps = [ - ":imagehelper", - ], visibility = [ "PUBLIC", ], @@ -29,4 +26,7 @@ rn_android_library( react_native_dep("third-party/java/infer-annotations:infer-annotations"), react_native_dep("third-party/java/jsr-305:jsr-305"), ], + exported_deps = [ + ":imagehelper", + ], ) diff --git a/ReactAndroid/src/main/libraries/fbcore/src/main/java/com/facebook/common/logging/BUCK b/ReactAndroid/src/main/libraries/fbcore/src/main/java/com/facebook/common/logging/BUCK index 4f5bc6c89..98e1cdf54 100644 --- a/ReactAndroid/src/main/libraries/fbcore/src/main/java/com/facebook/common/logging/BUCK +++ b/ReactAndroid/src/main/libraries/fbcore/src/main/java/com/facebook/common/logging/BUCK @@ -2,8 +2,8 @@ load("//ReactNative:DEFS.bzl", "react_native_dep", "rn_android_library") rn_android_library( name = "logging", + visibility = ["//ReactAndroid/..."], exported_deps = [ react_native_dep("libraries/fresco/fresco-react-native:fbcore"), ], - visibility = ["//ReactAndroid/..."], ) diff --git a/ReactAndroid/src/main/libraries/fbcore/src/test/java/com/facebook/powermock/BUCK b/ReactAndroid/src/main/libraries/fbcore/src/test/java/com/facebook/powermock/BUCK index a34d1224a..c4360ce16 100644 --- a/ReactAndroid/src/main/libraries/fbcore/src/test/java/com/facebook/powermock/BUCK +++ b/ReactAndroid/src/main/libraries/fbcore/src/test/java/com/facebook/powermock/BUCK @@ -2,6 +2,7 @@ load("//ReactNative:DEFS.bzl", "rn_android_library", "rn_prebuilt_jar") rn_android_library( name = "powermock", + visibility = ["//ReactAndroid/..."], exported_deps = [ ":javassist", ":mockito-all", @@ -16,7 +17,6 @@ rn_android_library( ":xpp3", ":xstream", ], - visibility = ["//ReactAndroid/..."], ) rn_prebuilt_jar( diff --git a/ReactAndroid/src/main/libraries/fresco/fresco-react-native/BUCK b/ReactAndroid/src/main/libraries/fresco/fresco-react-native/BUCK index e4a46ecc3..db1216a0f 100644 --- a/ReactAndroid/src/main/libraries/fresco/fresco-react-native/BUCK +++ b/ReactAndroid/src/main/libraries/fresco/fresco-react-native/BUCK @@ -26,12 +26,12 @@ remote_file( rn_android_library( name = "imagepipeline", + visibility = ["//ReactAndroid/..."], exported_deps = [ ":bolts", ":imagepipeline-base", ":imagepipeline-core", ], - visibility = ["//ReactAndroid/..."], ) rn_android_prebuilt_aar( diff --git a/ReactAndroid/src/main/libraries/textlayoutbuilder/BUCK b/ReactAndroid/src/main/libraries/textlayoutbuilder/BUCK index 68ef47370..748dfff53 100644 --- a/ReactAndroid/src/main/libraries/textlayoutbuilder/BUCK +++ b/ReactAndroid/src/main/libraries/textlayoutbuilder/BUCK @@ -2,11 +2,11 @@ load("//ReactNative:DEFS.bzl", "rn_android_library", "rn_android_prebuilt_aar", rn_android_library( name = "textlayoutbuilder", + visibility = ["//ReactAndroid/..."], exported_deps = [ ":staticlayoutproxy", ":textlayoutbuilder-base", ], - visibility = ["//ReactAndroid/..."], ) rn_android_prebuilt_aar( diff --git a/ReactAndroid/src/main/third-party/android/support/v7/appcompat-orig/BUCK b/ReactAndroid/src/main/third-party/android/support/v7/appcompat-orig/BUCK index af13e77e1..98aed703d 100644 --- a/ReactAndroid/src/main/third-party/android/support/v7/appcompat-orig/BUCK +++ b/ReactAndroid/src/main/third-party/android/support/v7/appcompat-orig/BUCK @@ -11,15 +11,15 @@ load("//ReactNative:DEFS.bzl", "rn_android_library", "rn_android_resource", "rn_ rn_android_library( name = "appcompat", - exported_deps = [ - ":classes-for-react-native", - ], visibility = [ "PUBLIC", ], deps = [ ":res-for-appcompat", ], + exported_deps = [ + ":classes-for-react-native", + ], ) # still used by appcompat library internally, so we need both during the build diff --git a/ReactAndroid/src/main/third-party/java/asm/BUCK b/ReactAndroid/src/main/third-party/java/asm/BUCK index c88207bc2..856081a83 100644 --- a/ReactAndroid/src/main/third-party/java/asm/BUCK +++ b/ReactAndroid/src/main/third-party/java/asm/BUCK @@ -2,6 +2,7 @@ load("//ReactNative:DEFS.bzl", "rn_android_library", "rn_prebuilt_jar") rn_android_library( name = "asm", + visibility = ["//ReactAndroid/..."], exported_deps = [ ":asm-analysis", ":asm-commons", @@ -9,7 +10,6 @@ rn_android_library( ":asm-tree", ":asm-util", ], - visibility = ["//ReactAndroid/..."], ) rn_prebuilt_jar( diff --git a/ReactAndroid/src/main/third-party/java/fest/BUCK b/ReactAndroid/src/main/third-party/java/fest/BUCK index 6c87cbafd..576ff7edd 100644 --- a/ReactAndroid/src/main/third-party/java/fest/BUCK +++ b/ReactAndroid/src/main/third-party/java/fest/BUCK @@ -2,11 +2,11 @@ load("//ReactNative:DEFS.bzl", "rn_android_library", "rn_prebuilt_jar") rn_android_library( name = "fest", + visibility = ["//ReactAndroid/..."], exported_deps = [ ":fest-core", ":fest-util", ], - visibility = ["//ReactAndroid/..."], ) rn_prebuilt_jar( diff --git a/ReactAndroid/src/main/third-party/java/junit/BUCK b/ReactAndroid/src/main/third-party/java/junit/BUCK index 923f3b75f..fd5e5c1a3 100644 --- a/ReactAndroid/src/main/third-party/java/junit/BUCK +++ b/ReactAndroid/src/main/third-party/java/junit/BUCK @@ -2,11 +2,11 @@ load("//ReactNative:DEFS.bzl", "rn_android_library", "rn_prebuilt_jar") rn_android_library( name = "junit", + visibility = ["//ReactAndroid/..."], exported_deps = [ ":hamcrest", ":junit-core", ], - visibility = ["//ReactAndroid/..."], ) rn_prebuilt_jar( diff --git a/ReactAndroid/src/main/third-party/java/mockito/BUCK b/ReactAndroid/src/main/third-party/java/mockito/BUCK index 65627a724..70db14c6a 100644 --- a/ReactAndroid/src/main/third-party/java/mockito/BUCK +++ b/ReactAndroid/src/main/third-party/java/mockito/BUCK @@ -2,11 +2,11 @@ load("//ReactNative:DEFS.bzl", "rn_android_library", "rn_prebuilt_jar") rn_android_library( name = "mockito", + visibility = ["//ReactAndroid/..."], exported_deps = [ ":mockito-core", ":objenesis", ], - visibility = ["//ReactAndroid/..."], ) rn_prebuilt_jar( diff --git a/ReactAndroid/src/main/third-party/java/robolectric3/robolectric/BUCK b/ReactAndroid/src/main/third-party/java/robolectric3/robolectric/BUCK index d3338e4aa..87946208a 100644 --- a/ReactAndroid/src/main/third-party/java/robolectric3/robolectric/BUCK +++ b/ReactAndroid/src/main/third-party/java/robolectric3/robolectric/BUCK @@ -2,6 +2,7 @@ load("//ReactNative:DEFS.bzl", "react_native_dep", "rn_android_library", "rn_pre rn_android_library( name = "robolectric", + visibility = ["//ReactAndroid/..."], exported_deps = [ ":android-all-4.1.2_r1-robolectric-0", ":bouncycastle", @@ -17,7 +18,6 @@ rn_android_library( react_native_dep("third-party/java/asm:asm"), react_native_dep("third-party/java/sqlite:sqlite"), ], - visibility = ["//ReactAndroid/..."], ) rn_prebuilt_jar( diff --git a/ReactAndroid/src/main/third-party/java/sqlite/BUCK b/ReactAndroid/src/main/third-party/java/sqlite/BUCK index f78897151..419bc9ed4 100644 --- a/ReactAndroid/src/main/third-party/java/sqlite/BUCK +++ b/ReactAndroid/src/main/third-party/java/sqlite/BUCK @@ -2,10 +2,10 @@ load("//ReactNative:DEFS.bzl", "rn_android_library", "rn_prebuilt_jar") rn_android_library( name = "sqlite", + visibility = ["//ReactAndroid/..."], exported_deps = [ ":sqlite4java", ], - visibility = ["//ReactAndroid/..."], ) rn_prebuilt_jar( diff --git a/ReactAndroid/src/test/java/com/facebook/common/logging/BUCK b/ReactAndroid/src/test/java/com/facebook/common/logging/BUCK index bde102da9..4fd90a102 100644 --- a/ReactAndroid/src/test/java/com/facebook/common/logging/BUCK +++ b/ReactAndroid/src/test/java/com/facebook/common/logging/BUCK @@ -3,13 +3,13 @@ load("//ReactNative:DEFS.bzl", "react_native_dep", "rn_android_library") rn_android_library( name = "logging", srcs = glob(["**/*.java"]), - exported_deps = [ - react_native_dep("libraries/fbcore/src/main/java/com/facebook/common/logging:logging"), - ], visibility = [ "PUBLIC", ], deps = [ react_native_dep("third-party/java/jsr-305:jsr-305"), ], + exported_deps = [ + react_native_dep("libraries/fbcore/src/main/java/com/facebook/common/logging:logging"), + ], ) diff --git a/ReactCommon/jschelpers/BUCK b/ReactCommon/jschelpers/BUCK index 3a3bbc41d..9f3c82617 100644 --- a/ReactCommon/jschelpers/BUCK +++ b/ReactCommon/jschelpers/BUCK @@ -34,9 +34,6 @@ rn_xplat_cxx_library( "-fvisibility=hidden", "-std=c++1y", ], - exported_deps = [ - react_native_xplat_target("privatedata:privatedata"), - ], fbandroid_deps = ANDROID_JSC_INTERNAL_DEPS, fbobjc_deps = APPLE_JSC_INTERNAL_DEPS, force_static = True, @@ -49,6 +46,9 @@ rn_xplat_cxx_library( "xplat//third-party/glog:glog", react_native_xplat_target("privatedata:privatedata"), ], + exported_deps = [ + react_native_xplat_target("privatedata:privatedata"), + ], ) rn_xplat_cxx_library(