From 346ac75ed6c4026cc779e9082c1a87b4570ef273 Mon Sep 17 00:00:00 2001 From: Taras Tsugrii Date: Sat, 23 Jun 2018 18:23:21 -0700 Subject: [PATCH] Fix deprecated glob usage. Summary: https://our.intern.facebook.com/intern/wiki/Buck/python-to-skylark/ Differential Revision: D8595731 fbshipit-source-id: 0e3046a7fd2a25e9b13462713ae9a008ad546770 --- ReactAndroid/src/main/java/com/facebook/react/common/BUCK | 2 +- ReactAndroid/src/main/jni/first-party/fb/BUCK | 1 + ReactCommon/cxxreact/BUCK | 5 +++-- ReactCommon/fabric/activityindicator/BUCK | 1 + ReactCommon/fabric/attributedstring/BUCK | 5 +++-- ReactCommon/fabric/components/image/BUCK | 1 + ReactCommon/fabric/components/switch/BUCK | 1 + ReactCommon/fabric/core/BUCK | 5 +++-- ReactCommon/fabric/debug/BUCK | 5 +++-- ReactCommon/fabric/graphics/BUCK | 5 +++-- ReactCommon/fabric/imagemanager/BUCK | 1 + ReactCommon/fabric/scrollview/BUCK | 5 +++-- ReactCommon/fabric/text/BUCK | 5 +++-- ReactCommon/fabric/textlayoutmanager/BUCK | 5 +++-- ReactCommon/fabric/uimanager/BUCK | 5 +++-- ReactCommon/fabric/view/BUCK | 5 +++-- ReactCommon/jsinspector/BUCK | 3 ++- ReactCommon/privatedata/BUCK | 1 + 18 files changed, 39 insertions(+), 22 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/BUCK b/ReactAndroid/src/main/java/com/facebook/react/common/BUCK index 3cdee118d..829e10698 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/common/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/common/BUCK @@ -8,7 +8,7 @@ rn_android_library( name = "common", srcs = glob( ["**/*.java"], - excludes = SUB_PROJECTS, + exclude = SUB_PROJECTS, ), provided_deps = [ react_native_dep("third-party/android/support/v4:lib-support-v4"), diff --git a/ReactAndroid/src/main/jni/first-party/fb/BUCK b/ReactAndroid/src/main/jni/first-party/fb/BUCK index a63df0b4b..f5f74a41c 100644 --- a/ReactAndroid/src/main/jni/first-party/fb/BUCK +++ b/ReactAndroid/src/main/jni/first-party/fb/BUCK @@ -1,3 +1,4 @@ +load("@xplat//tools/build_defs:glob_defs.bzl", "subdir_glob") load("//ReactNative:DEFS.bzl", "IS_OSS_BUILD", "JNI_TARGET", "cxx_library") # This target is only used in open source diff --git a/ReactCommon/cxxreact/BUCK b/ReactCommon/cxxreact/BUCK index 12bd664f2..06bf8adbd 100644 --- a/ReactCommon/cxxreact/BUCK +++ b/ReactCommon/cxxreact/BUCK @@ -1,3 +1,4 @@ +load("@xplat//tools/build_defs:glob_defs.bzl", "subdir_glob") load("//ReactNative:DEFS.bzl", "ANDROID", "ANDROID_JSC_DEPS", "APPLE", "APPLE_JSC_DEPS", "IS_OSS_BUILD", "get_android_inspector_flags", "get_apple_inspector_flags", "react_native_xplat_target", "rn_xplat_cxx_library") CXX_LIBRARY_COMPILER_FLAGS = [ @@ -113,14 +114,14 @@ rn_xplat_cxx_library( name = "bridge", srcs = glob( ["*.cpp"], - excludes = [ + exclude = [ "JSBigString.cpp", "SampleCxxModule.cpp", ], ), headers = glob( ["*.h"], - excludes = CXXREACT_PUBLIC_HEADERS, + exclude = CXXREACT_PUBLIC_HEADERS, ), header_namespace = "", exported_headers = dict([ diff --git a/ReactCommon/fabric/activityindicator/BUCK b/ReactCommon/fabric/activityindicator/BUCK index 708c5fe41..952cb7977 100644 --- a/ReactCommon/fabric/activityindicator/BUCK +++ b/ReactCommon/fabric/activityindicator/BUCK @@ -1,3 +1,4 @@ +load("@xplat//tools/build_defs:glob_defs.bzl", "subdir_glob") load("//configurations/buck/apple:flag_defs.bzl", "OBJC_ARC_PREPROCESSOR_FLAGS", "get_application_ios_flags", "get_debug_preprocessor_flags") load("//ReactNative:DEFS.bzl", "ANDROID", "APPLE", "IS_OSS_BUILD", "get_apple_inspector_flags", "react_native_xplat_target", "rn_xplat_cxx_library") diff --git a/ReactCommon/fabric/attributedstring/BUCK b/ReactCommon/fabric/attributedstring/BUCK index 8f2c481cb..61b897ba9 100644 --- a/ReactCommon/fabric/attributedstring/BUCK +++ b/ReactCommon/fabric/attributedstring/BUCK @@ -1,3 +1,4 @@ +load("@xplat//tools/build_defs:glob_defs.bzl", "subdir_glob") load("//configurations/buck/apple:flag_defs.bzl", "OBJC_ARC_PREPROCESSOR_FLAGS", "get_application_ios_flags", "get_debug_preprocessor_flags") load("//ReactNative:DEFS.bzl", "ANDROID", "APPLE", "IS_OSS_BUILD", "get_apple_inspector_flags", "react_native_xplat_target", "rn_xplat_cxx_library") @@ -12,11 +13,11 @@ rn_xplat_cxx_library( name = "attributedstring", srcs = glob( ["**/*.cpp"], - excludes = glob(["tests/**/*.cpp"]), + exclude = glob(["tests/**/*.cpp"]), ), headers = glob( ["**/*.h"], - excludes = glob(["tests/**/*.h"]), + exclude = glob(["tests/**/*.h"]), ), header_namespace = "", exported_headers = subdir_glob( diff --git a/ReactCommon/fabric/components/image/BUCK b/ReactCommon/fabric/components/image/BUCK index 5cc0aed42..fccf34aeb 100644 --- a/ReactCommon/fabric/components/image/BUCK +++ b/ReactCommon/fabric/components/image/BUCK @@ -1,3 +1,4 @@ +load("@xplat//tools/build_defs:glob_defs.bzl", "subdir_glob") load("//configurations/buck/apple:flag_defs.bzl", "OBJC_ARC_PREPROCESSOR_FLAGS", "get_application_ios_flags", "get_debug_preprocessor_flags") load("//ReactNative:DEFS.bzl", "ANDROID", "APPLE", "IS_OSS_BUILD", "get_apple_inspector_flags", "react_native_xplat_target", "rn_xplat_cxx_library") diff --git a/ReactCommon/fabric/components/switch/BUCK b/ReactCommon/fabric/components/switch/BUCK index 8a4a27ff3..b2a4f8c1d 100644 --- a/ReactCommon/fabric/components/switch/BUCK +++ b/ReactCommon/fabric/components/switch/BUCK @@ -1,3 +1,4 @@ +load("@xplat//tools/build_defs:glob_defs.bzl", "subdir_glob") load("//configurations/buck/apple:flag_defs.bzl", "OBJC_ARC_PREPROCESSOR_FLAGS", "get_application_ios_flags", "get_debug_preprocessor_flags") load("//ReactNative:DEFS.bzl", "ANDROID", "APPLE", "IS_OSS_BUILD", "get_apple_inspector_flags", "react_native_xplat_target", "rn_xplat_cxx_library") diff --git a/ReactCommon/fabric/core/BUCK b/ReactCommon/fabric/core/BUCK index a444f0726..f663ff359 100644 --- a/ReactCommon/fabric/core/BUCK +++ b/ReactCommon/fabric/core/BUCK @@ -1,3 +1,4 @@ +load("@xplat//tools/build_defs:glob_defs.bzl", "subdir_glob") load("//configurations/buck/apple:flag_defs.bzl", "OBJC_ARC_PREPROCESSOR_FLAGS", "get_application_ios_flags", "get_debug_preprocessor_flags") load("//ReactNative:DEFS.bzl", "ANDROID", "APPLE", "IS_OSS_BUILD", "get_apple_inspector_flags", "react_native_xplat_target", "rn_xplat_cxx_library") @@ -12,11 +13,11 @@ rn_xplat_cxx_library( name = "core", srcs = glob( ["**/*.cpp"], - excludes = glob(["tests/**/*.cpp"]), + exclude = glob(["tests/**/*.cpp"]), ), headers = glob( ["**/*.h"], - excludes = glob(["tests/**/*.h"]), + exclude = glob(["tests/**/*.h"]), ), header_namespace = "", exported_headers = subdir_glob( diff --git a/ReactCommon/fabric/debug/BUCK b/ReactCommon/fabric/debug/BUCK index 8bdc3602d..c16bedf03 100644 --- a/ReactCommon/fabric/debug/BUCK +++ b/ReactCommon/fabric/debug/BUCK @@ -1,3 +1,4 @@ +load("@xplat//tools/build_defs:glob_defs.bzl", "subdir_glob") load("//configurations/buck/apple:flag_defs.bzl", "OBJC_ARC_PREPROCESSOR_FLAGS", "get_application_ios_flags", "get_debug_preprocessor_flags") load("//ReactNative:DEFS.bzl", "ANDROID", "APPLE", "IS_OSS_BUILD", "get_apple_inspector_flags", "react_native_xplat_target", "rn_xplat_cxx_library") @@ -12,11 +13,11 @@ rn_xplat_cxx_library( name = "debug", srcs = glob( ["**/*.cpp"], - excludes = glob(["tests/**/*.cpp"]), + exclude = glob(["tests/**/*.cpp"]), ), headers = glob( ["**/*.h"], - excludes = glob(["tests/**/*.h"]), + exclude = glob(["tests/**/*.h"]), ), header_namespace = "", exported_headers = subdir_glob( diff --git a/ReactCommon/fabric/graphics/BUCK b/ReactCommon/fabric/graphics/BUCK index ed4891382..e0b337da1 100644 --- a/ReactCommon/fabric/graphics/BUCK +++ b/ReactCommon/fabric/graphics/BUCK @@ -1,3 +1,4 @@ +load("@xplat//tools/build_defs:glob_defs.bzl", "subdir_glob") load("//configurations/buck/apple:flag_defs.bzl", "OBJC_ARC_PREPROCESSOR_FLAGS", "get_application_ios_flags", "get_debug_preprocessor_flags") load("//ReactNative:DEFS.bzl", "ANDROID", "APPLE", "IS_OSS_BUILD", "get_apple_inspector_flags", "react_native_xplat_target", "rn_xplat_cxx_library") @@ -12,11 +13,11 @@ rn_xplat_cxx_library( name = "graphics", srcs = glob( ["**/*.cpp"], - excludes = glob(["tests/**/*.cpp"]), + exclude = glob(["tests/**/*.cpp"]), ), headers = glob( ["**/*.h"], - excludes = glob(["tests/**/*.h"]), + exclude = glob(["tests/**/*.h"]), ), header_namespace = "", exported_headers = subdir_glob( diff --git a/ReactCommon/fabric/imagemanager/BUCK b/ReactCommon/fabric/imagemanager/BUCK index 0b83274c9..a42904ea4 100644 --- a/ReactCommon/fabric/imagemanager/BUCK +++ b/ReactCommon/fabric/imagemanager/BUCK @@ -1,3 +1,4 @@ +load("@xplat//tools/build_defs:glob_defs.bzl", "subdir_glob") load("//configurations/buck/apple:flag_defs.bzl", "OBJC_ARC_PREPROCESSOR_FLAGS", "get_application_ios_flags", "get_debug_preprocessor_flags") load("//ReactNative:DEFS.bzl", "ANDROID", "APPLE", "IS_OSS_BUILD", "get_apple_inspector_flags", "react_native_xplat_target", "rn_xplat_cxx_library") diff --git a/ReactCommon/fabric/scrollview/BUCK b/ReactCommon/fabric/scrollview/BUCK index ed66b7214..1f20c6553 100644 --- a/ReactCommon/fabric/scrollview/BUCK +++ b/ReactCommon/fabric/scrollview/BUCK @@ -1,3 +1,4 @@ +load("@xplat//tools/build_defs:glob_defs.bzl", "subdir_glob") load("//configurations/buck/apple:flag_defs.bzl", "OBJC_ARC_PREPROCESSOR_FLAGS", "get_application_ios_flags", "get_debug_preprocessor_flags") load("//ReactNative:DEFS.bzl", "ANDROID", "APPLE", "IS_OSS_BUILD", "get_apple_inspector_flags", "react_native_xplat_target", "rn_xplat_cxx_library") @@ -12,11 +13,11 @@ rn_xplat_cxx_library( name = "scrollview", srcs = glob( ["**/*.cpp"], - excludes = glob(["tests/**/*.cpp"]), + exclude = glob(["tests/**/*.cpp"]), ), headers = glob( ["**/*.h"], - excludes = glob(["tests/**/*.h"]), + exclude = glob(["tests/**/*.h"]), ), header_namespace = "", exported_headers = subdir_glob( diff --git a/ReactCommon/fabric/text/BUCK b/ReactCommon/fabric/text/BUCK index b6450f454..e8dc5e597 100644 --- a/ReactCommon/fabric/text/BUCK +++ b/ReactCommon/fabric/text/BUCK @@ -1,3 +1,4 @@ +load("@xplat//tools/build_defs:glob_defs.bzl", "subdir_glob") load("//configurations/buck/apple:flag_defs.bzl", "OBJC_ARC_PREPROCESSOR_FLAGS", "get_application_ios_flags", "get_debug_preprocessor_flags") load("//ReactNative:DEFS.bzl", "ANDROID", "APPLE", "IS_OSS_BUILD", "get_apple_inspector_flags", "react_native_xplat_target", "rn_xplat_cxx_library") @@ -12,11 +13,11 @@ rn_xplat_cxx_library( name = "text", srcs = glob( ["**/*.cpp"], - excludes = glob(["tests/**/*.cpp"]), + exclude = glob(["tests/**/*.cpp"]), ), headers = glob( ["**/*.h"], - excludes = glob(["tests/**/*.h"]), + exclude = glob(["tests/**/*.h"]), ), header_namespace = "", exported_headers = subdir_glob( diff --git a/ReactCommon/fabric/textlayoutmanager/BUCK b/ReactCommon/fabric/textlayoutmanager/BUCK index 26f57ef0e..0095affa7 100644 --- a/ReactCommon/fabric/textlayoutmanager/BUCK +++ b/ReactCommon/fabric/textlayoutmanager/BUCK @@ -1,3 +1,4 @@ +load("@xplat//tools/build_defs:glob_defs.bzl", "subdir_glob") load("//configurations/buck/apple:flag_defs.bzl", "OBJC_ARC_PREPROCESSOR_FLAGS", "get_application_ios_flags", "get_debug_preprocessor_flags") load("//ReactNative:DEFS.bzl", "ANDROID", "APPLE", "IS_OSS_BUILD", "get_apple_inspector_flags", "react_native_xplat_target", "rn_xplat_cxx_library") @@ -15,11 +16,11 @@ rn_xplat_cxx_library( "**/*.cpp", "**/*.mm", ], - excludes = glob(["tests/**/*.cpp"]), + exclude = glob(["tests/**/*.cpp"]), ), headers = glob( ["**/*.h"], - excludes = glob(["tests/**/*.h"]), + exclude = glob(["tests/**/*.h"]), ), header_namespace = "", exported_headers = subdir_glob( diff --git a/ReactCommon/fabric/uimanager/BUCK b/ReactCommon/fabric/uimanager/BUCK index 2bd489781..1b091a563 100644 --- a/ReactCommon/fabric/uimanager/BUCK +++ b/ReactCommon/fabric/uimanager/BUCK @@ -1,3 +1,4 @@ +load("@xplat//tools/build_defs:glob_defs.bzl", "subdir_glob") load("//configurations/buck/apple:flag_defs.bzl", "get_debug_preprocessor_flags") load("//ReactNative:DEFS.bzl", "ANDROID", "APPLE", "IS_OSS_BUILD", "get_apple_inspector_flags", "react_native_xplat_target", "rn_xplat_cxx_library") @@ -12,11 +13,11 @@ rn_xplat_cxx_library( name = "uimanager", srcs = glob( ["**/*.cpp"], - excludes = glob(["tests/**/*.cpp"]), + exclude = glob(["tests/**/*.cpp"]), ), headers = glob( ["**/*.h"], - excludes = glob(["tests/**/*.h"]), + exclude = glob(["tests/**/*.h"]), ), header_namespace = "", exported_headers = subdir_glob( diff --git a/ReactCommon/fabric/view/BUCK b/ReactCommon/fabric/view/BUCK index a64180544..42ea4a7a5 100644 --- a/ReactCommon/fabric/view/BUCK +++ b/ReactCommon/fabric/view/BUCK @@ -1,3 +1,4 @@ +load("@xplat//tools/build_defs:glob_defs.bzl", "subdir_glob") load("//configurations/buck/apple:flag_defs.bzl", "OBJC_ARC_PREPROCESSOR_FLAGS", "get_application_ios_flags", "get_debug_preprocessor_flags") load("//ReactNative:DEFS.bzl", "ANDROID", "APPLE", "IS_OSS_BUILD", "get_apple_inspector_flags", "react_native_xplat_target", "rn_xplat_cxx_library") @@ -12,11 +13,11 @@ rn_xplat_cxx_library( name = "view", srcs = glob( ["**/*.cpp"], - excludes = glob(["tests/**/*.cpp"]), + exclude = glob(["tests/**/*.cpp"]), ), headers = glob( ["**/*.h"], - excludes = glob(["tests/**/*.h"]), + exclude = glob(["tests/**/*.h"]), ), header_namespace = "", exported_headers = subdir_glob( diff --git a/ReactCommon/jsinspector/BUCK b/ReactCommon/jsinspector/BUCK index f50840b71..ceb0293f7 100644 --- a/ReactCommon/jsinspector/BUCK +++ b/ReactCommon/jsinspector/BUCK @@ -1,3 +1,4 @@ +load("@xplat//tools/build_defs:glob_defs.bzl", "subdir_glob") load("//ReactNative:DEFS.bzl", "rn_xplat_cxx_library") EXPORTED_HEADERS = [ @@ -13,7 +14,7 @@ rn_xplat_cxx_library( [ ("", "*.h"), ], - excludes = EXPORTED_HEADERS, + exclude = EXPORTED_HEADERS, prefix = "jsinspector", ), header_namespace = "", diff --git a/ReactCommon/privatedata/BUCK b/ReactCommon/privatedata/BUCK index 79983f49d..abd0de4d4 100644 --- a/ReactCommon/privatedata/BUCK +++ b/ReactCommon/privatedata/BUCK @@ -1,3 +1,4 @@ +load("@xplat//tools/build_defs:glob_defs.bzl", "subdir_glob") load("//ReactNative:DEFS.bzl", "rn_xplat_cxx_library") rn_xplat_cxx_library(