diff --git a/BUCK b/BUCK index d860f24002a..ba4cfef87ee 100644 --- a/BUCK +++ b/BUCK @@ -110,7 +110,6 @@ rn_xplat_cxx_library2( ":RCTCxxUtils", ":ReactInternal", "//fbobjc/Libraries/FBReactKit:RCTFBSystrace", - "//xplat/folly:molly", react_native_root_target("React/CoreModules:CoreModules"), react_native_xplat_target("cxxreact:bridge"), react_native_xplat_target("cxxreact:jsbigstring"), @@ -164,7 +163,6 @@ rn_xplat_cxx_library2( ":RCTCxxUtils", ":ReactInternal", "//xplat/fbsystrace:fbsystrace", - "//xplat/folly:headers_only_do_not_use", react_native_xplat_target("cxxreact:module"), react_native_xplat_target("cxxreact:bridge"), react_native_xplat_target("reactperflogger:reactperflogger"), @@ -201,7 +199,7 @@ rn_xplat_cxx_library2( preprocessor_flags = get_objc_arc_preprocessor_flags() + get_preprocessor_flags_for_build_mode(), visibility = ["PUBLIC"], deps = [ - "//xplat/folly:molly", + "//xplat/folly:dynamic", ], ) diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/BUCK b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/BUCK index 613a7bc8711..fd6e10a5447 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/BUCK @@ -36,7 +36,6 @@ rn_xplat_cxx_library( react_native_xplat_target("runtimeexecutor:runtimeexecutor"), react_native_target("jni/react/jni:jni"), "//xplat/fbsystrace:fbsystrace", - "//xplat/folly:molly", "//xplat/jsi:JSIDynamic", "//xplat/jsi:jsi", "//xplat/third-party/linker_lib:atomic", diff --git a/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/BUCK b/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/BUCK index 45d863567cd..a6ec7615d8f 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/BUCK @@ -33,7 +33,6 @@ rn_xplat_cxx_library( react_native_target("java/com/facebook/react/jscexecutor:jscexecutor"), ], deps = [ - "//xplat/folly:molly", FBJNI_TARGET, react_native_target("jni/react/jni:jni"), react_native_xplat_target("jsi:JSCRuntime"), diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/BUCK b/ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/BUCK index e510e432322..08952ef6d11 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/BUCK @@ -29,7 +29,6 @@ rn_xplat_cxx_library( react_native_xplat_target("react/renderer/componentregistry/native:native"), react_native_target("jni/react/jni:jni"), "//xplat/fbsystrace:fbsystrace", - "//xplat/folly:molly", "//xplat/jsi:JSIDynamic", "//xplat/jsi:jsi", "//xplat/third-party/linker_lib:atomic", diff --git a/ReactAndroid/src/main/jni/react/jni/BUCK b/ReactAndroid/src/main/jni/react/jni/BUCK index 787eb0f14bd..d73153a9a61 100644 --- a/ReactAndroid/src/main/jni/react/jni/BUCK +++ b/ReactAndroid/src/main/jni/react/jni/BUCK @@ -58,7 +58,8 @@ rn_xplat_cxx_library( "//xplat/third-party/linker_lib:android", "//xplat/third-party/linker_lib:atomic", "//third-party/glog:glog", - "//xplat/folly:molly", + "//xplat/folly:dynamic", + "//xplat/folly:json", "//fbandroid/xplat/fbgloginit:fbgloginit", "//xplat/fbsystrace:fbsystrace", react_native_target("java/com/facebook/react/turbomodule/core/jni:callinvokerholder"), diff --git a/ReactAndroid/src/main/jni/react/perftests/BUCK b/ReactAndroid/src/main/jni/react/perftests/BUCK index 3675a6157b2..423628782b8 100644 --- a/ReactAndroid/src/main/jni/react/perftests/BUCK +++ b/ReactAndroid/src/main/jni/react/perftests/BUCK @@ -11,7 +11,6 @@ rn_xplat_cxx_library( deps = [ "//fbandroid/native:base", "//fbandroid/native/fb:fb", - "//xplat/folly:molly", react_native_xplat_target("cxxreact:module"), ], ) diff --git a/ReactCommon/butter/BUCK b/ReactCommon/butter/BUCK index 4f8b5690b9a..c0f182b361b 100644 --- a/ReactCommon/butter/BUCK +++ b/ReactCommon/butter/BUCK @@ -48,8 +48,9 @@ rn_xplat_cxx_library( deps = [ "//third-party/glog:glog", "//xplat/fbsystrace:fbsystrace", - "//xplat/folly:headers_only_do_not_use", + "//xplat/folly:container_f14_hash", "//xplat/folly:memory", - "//xplat/folly:molly", + "//xplat/folly:shared_mutex", + "//xplat/folly:small_vector", ], ) diff --git a/ReactCommon/cxxreact/BUCK b/ReactCommon/cxxreact/BUCK index 933d91b45c8..687e3bbbeb6 100644 --- a/ReactCommon/cxxreact/BUCK +++ b/ReactCommon/cxxreact/BUCK @@ -23,7 +23,7 @@ rn_xplat_cxx_library( "PUBLIC", ], deps = [ - "//xplat/folly:molly", + "//xplat/folly:dynamic", ], ) @@ -48,8 +48,13 @@ rn_xplat_cxx_library( "PUBLIC", ], deps = [ + "//third-party/glog:glog", + "//xplat/folly:exception", "//xplat/folly:memory", - "//xplat/folly:molly", + "//xplat/folly:portability_fcntl", + "//xplat/folly:portability_sys_mman", + "//xplat/folly:portability_sys_stat", + "//xplat/folly:portability_unistd", "//xplat/folly:scope_guard", ], ) @@ -76,7 +81,6 @@ rn_xplat_cxx_library( ":module", "//third-party/glog:glog", "//xplat/folly:memory", - "//xplat/folly:molly", ], ) @@ -143,17 +147,19 @@ rn_xplat_cxx_library( deps = [ ":jsbigstring", ":module", + "//third-party/glog:glog", "//xplat/fbsystrace:fbsystrace", - "//xplat/folly:headers_only_do_not_use", + "//xplat/folly:conv", + "//xplat/folly:dynamic", + "//xplat/folly:json", "//xplat/folly:memory", - "//xplat/folly:molly", + "//xplat/folly:move_wrapper", + "//xplat/folly:optional", "//xplat/jsi:jsi", react_native_xplat_target("callinvoker:callinvoker"), react_native_xplat_target("jsinspector:jsinspector"), react_native_xplat_target("runtimeexecutor:runtimeexecutor"), react_native_xplat_target("reactperflogger:reactperflogger"), react_native_xplat_target("logger:logger"), - "//third-party/glog:glog", - "//xplat/folly:optional", ], ) diff --git a/ReactCommon/jsi/BUCK b/ReactCommon/jsi/BUCK index 2b4ee4c4293..6b5f0c4c310 100644 --- a/ReactCommon/jsi/BUCK +++ b/ReactCommon/jsi/BUCK @@ -55,7 +55,6 @@ rn_xplat_cxx_library( ], xcode_public_headers_symlinks = True, deps = [ - "//xplat/folly:molly", react_native_xplat_dep("jsi:jsi"), ], ) diff --git a/ReactCommon/jsiexecutor/BUCK b/ReactCommon/jsiexecutor/BUCK index 24cbabd821f..e1f62430efd 100644 --- a/ReactCommon/jsiexecutor/BUCK +++ b/ReactCommon/jsiexecutor/BUCK @@ -17,7 +17,7 @@ cxx_library( ], fbandroid_deps = [ "//third-party/glog:glog", - "//xplat/folly:molly", + "//xplat/folly:json", "//xplat/third-party/linker_lib:atomic", ], fbobjc_force_static = True, diff --git a/ReactCommon/react/bridging/BUCK b/ReactCommon/react/bridging/BUCK index 52a1eb1e5f0..1e90d391355 100644 --- a/ReactCommon/react/bridging/BUCK +++ b/ReactCommon/react/bridging/BUCK @@ -16,7 +16,6 @@ rn_xplat_cxx_library( tests = [":tests"], visibility = ["PUBLIC"], deps = [ - "//xplat/folly:headers_only_do_not_use", ], exported_deps = [ react_native_xplat_target("butter:butter"), diff --git a/ReactCommon/react/config/BUCK b/ReactCommon/react/config/BUCK index cf77bda2070..793101fc891 100644 --- a/ReactCommon/react/config/BUCK +++ b/ReactCommon/react/config/BUCK @@ -39,8 +39,6 @@ rn_xplat_cxx_library( deps = [ "//third-party/glog:glog", "//xplat/fbsystrace:fbsystrace", - "//xplat/folly:headers_only_do_not_use", "//xplat/folly:memory", - "//xplat/folly:molly", ], ) diff --git a/ReactCommon/react/debug/BUCK b/ReactCommon/react/debug/BUCK index b3784149348..5df49752653 100644 --- a/ReactCommon/react/debug/BUCK +++ b/ReactCommon/react/debug/BUCK @@ -57,9 +57,8 @@ rn_xplat_cxx_library( visibility = ["PUBLIC"], deps = [ "//xplat/fbsystrace:fbsystrace", - "//xplat/folly:headers_only_do_not_use", - "//xplat/folly:memory", - "//xplat/folly:molly", + "//xplat/folly:conv", + "//xplat/folly:format", ], exported_deps = [ "//third-party/glog:glog", diff --git a/ReactCommon/react/nativemodule/core/BUCK b/ReactCommon/react/nativemodule/core/BUCK index 99fa52fe49b..55dcb78d3f2 100644 --- a/ReactCommon/react/nativemodule/core/BUCK +++ b/ReactCommon/react/nativemodule/core/BUCK @@ -71,9 +71,7 @@ rn_xplat_cxx_library( deps = [ "//third-party/glog:glog", "//xplat/fbsystrace:fbsystrace", - "//xplat/folly:headers_only_do_not_use", "//xplat/folly:memory", - "//xplat/folly:molly", "//xplat/jsi:JSIDynamic", react_native_xplat_target("cxxreact:bridge"), react_native_xplat_target("cxxreact:module"), diff --git a/ReactCommon/react/renderer/animations/BUCK b/ReactCommon/react/renderer/animations/BUCK index 034f7aaaf8f..b9459f29704 100644 --- a/ReactCommon/react/renderer/animations/BUCK +++ b/ReactCommon/react/renderer/animations/BUCK @@ -53,10 +53,6 @@ rn_xplat_cxx_library( deps = [ "//third-party/glog:glog", "//xplat/fbsystrace:fbsystrace", - "//xplat/folly:headers_only_do_not_use", - "//xplat/folly:memory", - "//xplat/folly:molly", - "//xplat/jsi:JSIDynamic", "//xplat/jsi:jsi", react_native_xplat_target("react/config:config"), react_native_xplat_target("react/debug:debug"), @@ -85,7 +81,6 @@ fb_xplat_cxx_test( platforms = (ANDROID, APPLE, CXX), deps = [ ":animations", - "//xplat/folly:molly", "//xplat/third-party/gmock:gtest", react_native_xplat_target("react/config:config"), react_native_xplat_target("react/renderer/components/image:image"), diff --git a/ReactCommon/react/renderer/attributedstring/BUCK b/ReactCommon/react/renderer/attributedstring/BUCK index d1a324573d5..15fddaddcd3 100644 --- a/ReactCommon/react/renderer/attributedstring/BUCK +++ b/ReactCommon/react/renderer/attributedstring/BUCK @@ -53,9 +53,8 @@ rn_xplat_cxx_library( deps = [ "//third-party/glog:glog", "//xplat/fbsystrace:fbsystrace", - "//xplat/folly:headers_only_do_not_use", - "//xplat/folly:memory", - "//xplat/folly:molly", + "//xplat/folly:conv", + "//xplat/folly:hash", react_native_xplat_target("react/debug:debug"), react_native_xplat_target("react/renderer/debug:debug"), react_native_xplat_target("react/renderer/core:core"), @@ -80,7 +79,6 @@ fb_xplat_cxx_test( platforms = (ANDROID, APPLE, CXX), deps = [ ":attributedstring", - "//xplat/folly:molly", "//xplat/third-party/gmock:gtest", ], ) diff --git a/ReactCommon/react/renderer/componentregistry/BUCK b/ReactCommon/react/renderer/componentregistry/BUCK index afc4c72698e..2aac583353c 100644 --- a/ReactCommon/react/renderer/componentregistry/BUCK +++ b/ReactCommon/react/renderer/componentregistry/BUCK @@ -46,13 +46,6 @@ rn_xplat_cxx_library( ], visibility = ["PUBLIC"], deps = [ - "//third-party/glog:glog", - "//xplat/fbsystrace:fbsystrace", - "//xplat/folly:headers_only_do_not_use", - "//xplat/folly:memory", - "//xplat/folly:molly", - "//xplat/jsi:JSIDynamic", - "//xplat/jsi:jsi", react_native_xplat_target("react/debug:debug"), react_native_xplat_target("react/renderer/core:core"), react_native_xplat_target("react/renderer/debug:debug"), diff --git a/ReactCommon/react/renderer/componentregistry/native/BUCK b/ReactCommon/react/renderer/componentregistry/native/BUCK index c0c3200ca14..bcab76c1d3d 100644 --- a/ReactCommon/react/renderer/componentregistry/native/BUCK +++ b/ReactCommon/react/renderer/componentregistry/native/BUCK @@ -45,12 +45,6 @@ rn_xplat_cxx_library( ], visibility = ["PUBLIC"], deps = [ - "//third-party/glog:glog", - "//xplat/fbsystrace:fbsystrace", - "//xplat/folly:headers_only_do_not_use", - "//xplat/folly:memory", - "//xplat/folly:molly", - "//xplat/jsi:JSIDynamic", "//xplat/jsi:jsi", ], ) diff --git a/ReactCommon/react/renderer/components/image/BUCK b/ReactCommon/react/renderer/components/image/BUCK index b793dc52158..19fbf631c3c 100644 --- a/ReactCommon/react/renderer/components/image/BUCK +++ b/ReactCommon/react/renderer/components/image/BUCK @@ -48,8 +48,6 @@ rn_xplat_cxx_library( tests = [":tests"], visibility = ["PUBLIC"], deps = [ - "//xplat/folly:headers_only_do_not_use", - "//xplat/folly:molly", YOGA_CXX_TARGET, react_native_xplat_target("react/debug:debug"), react_native_xplat_target("react/renderer/debug:debug"), @@ -74,7 +72,6 @@ fb_xplat_cxx_test( platforms = (ANDROID, APPLE, CXX), deps = [ ":image", - "//xplat/folly:molly", "//xplat/third-party/gmock:gtest", ], ) diff --git a/ReactCommon/react/renderer/components/legacyviewmanagerinterop/BUCK b/ReactCommon/react/renderer/components/legacyviewmanagerinterop/BUCK index 86ed7869866..a7429935a62 100644 --- a/ReactCommon/react/renderer/components/legacyviewmanagerinterop/BUCK +++ b/ReactCommon/react/renderer/components/legacyviewmanagerinterop/BUCK @@ -42,8 +42,8 @@ rn_xplat_cxx_library( ], visibility = ["PUBLIC"], deps = [ - "//xplat/folly:headers_only_do_not_use", - "//xplat/folly:memory", + "//xplat/folly:dynamic", + "//xplat/folly:json", react_native_xplat_target("react/renderer/core:core"), react_native_xplat_target("react/renderer/components/view:view"), "//xplat/js/react-native-github:generated_components-rncore", diff --git a/ReactCommon/react/renderer/components/modal/BUCK b/ReactCommon/react/renderer/components/modal/BUCK index 685739886b6..f1b534be380 100644 --- a/ReactCommon/react/renderer/components/modal/BUCK +++ b/ReactCommon/react/renderer/components/modal/BUCK @@ -33,6 +33,7 @@ rn_xplat_cxx_library( ), compiler_flags_pedantic = True, fbandroid_deps = [ + "//xplat/folly:dynamic", react_native_xplat_target("react/renderer/mapbuffer:mapbuffer"), ], fbandroid_exported_headers = subdir_glob( @@ -72,9 +73,6 @@ rn_xplat_cxx_library( deps = [ "//third-party/glog:glog", "//xplat/fbsystrace:fbsystrace", - "//xplat/folly:headers_only_do_not_use", - "//xplat/folly:memory", - "//xplat/folly:molly", YOGA_CXX_TARGET, react_native_xplat_target("react/debug:debug"), react_native_xplat_target("react/renderer/debug:debug"), diff --git a/ReactCommon/react/renderer/components/progressbar/BUCK b/ReactCommon/react/renderer/components/progressbar/BUCK index 8f13f5cbef9..1e6cb368859 100644 --- a/ReactCommon/react/renderer/components/progressbar/BUCK +++ b/ReactCommon/react/renderer/components/progressbar/BUCK @@ -35,6 +35,7 @@ rn_xplat_cxx_library( compiler_flags_pedantic = True, cxx_tests = [":tests"], fbandroid_deps = [ + "//xplat/folly:dynamic", react_native_target("jni/react/jni:jni"), ], fbandroid_exported_headers = subdir_glob( @@ -79,9 +80,6 @@ rn_xplat_cxx_library( deps = [ "//third-party/glog:glog", "//xplat/fbsystrace:fbsystrace", - "//xplat/folly:headers_only_do_not_use", - "//xplat/folly:memory", - "//xplat/folly:molly", YOGA_CXX_TARGET, react_native_xplat_target("react/debug:debug"), react_native_xplat_target("react/renderer/debug:debug"), @@ -114,7 +112,6 @@ fb_xplat_cxx_test( CXX, ), deps = [ - "//xplat/folly:molly", "//xplat/third-party/gmock:gtest", ], ) diff --git a/ReactCommon/react/renderer/components/root/BUCK b/ReactCommon/react/renderer/components/root/BUCK index 9b8050c8af2..f2ff0e48cca 100644 --- a/ReactCommon/react/renderer/components/root/BUCK +++ b/ReactCommon/react/renderer/components/root/BUCK @@ -47,9 +47,6 @@ rn_xplat_cxx_library( deps = [ "//third-party/glog:glog", "//xplat/fbsystrace:fbsystrace", - "//xplat/folly:headers_only_do_not_use", - "//xplat/folly:memory", - "//xplat/folly:molly", YOGA_CXX_TARGET, react_native_xplat_target("react/renderer/debug:debug"), react_native_xplat_target("react/renderer/core:core"), @@ -72,7 +69,6 @@ fb_xplat_cxx_test( platforms = (ANDROID, APPLE, CXX), deps = [ ":root", - "//xplat/folly:molly", "//xplat/third-party/gmock:gtest", react_native_xplat_target("react/renderer/element:element"), ], diff --git a/ReactCommon/react/renderer/components/scrollview/BUCK b/ReactCommon/react/renderer/components/scrollview/BUCK index ab49fcc7ea6..aa730555ca5 100644 --- a/ReactCommon/react/renderer/components/scrollview/BUCK +++ b/ReactCommon/react/renderer/components/scrollview/BUCK @@ -54,9 +54,7 @@ rn_xplat_cxx_library( deps = [ "//third-party/glog:glog", "//xplat/fbsystrace:fbsystrace", - "//xplat/folly:headers_only_do_not_use", - "//xplat/folly:memory", - "//xplat/folly:molly", + "//xplat/folly:dynamic", YOGA_CXX_TARGET, react_native_xplat_target("react/renderer/debug:debug"), react_native_xplat_target("react/renderer/core:core"), @@ -79,7 +77,6 @@ fb_xplat_cxx_test( platforms = (ANDROID, APPLE, CXX), deps = [ ":scrollview", - "//xplat/folly:molly", "//xplat/third-party/gmock:gtest", ], ) diff --git a/ReactCommon/react/renderer/components/slider/BUCK b/ReactCommon/react/renderer/components/slider/BUCK index bfbdb595fa5..ed7a9a8b58a 100644 --- a/ReactCommon/react/renderer/components/slider/BUCK +++ b/ReactCommon/react/renderer/components/slider/BUCK @@ -36,6 +36,7 @@ rn_xplat_cxx_library( compiler_flags_pedantic = True, cxx_tests = [":tests"], fbandroid_deps = [ + "//xplat/folly:dynamic", react_native_target("jni/react/jni:jni"), react_native_xplat_target("react/renderer/mapbuffer:mapbuffer"), ], @@ -79,8 +80,6 @@ rn_xplat_cxx_library( ], visibility = ["PUBLIC"], deps = [ - "//xplat/folly:headers_only_do_not_use", - "//xplat/folly:molly", YOGA_CXX_TARGET, react_native_xplat_target("react/debug:debug"), react_native_xplat_target("react/renderer/debug:debug"), @@ -114,7 +113,6 @@ fb_xplat_cxx_test( ), deps = [ ":slider", - "//xplat/folly:molly", "//xplat/third-party/gmock:gtest", ], ) diff --git a/ReactCommon/react/renderer/components/switch/BUCK b/ReactCommon/react/renderer/components/switch/BUCK index 1ee6c08ea49..bbf91df6eb1 100644 --- a/ReactCommon/react/renderer/components/switch/BUCK +++ b/ReactCommon/react/renderer/components/switch/BUCK @@ -3,7 +3,6 @@ load( "ANDROID", "APPLE", "CXX", - "YOGA_CXX_TARGET", "fb_xplat_cxx_test", "get_apple_compiler_flags", "get_apple_inspector_flags", @@ -53,12 +52,6 @@ rn_xplat_cxx_library( ], visibility = ["PUBLIC"], deps = [ - "//third-party/glog:glog", - "//xplat/fbsystrace:fbsystrace", - "//xplat/folly:headers_only_do_not_use", - "//xplat/folly:memory", - "//xplat/folly:molly", - YOGA_CXX_TARGET, react_native_xplat_target("react/renderer/debug:debug"), react_native_xplat_target("react/renderer/core:core"), react_native_xplat_target("react/renderer/graphics:graphics"), @@ -90,7 +83,6 @@ fb_xplat_cxx_test( ), deps = [ ":androidswitch", - "//xplat/folly:molly", "//xplat/third-party/gmock:gtest", ], ) diff --git a/ReactCommon/react/renderer/components/text/BUCK b/ReactCommon/react/renderer/components/text/BUCK index c21bba01bf7..ac941f7f25f 100644 --- a/ReactCommon/react/renderer/components/text/BUCK +++ b/ReactCommon/react/renderer/components/text/BUCK @@ -57,10 +57,6 @@ rn_xplat_cxx_library( deps = [ "//third-party/glog:glog", "//xplat/fbsystrace:fbsystrace", - "//xplat/folly:container_evicting_cache_map", - "//xplat/folly:headers_only_do_not_use", - "//xplat/folly:memory", - "//xplat/folly:molly", YOGA_CXX_TARGET, react_native_xplat_target("react/debug:debug"), react_native_xplat_target("react/renderer/attributedstring:attributedstring"), @@ -98,7 +94,6 @@ fb_xplat_cxx_test( ), deps = [ ":text", - "//xplat/folly:molly", "//xplat/third-party/gmock:gtest", react_native_xplat_target("react/debug:debug"), ], diff --git a/ReactCommon/react/renderer/components/textinput/BUCK b/ReactCommon/react/renderer/components/textinput/BUCK index 0205d2c81f1..0587dff66fb 100644 --- a/ReactCommon/react/renderer/components/textinput/BUCK +++ b/ReactCommon/react/renderer/components/textinput/BUCK @@ -54,10 +54,7 @@ rn_xplat_cxx_library( deps = [ "//third-party/glog:glog", "//xplat/fbsystrace:fbsystrace", - "//xplat/folly:container_evicting_cache_map", - "//xplat/folly:headers_only_do_not_use", - "//xplat/folly:memory", - "//xplat/folly:molly", + "//xplat/folly:dynamic", YOGA_CXX_TARGET, react_native_xplat_target("react/debug:debug"), react_native_xplat_target("react/renderer/attributedstring:attributedstring"), @@ -96,7 +93,6 @@ fb_xplat_cxx_test( ), deps = [ ":androidtextinput", - "//xplat/folly:molly", "//xplat/third-party/gmock:gtest", ], ) diff --git a/ReactCommon/react/renderer/components/textinput/iostextinput/BUCK b/ReactCommon/react/renderer/components/textinput/iostextinput/BUCK index ecd9ecc205f..9d426680408 100644 --- a/ReactCommon/react/renderer/components/textinput/iostextinput/BUCK +++ b/ReactCommon/react/renderer/components/textinput/iostextinput/BUCK @@ -3,7 +3,6 @@ load( "ANDROID", "APPLE", "CXX", - "YOGA_CXX_TARGET", "fb_xplat_cxx_test", "get_apple_compiler_flags", "get_apple_inspector_flags", @@ -35,6 +34,9 @@ rn_xplat_cxx_library( ), compiler_flags_pedantic = True, cxx_tests = [":tests"], + fbandroid_deps = [ + "//xplat/folly:dynamic", + ], fbobjc_compiler_flags = APPLE_COMPILER_FLAGS, fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(), force_static = True, @@ -49,13 +51,6 @@ rn_xplat_cxx_library( ], visibility = ["PUBLIC"], deps = [ - "//third-party/glog:glog", - "//xplat/fbsystrace:fbsystrace", - "//xplat/folly:container_evicting_cache_map", - "//xplat/folly:headers_only_do_not_use", - "//xplat/folly:memory", - "//xplat/folly:molly", - YOGA_CXX_TARGET, react_native_xplat_target("react/debug:debug"), react_native_xplat_target("react/renderer/attributedstring:attributedstring"), react_native_xplat_target("react/renderer/core:core"), @@ -93,7 +88,6 @@ fb_xplat_cxx_test( ), deps = [ ":iostextinput", - "//xplat/folly:molly", "//xplat/third-party/gmock:gtest", ], ) diff --git a/ReactCommon/react/renderer/components/unimplementedview/BUCK b/ReactCommon/react/renderer/components/unimplementedview/BUCK index 6ae78ce5c8d..1d43ff21897 100644 --- a/ReactCommon/react/renderer/components/unimplementedview/BUCK +++ b/ReactCommon/react/renderer/components/unimplementedview/BUCK @@ -3,7 +3,6 @@ load( "ANDROID", "APPLE", "CXX", - "YOGA_CXX_TARGET", "fb_xplat_cxx_test", "get_apple_compiler_flags", "get_apple_inspector_flags", @@ -45,12 +44,6 @@ rn_xplat_cxx_library( tests = [":tests"], visibility = ["PUBLIC"], deps = [ - "//third-party/glog:glog", - "//xplat/fbsystrace:fbsystrace", - "//xplat/folly:headers_only_do_not_use", - "//xplat/folly:memory", - "//xplat/folly:molly", - YOGA_CXX_TARGET, react_native_xplat_target("react/debug:debug"), react_native_xplat_target("react/renderer/debug:debug"), react_native_xplat_target("react/renderer/core:core"), @@ -72,7 +65,6 @@ fb_xplat_cxx_test( platforms = (ANDROID, APPLE, CXX), deps = [ ":unimplementedview", - "//xplat/folly:molly", "//xplat/third-party/gmock:gtest", ], ) diff --git a/ReactCommon/react/renderer/components/view/BUCK b/ReactCommon/react/renderer/components/view/BUCK index 3ed2447e3df..7aa614035ce 100644 --- a/ReactCommon/react/renderer/components/view/BUCK +++ b/ReactCommon/react/renderer/components/view/BUCK @@ -54,9 +54,8 @@ rn_xplat_cxx_library( deps = [ "//third-party/glog:glog", "//xplat/fbsystrace:fbsystrace", - "//xplat/folly:headers_only_do_not_use", - "//xplat/folly:memory", - "//xplat/folly:molly", + "//xplat/folly:conv", + "//xplat/folly:dynamic", YOGA_CXX_TARGET, react_native_xplat_target("react/debug:debug"), react_native_xplat_target("react/renderer/core:core"), diff --git a/ReactCommon/react/renderer/core/BUCK b/ReactCommon/react/renderer/core/BUCK index 01fbf2aab9b..f78c2973e11 100644 --- a/ReactCommon/react/renderer/core/BUCK +++ b/ReactCommon/react/renderer/core/BUCK @@ -51,9 +51,9 @@ rn_xplat_cxx_library( deps = [ "//third-party/glog:glog", "//xplat/fbsystrace:fbsystrace", - "//xplat/folly:headers_only_do_not_use", - "//xplat/folly:memory", - "//xplat/folly:molly", + "//xplat/folly:dynamic", + "//xplat/folly:hash", + "//xplat/folly:likely", "//xplat/jsi:JSIDynamic", "//xplat/jsi:jsi", react_native_xplat_target("react/debug:debug"), @@ -76,16 +76,15 @@ fb_xplat_cxx_test( contacts = ["oncall+react_native@xmail.facebook.com"], platforms = (ANDROID, APPLE, CXX), deps = [ - "//xplat/folly:molly", - "//xplat/js/react-native-github/ReactCommon/react/renderer/element:element", + ":core", + "//xplat/hermes/API:HermesAPI", + "//xplat/third-party/gmock:gtest", react_native_xplat_target("react/debug:debug"), react_native_xplat_target("react/renderer/components/view:view"), react_native_xplat_target("react/renderer/components/scrollview:scrollview"), react_native_xplat_target("react/renderer/components/text:text"), - "//xplat/third-party/gmock:gtest", + react_native_xplat_target("react/renderer/element:element"), react_native_xplat_target("react/renderer/components/view:view"), - ":core", - "//xplat/hermes/API:HermesAPI", ], ) diff --git a/ReactCommon/react/renderer/core/RawPropsParser.cpp b/ReactCommon/react/renderer/core/RawPropsParser.cpp index 882a4a935a5..770e42e222f 100644 --- a/ReactCommon/react/renderer/core/RawPropsParser.cpp +++ b/ReactCommon/react/renderer/core/RawPropsParser.cpp @@ -7,8 +7,8 @@ #include "RawPropsParser.h" +#include #include -#include #include #include diff --git a/ReactCommon/react/renderer/core/RawPropsPrimitives.h b/ReactCommon/react/renderer/core/RawPropsPrimitives.h index 355496cc27f..cb2d9d1c196 100644 --- a/ReactCommon/react/renderer/core/RawPropsPrimitives.h +++ b/ReactCommon/react/renderer/core/RawPropsPrimitives.h @@ -7,7 +7,7 @@ #pragma once -#include +#include #include namespace facebook { diff --git a/ReactCommon/react/renderer/debug/BUCK b/ReactCommon/react/renderer/debug/BUCK index e0c512c8c3e..063da34b9fb 100644 --- a/ReactCommon/react/renderer/debug/BUCK +++ b/ReactCommon/react/renderer/debug/BUCK @@ -51,9 +51,7 @@ rn_xplat_cxx_library( visibility = ["PUBLIC"], deps = [ "//xplat/fbsystrace:fbsystrace", - "//xplat/folly:headers_only_do_not_use", "//xplat/folly:memory", - "//xplat/folly:molly", react_native_xplat_target("butter:butter"), react_native_xplat_target("react/debug:debug"), ], @@ -73,7 +71,6 @@ fb_xplat_cxx_test( platforms = (ANDROID, APPLE, CXX), deps = [ ":debug", - "//xplat/folly:molly", "//xplat/third-party/gmock:gtest", ], ) diff --git a/ReactCommon/react/renderer/graphics/BUCK b/ReactCommon/react/renderer/graphics/BUCK index 6c48783875f..4d2d9656ffe 100644 --- a/ReactCommon/react/renderer/graphics/BUCK +++ b/ReactCommon/react/renderer/graphics/BUCK @@ -109,9 +109,7 @@ rn_xplat_cxx_library( react_native_xplat_target("butter:butter"), "//third-party/glog:glog", "//xplat/fbsystrace:fbsystrace", - "//xplat/folly:headers_only_do_not_use", - "//xplat/folly:memory", - "//xplat/folly:molly", + "//xplat/folly:hash", ], ) @@ -129,7 +127,6 @@ fb_xplat_cxx_test( platforms = (ANDROID, APPLE, CXX), deps = [ ":graphics", - "//xplat/folly:molly", "//xplat/third-party/gmock:gtest", ], ) diff --git a/ReactCommon/react/renderer/imagemanager/BUCK b/ReactCommon/react/renderer/imagemanager/BUCK index 04977296957..7cb4aa025c9 100644 --- a/ReactCommon/react/renderer/imagemanager/BUCK +++ b/ReactCommon/react/renderer/imagemanager/BUCK @@ -84,8 +84,6 @@ rn_xplat_cxx_library( tests = [":tests"], visibility = ["PUBLIC"], deps = [ - "//xplat/folly:headers_only_do_not_use", - "//xplat/folly:molly", YOGA_CXX_TARGET, react_native_xplat_target("react/debug:debug"), react_native_xplat_target("react/renderer/core:core"), @@ -109,7 +107,6 @@ fb_xplat_cxx_test( platforms = (APPLE, CXX), deps = [ ":imagemanager", - "//xplat/folly:molly", "//xplat/third-party/gmock:gtest", ], ) diff --git a/ReactCommon/react/renderer/mapbuffer/BUCK b/ReactCommon/react/renderer/mapbuffer/BUCK index 8ab0305959f..2189dbdb97e 100644 --- a/ReactCommon/react/renderer/mapbuffer/BUCK +++ b/ReactCommon/react/renderer/mapbuffer/BUCK @@ -48,8 +48,6 @@ rn_xplat_cxx_library( deps = [ "//third-party/glog:glog", "//xplat/fbsystrace:fbsystrace", - "//xplat/folly:headers_only_do_not_use", - "//xplat/folly:memory", react_native_xplat_target("react/debug:debug"), ], ) @@ -67,7 +65,6 @@ fb_xplat_cxx_test( contacts = ["oncall+react_native@xmail.facebook.com"], platforms = ANDROID, deps = [ - "//xplat/folly:molly", "//xplat/third-party/gmock:gtest", react_native_xplat_target("react/debug:debug"), react_native_xplat_target("react/renderer/mapbuffer:mapbuffer"), diff --git a/ReactCommon/react/renderer/mounting/BUCK b/ReactCommon/react/renderer/mounting/BUCK index a563c6ef638..ff2e06c7cf8 100644 --- a/ReactCommon/react/renderer/mounting/BUCK +++ b/ReactCommon/react/renderer/mounting/BUCK @@ -51,9 +51,7 @@ rn_xplat_cxx_library( deps = [ "//third-party/glog:glog", "//xplat/fbsystrace:fbsystrace", - "//xplat/folly:headers_only_do_not_use", - "//xplat/folly:memory", - "//xplat/folly:molly", + "//xplat/folly:hash", react_native_xplat_target("butter:butter"), react_native_xplat_target("react/debug:debug"), react_native_xplat_target("react/renderer/components/root:root"), @@ -80,7 +78,6 @@ fb_xplat_cxx_test( platforms = (ANDROID, APPLE, CXX), deps = [ ":mounting", - "//xplat/folly:molly", "//xplat/third-party/gmock:gtest", react_native_xplat_target("react/renderer/element:element"), react_native_xplat_target("react/renderer/components/root:root"), diff --git a/ReactCommon/react/renderer/runtimescheduler/BUCK b/ReactCommon/react/renderer/runtimescheduler/BUCK index 80310efd096..8bc2a26aed0 100644 --- a/ReactCommon/react/renderer/runtimescheduler/BUCK +++ b/ReactCommon/react/renderer/runtimescheduler/BUCK @@ -48,6 +48,7 @@ rn_xplat_cxx_library( tests = [":tests"], visibility = ["PUBLIC"], deps = [ + "//xplat/folly:dynamic", react_native_xplat_target("runtimeexecutor:runtimeexecutor"), react_native_xplat_target("react/renderer/debug:debug"), react_native_xplat_target("butter:butter"), diff --git a/ReactCommon/react/renderer/scheduler/BUCK b/ReactCommon/react/renderer/scheduler/BUCK index 210680a696d..fa856379126 100644 --- a/ReactCommon/react/renderer/scheduler/BUCK +++ b/ReactCommon/react/renderer/scheduler/BUCK @@ -48,10 +48,6 @@ rn_xplat_cxx_library( deps = [ "//third-party/glog:glog", "//xplat/fbsystrace:fbsystrace", - "//xplat/folly:headers_only_do_not_use", - "//xplat/folly:memory", - "//xplat/folly:molly", - "//xplat/jsi:JSIDynamic", "//xplat/jsi:jsi", react_native_xplat_target("react/config:config"), react_native_xplat_target("react/debug:debug"), diff --git a/ReactCommon/react/renderer/telemetry/BUCK b/ReactCommon/react/renderer/telemetry/BUCK index 523b8acc93a..1a16f541bd4 100644 --- a/ReactCommon/react/renderer/telemetry/BUCK +++ b/ReactCommon/react/renderer/telemetry/BUCK @@ -51,9 +51,6 @@ rn_xplat_cxx_library( deps = [ "//third-party/glog:glog", "//xplat/fbsystrace:fbsystrace", - "//xplat/folly:headers_only_do_not_use", - "//xplat/folly:memory", - "//xplat/folly:molly", react_native_xplat_target("butter:butter"), react_native_xplat_target("react/debug:debug"), react_native_xplat_target("react/utils:utils"), @@ -75,7 +72,6 @@ fb_xplat_cxx_test( platforms = (ANDROID, APPLE, CXX), deps = [ ":telemetry", - "//xplat/folly:molly", "//xplat/third-party/gmock:gtest", react_native_xplat_target("react/test_utils:test_utils"), ], diff --git a/ReactCommon/react/renderer/templateprocessor/BUCK b/ReactCommon/react/renderer/templateprocessor/BUCK index 1b2dd3283cb..22994626a3f 100644 --- a/ReactCommon/react/renderer/templateprocessor/BUCK +++ b/ReactCommon/react/renderer/templateprocessor/BUCK @@ -50,9 +50,8 @@ rn_xplat_cxx_library( deps = [ "//third-party/glog:glog", "//xplat/fbsystrace:fbsystrace", - "//xplat/folly:headers_only_do_not_use", - "//xplat/folly:memory", - "//xplat/folly:molly", + "//xplat/folly:dynamic", + "//xplat/folly:json", "//xplat/jsi:JSIDynamic", "//xplat/jsi:jsi", react_native_xplat_target("react/renderer/core:core"), @@ -78,7 +77,6 @@ fb_xplat_cxx_test( platforms = (ANDROID, APPLE, CXX), deps = [ ":templateprocessor", - "//xplat/folly:molly", "//xplat/third-party/gmock:gtest", react_native_xplat_target("react/config:config"), react_native_xplat_target("react/renderer/components/image:image"), diff --git a/ReactCommon/react/renderer/textlayoutmanager/BUCK b/ReactCommon/react/renderer/textlayoutmanager/BUCK index a17477b5c84..162e7f20d87 100644 --- a/ReactCommon/react/renderer/textlayoutmanager/BUCK +++ b/ReactCommon/react/renderer/textlayoutmanager/BUCK @@ -118,9 +118,6 @@ rn_xplat_cxx_library( deps = [ "//third-party/glog:glog", "//xplat/fbsystrace:fbsystrace", - "//xplat/folly:headers_only_do_not_use", - "//xplat/folly:memory", - "//xplat/folly:molly", YOGA_CXX_TARGET, react_native_xplat_target("react/renderer/attributedstring:attributedstring"), react_native_xplat_target("react/renderer/core:core"), @@ -152,7 +149,6 @@ fb_xplat_cxx_test( ), deps = [ ":textlayoutmanager", - "//xplat/folly:molly", "//xplat/third-party/gmock:gtest", ], ) diff --git a/ReactCommon/react/renderer/timeline/BUCK b/ReactCommon/react/renderer/timeline/BUCK index b030a882245..b6baadc7182 100644 --- a/ReactCommon/react/renderer/timeline/BUCK +++ b/ReactCommon/react/renderer/timeline/BUCK @@ -47,9 +47,6 @@ rn_xplat_cxx_library( deps = [ "//third-party/glog:glog", "//xplat/fbsystrace:fbsystrace", - "//xplat/folly:headers_only_do_not_use", - "//xplat/folly:memory", - "//xplat/folly:molly", react_native_xplat_target("react/utils:utils"), react_native_xplat_target("react/renderer/debug:debug"), react_native_xplat_target("react/renderer/core:core"), @@ -73,7 +70,6 @@ fb_xplat_cxx_test( platforms = (ANDROID, APPLE, CXX), deps = [ ":timeline", - "//xplat/folly:molly", "//xplat/third-party/gmock:gtest", ], ) diff --git a/ReactCommon/react/renderer/uimanager/BUCK b/ReactCommon/react/renderer/uimanager/BUCK index d18cd57acd8..f6db4818271 100644 --- a/ReactCommon/react/renderer/uimanager/BUCK +++ b/ReactCommon/react/renderer/uimanager/BUCK @@ -50,9 +50,7 @@ rn_xplat_cxx_library( deps = [ "//third-party/glog:glog", "//xplat/fbsystrace:fbsystrace", - "//xplat/folly:headers_only_do_not_use", - "//xplat/folly:memory", - "//xplat/folly:molly", + "//xplat/folly:dynamic", "//xplat/jsi:JSIDynamic", "//xplat/jsi:jsi", react_native_xplat_target("react/config:config"), @@ -82,7 +80,6 @@ fb_xplat_cxx_test( platforms = (ANDROID, APPLE, CXX), deps = [ ":uimanager", - "//xplat/folly:molly", "//xplat/third-party/gmock:gtest", react_native_xplat_target("react/config:config"), react_native_xplat_target("react/renderer/components/image:image"), diff --git a/ReactCommon/react/utils/BUCK b/ReactCommon/react/utils/BUCK index 270a1cea441..85b786d15c2 100644 --- a/ReactCommon/react/utils/BUCK +++ b/ReactCommon/react/utils/BUCK @@ -56,11 +56,7 @@ rn_xplat_cxx_library( tests = [], visibility = ["PUBLIC"], deps = [ - "//third-party/glog:glog", "//xplat/folly:container_evicting_cache_map", - "//xplat/folly:headers_only_do_not_use", - "//xplat/folly:memory", - "//xplat/folly:molly", "//xplat/jsi:jsi", react_native_xplat_target("butter:butter"), react_native_xplat_target("react/debug:debug"), diff --git a/packages/react-native-codegen/DEFS.bzl b/packages/react-native-codegen/DEFS.bzl index 834c8a9e0cd..bd1ba845f03 100644 --- a/packages/react-native-codegen/DEFS.bzl +++ b/packages/react-native-codegen/DEFS.bzl @@ -421,12 +421,6 @@ def rn_codegen_components( tests = [":generated_tests-{}".format(name)], visibility = ["PUBLIC"], deps = [ - "//third-party/glog:glog", - "//xplat/fbsystrace:fbsystrace", - "//xplat/folly:headers_only_do_not_use", - "//xplat/folly:memory", - "//xplat/folly:molly", - YOGA_CXX_TARGET, react_native_xplat_target("react/renderer/debug:debug"), react_native_xplat_target("react/renderer/core:core"), react_native_xplat_target("react/renderer/graphics:graphics"),