diff --git a/RNTester/android/app/BUCK b/RNTester/android/app/BUCK index ad2b2d433d51c9..5a38efa9d74a76 100644 --- a/RNTester/android/app/BUCK +++ b/RNTester/android/app/BUCK @@ -14,8 +14,7 @@ rn_android_library( srcs = glob(["src/main/java/**/*.java"]), deps = [ ":res", - react_native_dep("third-party/android/support/v4:lib-support-v4"), - react_native_dep("third-party/android/support/v7/appcompat-orig:appcompat"), + react_native_dep("third-party/android/support/appcompat-v7:appcompat-v7"), react_native_dep("third-party/java/jsr-305:jsr-305"), react_native_target("java/com/facebook/react:react"), react_native_target("java/com/facebook/react/modules/core:core"), diff --git a/ReactAndroid/src/androidTest/buck-runner/BUCK b/ReactAndroid/src/androidTest/buck-runner/BUCK index 61848a4977a37c..20ba8c242b8c9c 100644 --- a/ReactAndroid/src/androidTest/buck-runner/BUCK +++ b/ReactAndroid/src/androidTest/buck-runner/BUCK @@ -14,7 +14,7 @@ rn_android_binary( deps = [ react_native_dep("android_res/com/facebook/catalyst/appcompat:appcompat"), react_native_dep("libraries/soloader/java/com/facebook/soloader:soloader"), - react_native_dep("third-party/java/testing-support-lib:exposed-instrumentation-api"), + react_native_dep("third-party/android/support/test:exposed-instrumentation-api"), react_native_integration_tests_target("assets:assets"), react_native_integration_tests_target("java/com/facebook/react/tests:tests"), react_native_target("java/com/facebook/react/devsupport:devsupport"), diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/BUCK b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/BUCK index fb77610c0aeb83..e681369a8c89f0 100644 --- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/BUCK +++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/BUCK @@ -14,13 +14,13 @@ rn_android_library( ], deps = [ react_native_dep("libraries/soloader/java/com/facebook/soloader:soloader"), - react_native_dep("third-party/android/support/v4:lib-support-v4"), + react_native_dep("third-party/android/support/v4:support-v4"), react_native_dep("third-party/java/buck-android-support:buck-android-support"), react_native_dep("third-party/java/infer-annotations:infer-annotations"), react_native_dep("third-party/java/jsr-305:jsr-305"), react_native_dep("third-party/java/junit:junit"), react_native_dep("third-party/java/mockito:mockito"), - react_native_dep("third-party/java/testing-support-lib:runner"), + react_native_dep("third-party/android/support/test:runner"), react_native_integration_tests_target("java/com/facebook/react/testing/idledetection:idledetection"), react_native_integration_tests_target("java/com/facebook/react/testing/network:network"), react_native_target("java/com/facebook/react:react"), diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/BUCK b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/BUCK index 61925bb545baec..4fe0f2682a3bf7 100644 --- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/BUCK +++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/BUCK @@ -7,7 +7,7 @@ rn_android_library( "PUBLIC", ], deps = [ - react_native_dep("third-party/java/testing-support-lib:runner"), + react_native_dep("third-party/android/support/test:runner"), react_native_target("java/com/facebook/react/bridge:bridge"), react_native_target("java/com/facebook/react/modules/core:core"), ], diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/network/BUCK b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/network/BUCK index 4d3c1f73dbabd8..dfa047a9a7197f 100644 --- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/network/BUCK +++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/network/BUCK @@ -7,7 +7,7 @@ rn_android_library( "PUBLIC", ], deps = [ - react_native_dep("third-party/android/support/v4:lib-support-v4"), + react_native_dep("third-party/android/support/v4:support-v4"), react_native_dep("third-party/java/jsr-305:jsr-305"), react_native_target("java/com/facebook/react/bridge:bridge"), react_native_target("java/com/facebook/react/module/annotations:annotations"), diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/rule/BUCK b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/rule/BUCK index e1c7eed2913c06..970310d4cf6616 100644 --- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/rule/BUCK +++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/rule/BUCK @@ -18,9 +18,8 @@ rn_android_library( react_native_dep("third-party/java/espresso:espresso"), react_native_dep("third-party/java/jsr-305:jsr-305"), react_native_dep("third-party/java/junit:junit"), - react_native_dep("third-party/java/testing-support-lib:testing-support-lib"), - react_native_dep("third-party/android/support/v4:lib-support-v4"), - react_native_dep("third-party/android/support/v7/appcompat-orig:appcompat"), + react_native_dep("third-party/android/support/test:testing-support-lib"), + react_native_dep("third-party/android/support/appcompat-v7:appcompat-v7"), react_native_dep("third-party/java/jsr-305:jsr-305"), react_native_integration_tests_target("java/com/facebook/react/testing:testing"), react_native_integration_tests_target("java/com/facebook/react/testing/idledetection:idledetection"), diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/BUCK b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/BUCK index a80f3f40ef4e60..d30db5f84d7c78 100644 --- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/BUCK +++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/BUCK @@ -7,7 +7,7 @@ rn_android_library( "PUBLIC", ], deps = [ - react_native_dep("third-party/android/support/v4:lib-support-v4"), + react_native_dep("third-party/android/support/v4:support-v4"), react_native_dep("third-party/java/jsr-305:jsr-305"), react_native_dep("third-party/java/junit:junit"), react_native_integration_tests_target("java/com/facebook/react/testing:testing"), diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/core/BUCK b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/core/BUCK index 5f87d7e94d91e7..ecb8c433899531 100644 --- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/core/BUCK +++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/core/BUCK @@ -15,7 +15,7 @@ rn_android_library( react_native_dep("third-party/java/espresso:espresso"), react_native_dep("third-party/java/fest:fest"), react_native_dep("third-party/java/junit:junit"), - react_native_dep("third-party/java/testing-support-lib:testing-support-lib"), + react_native_dep("third-party/android/support/test:testing-support-lib"), react_native_integration_tests_target("java/com/facebook/react/testing:testing"), react_native_integration_tests_target("java/com/facebook/react/testing/rule:rule"), react_native_target("java/com/facebook/react:react"), diff --git a/ReactAndroid/src/main/android_res/com/facebook/catalyst/appcompat/BUCK b/ReactAndroid/src/main/android_res/com/facebook/catalyst/appcompat/BUCK index d0d6a03da817d1..9f3738558a5280 100644 --- a/ReactAndroid/src/main/android_res/com/facebook/catalyst/appcompat/BUCK +++ b/ReactAndroid/src/main/android_res/com/facebook/catalyst/appcompat/BUCK @@ -5,6 +5,6 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "rn_android_resou rn_android_resource( name = "appcompat", package = "com.facebook.react", - res = react_native_dep("third-party/android/support/v7/appcompat-orig:res-unpacker-cmd"), + res = react_native_dep("third-party/android/support/appcompat-v7:res-unpacker-cmd"), visibility = ["//ReactAndroid/..."], ) diff --git a/ReactAndroid/src/main/java/com/facebook/react/BUCK b/ReactAndroid/src/main/java/com/facebook/react/BUCK index 426fd4f5de5cdc..35969b9320c354 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/BUCK @@ -3,10 +3,6 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_tar rn_android_library( name = "react", srcs = glob(["*.java"]), - provided_deps = [ - react_native_dep("third-party/android/support/v4:lib-support-v4"), - react_native_dep("third-party/android/support-annotations:android-support-annotations"), - ], visibility = [ "PUBLIC", ], @@ -14,6 +10,7 @@ rn_android_library( react_native_dep("java/com/facebook/systrace:systrace"), react_native_dep("libraries/fbcore/src/main/java/com/facebook/common/logging:logging"), react_native_dep("libraries/soloader/java/com/facebook/soloader:soloader"), + react_native_dep("third-party/android/support/v4:support-v4"), react_native_dep("third-party/java/infer-annotations:infer-annotations"), react_native_dep("third-party/java/jsr-305:jsr-305"), react_native_target("java/com/facebook/debug/holder:holder"), diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/BUCK b/ReactAndroid/src/main/java/com/facebook/react/animated/BUCK index 406ef5c79a1153..8d0f0268c4f151 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/animated/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/animated/BUCK @@ -5,13 +5,11 @@ rn_android_library( srcs = glob([ "*.java", ]), - provided_deps = [ - react_native_dep("third-party/android/support/v4:lib-support-v4"), - ], visibility = [ "PUBLIC", ], deps = [ + react_native_dep("third-party/android/support/v4:support-v4"), react_native_dep("libraries/fbcore/src/main/java/com/facebook/common/logging:logging"), react_native_dep("third-party/java/infer-annotations:infer-annotations"), react_native_dep("third-party/java/jsr-305:jsr-305"), diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK b/ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK index 3f14185bf8ffcb..7aafbe1930fe95 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK @@ -20,15 +20,12 @@ rn_android_library( exclude = INTERFACES, ), proguard_config = "reactnative.pro", - provided_deps = [ - react_native_dep("third-party/android/support/v4:lib-support-v4"), - ], required_for_source_only_abi = True, visibility = [ "PUBLIC", ], deps = [ - react_native_dep("third-party/android/support-annotations:android-support-annotations"), + react_native_dep("third-party/android/support/v4:support-v4"), react_native_dep("java/com/facebook/debug/debugoverlay/model:model"), react_native_dep("java/com/facebook/systrace:systrace"), react_native_dep("libraries/fbcore/src/main/java/com/facebook/common/logging:logging"), @@ -54,14 +51,12 @@ rn_android_library( name = "interfaces", srcs = glob(INTERFACES), proguard_config = "reactnative.pro", - provided_deps = [ - react_native_dep("third-party/android/support/v4:lib-support-v4"), - ], required_for_source_only_abi = True, visibility = [ "PUBLIC", ], deps = [ + react_native_dep("third-party/android/support/v4:support-v4"), react_native_dep("third-party/java/infer-annotations:infer-annotations"), react_native_dep("third-party/java/jsr-305:jsr-305"), react_native_target("java/com/facebook/debug/tags:tags"), diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/BUCK b/ReactAndroid/src/main/java/com/facebook/react/common/BUCK index 6a6a5452b351ad..5c9124a06d2eca 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/common/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/common/BUCK @@ -10,15 +10,13 @@ rn_android_library( ["**/*.java"], exclude = SUB_PROJECTS, ), - provided_deps = [ - react_native_dep("third-party/android/support/v4:lib-support-v4"), - ], required_for_source_only_abi = True, visibility = [ "PUBLIC", ], deps = [ ":build_config", + react_native_dep("third-party/android/support/v4:support-v4"), react_native_dep("libraries/fbcore/src/main/java/com/facebook/common/logging:logging"), react_native_dep("third-party/java/infer-annotations:infer-annotations"), react_native_dep("third-party/java/jsr-305:jsr-305"), diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/BUCK b/ReactAndroid/src/main/java/com/facebook/react/fabric/BUCK index fac5d12496b0b0..d70f9c560d53be 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/BUCK @@ -6,9 +6,6 @@ rn_android_library( "*.java", "events/*.java", ]), - provided_deps = [ - react_native_dep("third-party/android/support/v4:lib-support-v4"), - ], required_for_source_only_abi = True, visibility = [ "PUBLIC", @@ -17,6 +14,7 @@ rn_android_library( YOGA_TARGET, react_native_dep("java/com/facebook/systrace:systrace"), react_native_dep("libraries/fbcore/src/main/java/com/facebook/common/logging:logging"), + react_native_dep("third-party/android/support/v4:support-v4"), react_native_dep("third-party/java/infer-annotations:infer-annotations"), react_native_dep("third-party/java/jsr-305:jsr-305"), react_native_target("java/com/facebook/react:react"), 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 5163ab1769aed9..5f1fac461d43a9 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsc/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jsc/BUCK @@ -3,14 +3,12 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_tar rn_android_library( name = "jsc", srcs = glob(["**/*.java"]), - provided_deps = [ - react_native_dep("third-party/android/support/v4:lib-support-v4"), - ], required_for_source_only_abi = True, visibility = [ "PUBLIC", ], deps = [ + react_native_dep("third-party/android/support/v4:support-v4"), react_native_dep("libraries/soloader/java/com/facebook/soloader:soloader"), react_native_dep("third-party/java/infer-annotations:infer-annotations"), react_native_target("java/com/facebook/react/bridge:bridge"), diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BUCK index 5732738b051a43..328703734200da 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BUCK @@ -3,15 +3,12 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_tar rn_android_library( name = "blob", srcs = glob(["**/*.java"]), - provided_deps = [ - react_native_dep("third-party/android/support-annotations:android-support-annotations"), - react_native_dep("third-party/android/support/v4:lib-support-v4"), - ], visibility = [ "PUBLIC", ], deps = [ react_native_dep("libraries/fbcore/src/main/java/com/facebook/common/logging:logging"), + react_native_dep("third-party/android/support/v4:support-v4"), react_native_dep("third-party/java/infer-annotations:infer-annotations"), react_native_dep("third-party/java/jsr-305:jsr-305"), react_native_dep("third-party/java/okhttp:okhttp3"), diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/BUCK index edb587a8d9b68f..ff7f08af2bc92b 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/BUCK @@ -3,13 +3,11 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_tar rn_android_library( name = "datepicker", srcs = glob(["**/*.java"]), - provided_deps = [ - react_native_dep("third-party/android/support/v4:lib-support-v4"), - ], visibility = [ "PUBLIC", ], deps = [ + react_native_dep("third-party/android/support/v4:support-v4"), react_native_dep("third-party/java/infer-annotations:infer-annotations"), react_native_dep("third-party/java/jsr-305:jsr-305"), react_native_target("java/com/facebook/react/bridge:bridge"), diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/BUCK index 6736b020638945..19f014f1a9b6e3 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/BUCK @@ -3,13 +3,11 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_tar rn_android_library( name = "dialog", srcs = glob(["**/*.java"]), - provided_deps = [ - react_native_dep("third-party/android/support/v4:lib-support-v4"), - ], visibility = [ "PUBLIC", ], deps = [ + react_native_dep("third-party/android/support/v4:support-v4"), react_native_dep("libraries/fbcore/src/main/java/com/facebook/common/logging:logging"), react_native_dep("third-party/java/infer-annotations:infer-annotations"), react_native_dep("third-party/java/jsr-305:jsr-305"), diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/BUCK index 081442a0198bae..5f989379c9a909 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/BUCK @@ -3,10 +3,6 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_tar rn_android_library( name = "fresco", srcs = glob(["**/*.java"]), - provided_deps = [ - react_native_dep("third-party/android/support-annotations:android-support-annotations"), - react_native_dep("third-party/android/support/v4:lib-support-v4"), - ], visibility = [ "PUBLIC", ], @@ -19,6 +15,7 @@ rn_android_library( react_native_dep("libraries/fresco/fresco-react-native:imagepipeline"), react_native_dep("libraries/fresco/fresco-react-native:imagepipeline-okhttp3"), react_native_dep("libraries/soloader/java/com/facebook/soloader:soloader"), + react_native_dep("third-party/android/support/v4:support-v4"), react_native_dep("third-party/java/jsr-305:jsr-305"), react_native_dep("third-party/java/okhttp:okhttp3"), react_native_dep("third-party/java/okhttp:okhttp3-urlconnection"), diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/BUCK index b2ed1d5f32181f..cd435bd84475f4 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/BUCK @@ -3,13 +3,11 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_tar rn_android_library( name = "i18nmanager", srcs = glob(["*.java"]), - provided_deps = [ - react_native_dep("third-party/android/support/v4:lib-support-v4"), - ], visibility = [ "PUBLIC", ], deps = [ + react_native_dep("third-party/android/support/v4:support-v4"), react_native_dep("third-party/java/infer-annotations:infer-annotations"), react_native_dep("third-party/java/jsr-305:jsr-305"), react_native_target("java/com/facebook/react/bridge:bridge"), diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/netinfo/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/netinfo/BUCK index c17147a4ec8a5c..318e4f54fb9968 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/netinfo/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/netinfo/BUCK @@ -3,13 +3,11 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_tar rn_android_library( name = "netinfo", srcs = glob(["**/*.java"]), - provided_deps = [ - react_native_dep("third-party/android/support/v4:lib-support-v4"), - ], visibility = [ "PUBLIC", ], deps = [ + react_native_dep("third-party/android/support/v4:support-v4"), react_native_dep("libraries/fbcore/src/main/java/com/facebook/common/logging:logging"), react_native_dep("third-party/java/infer-annotations:infer-annotations"), react_native_dep("third-party/java/jsr-305:jsr-305"), diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/network/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/network/BUCK index 4e9a5e2607909d..c3639f6feca062 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/network/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/network/BUCK @@ -3,14 +3,12 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_tar rn_android_library( name = "network", srcs = glob(["**/*.java"]), - provided_deps = [ - react_native_dep("third-party/android/support/v4:lib-support-v4"), - ], visibility = [ "PUBLIC", ], deps = [ react_native_dep("libraries/fbcore/src/main/java/com/facebook/common/logging:logging"), + react_native_dep("third-party/android/support/v4:support-v4"), react_native_dep("third-party/java/infer-annotations:infer-annotations"), react_native_dep("third-party/java/jsr-305:jsr-305"), react_native_dep("third-party/java/okhttp:okhttp3"), diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/statusbar/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/statusbar/BUCK index 998fcbf3ff1d4d..838f3bff9a0e33 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/statusbar/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/statusbar/BUCK @@ -3,14 +3,12 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_tar rn_android_library( name = "statusbar", srcs = glob(["**/*.java"]), - provided_deps = [ - react_native_dep("third-party/android/support/v4:lib-support-v4"), - ], visibility = [ "PUBLIC", ], deps = [ react_native_dep("libraries/fbcore/src/main/java/com/facebook/common/logging:logging"), + react_native_dep("third-party/android/support/v4:support-v4"), react_native_dep("third-party/java/infer-annotations:infer-annotations"), react_native_dep("third-party/java/jsr-305:jsr-305"), react_native_target("java/com/facebook/react/bridge:bridge"), diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/BUCK index 51685f7d9dec48..b6df1e65d8a72c 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/BUCK @@ -3,13 +3,11 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_tar rn_android_library( name = "timepicker", srcs = glob(["**/*.java"]), - provided_deps = [ - react_native_dep("third-party/android/support/v4:lib-support-v4"), - ], visibility = [ "PUBLIC", ], deps = [ + react_native_dep("third-party/android/support/v4:support-v4"), react_native_dep("third-party/java/infer-annotations:infer-annotations"), react_native_dep("third-party/java/jsr-305:jsr-305"), react_native_target("java/com/facebook/react/bridge:bridge"), diff --git a/ReactAndroid/src/main/java/com/facebook/react/shell/BUCK b/ReactAndroid/src/main/java/com/facebook/react/shell/BUCK index 841944ec0e765a..56e48977bcd876 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/shell/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/shell/BUCK @@ -3,15 +3,13 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_tar rn_android_library( name = "shell", srcs = glob(["**/*.java"]), - provided_deps = [ - react_native_dep("third-party/android/support/v4:lib-support-v4"), - ], visibility = [ "PUBLIC", ], deps = [ react_native_dep("libraries/fresco/fresco-react-native:imagepipeline"), react_native_dep("libraries/soloader/java/com/facebook/soloader:soloader"), + react_native_dep("third-party/android/support/v4:support-v4"), react_native_dep("third-party/java/infer-annotations:infer-annotations"), react_native_dep("third-party/java/jsr-305:jsr-305"), react_native_target("java/com/facebook/react:react"), diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/BUCK b/ReactAndroid/src/main/java/com/facebook/react/uimanager/BUCK index 262d60c93307fa..f0538d36242147 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/BUCK @@ -11,10 +11,6 @@ rn_android_library( ], exclude = ["DisplayMetricsHolder.java"], ), - provided_deps = [ - react_native_dep("third-party/android/support/v4:lib-support-v4"), - react_native_dep("third-party/android/support-annotations:android-support-annotations"), - ], required_for_source_only_abi = True, visibility = [ "PUBLIC", @@ -24,6 +20,7 @@ rn_android_library( ":DisplayMetrics", react_native_dep("java/com/facebook/systrace:systrace"), react_native_dep("libraries/fbcore/src/main/java/com/facebook/common/logging:logging"), + react_native_dep("third-party/android/support/v4:support-v4"), react_native_dep("third-party/java/infer-annotations:infer-annotations"), react_native_target("java/com/facebook/debug/tags:tags"), react_native_target("java/com/facebook/debug/holder:holder"), diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/BUCK b/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/BUCK index 0da530277723cd..5abad8ecf5e8be 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/BUCK @@ -3,14 +3,11 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "rn_android_libra rn_android_library( name = "common", srcs = glob(["*.java"]), - provided_deps = [ - react_native_dep("third-party/android/support/v4:lib-support-v4"), - react_native_dep("third-party/android/support-annotations:android-support-annotations"), - ], visibility = [ "PUBLIC", ], deps = [ + react_native_dep("third-party/android/support/v4:support-v4"), react_native_dep("third-party/java/jsr-305:jsr-305"), ], ) diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/checkbox/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/checkbox/BUCK index 1973543c07d584..9a556fbe3fafe8 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/checkbox/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/checkbox/BUCK @@ -3,14 +3,11 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_tar rn_android_library( name = "checkbox", srcs = glob(["*.java"]), - provided_deps = [ - react_native_dep("third-party/android/support/v4:lib-support-v4"), - react_native_dep("third-party/android/support/v7/appcompat-orig:appcompat"), - ], visibility = [ "PUBLIC", ], deps = [ + react_native_dep("third-party/android/support/appcompat-v7:appcompat-v7"), react_native_dep("third-party/java/jsr-305:jsr-305"), react_native_target("java/com/facebook/react/bridge:bridge"), react_native_target("java/com/facebook/react/common:common"), diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/common/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/common/BUCK index d78d4b99697f90..b622cf9c60cb1c 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/common/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/common/BUCK @@ -3,12 +3,10 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "rn_android_libra rn_android_library( name = "common", srcs = glob(["*.java"]), - provided_deps = [ - react_native_dep("third-party/android/support/v4:lib-support-v4"), - ], visibility = [ "PUBLIC", ], deps = [ + react_native_dep("third-party/android/support/v4:support-v4"), ], ) diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/drawer/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/drawer/BUCK index 3fb17b776428a0..c3d3da1f979097 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/drawer/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/drawer/BUCK @@ -3,15 +3,13 @@ load("//tools/build_defs/oss:rn_defs.bzl", "YOGA_TARGET", "react_native_dep", "r rn_android_library( name = "drawer", srcs = glob(["**/*.java"]), - provided_deps = [ - react_native_dep("third-party/android/support/v4:lib-support-v4"), - ], visibility = [ "PUBLIC", ], deps = [ YOGA_TARGET, react_native_dep("libraries/fbcore/src/main/java/com/facebook/common/logging:logging"), + react_native_dep("third-party/android/support/v4:support-v4"), react_native_dep("third-party/java/jsr-305:jsr-305"), react_native_target("java/com/facebook/react/bridge:bridge"), react_native_target("java/com/facebook/react/common:common"), 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 fe352c0f29812f..65402c6b0e6e36 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/image/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/image/BUCK @@ -7,13 +7,10 @@ IMAGE_EVENT_FILES = [ rn_android_library( name = "imageevents", srcs = IMAGE_EVENT_FILES, - provided_deps = [ - react_native_dep("third-party/android/support-annotations:android-support-annotations"), - react_native_dep("third-party/android/support/v4:lib-support-v4"), - ], required_for_source_only_abi = True, visibility = ["PUBLIC"], deps = [ + react_native_dep("third-party/android/support/v4:support-v4"), react_native_dep("third-party/java/jsr-305:jsr-305"), react_native_target("java/com/facebook/react/bridge:bridge"), react_native_target("java/com/facebook/react/uimanager:uimanager"), @@ -26,15 +23,12 @@ rn_android_library( ["*.java"], exclude = IMAGE_EVENT_FILES, ), - provided_deps = [ - react_native_dep("third-party/android/support-annotations:android-support-annotations"), - react_native_dep("third-party/android/support/v4:lib-support-v4"), - ], visibility = [ "PUBLIC", ], deps = [ YOGA_TARGET, + react_native_dep("third-party/android/support/v4:support-v4"), react_native_dep("libraries/fresco/fresco-react-native:fbcore"), react_native_dep("libraries/fresco/fresco-react-native:fresco-drawee"), react_native_dep("libraries/fresco/fresco-react-native:fresco-react-native"), diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/BUCK index 2a72452d0580a8..216df9d7c12f64 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/BUCK @@ -3,14 +3,12 @@ load("//tools/build_defs/oss:rn_defs.bzl", "YOGA_TARGET", "react_native_dep", "r rn_android_library( name = "scroll", srcs = glob(["*.java"]), - provided_deps = [ - react_native_dep("third-party/android/support/v4:lib-support-v4"), - ], visibility = [ "PUBLIC", ], deps = [ YOGA_TARGET, + react_native_dep("third-party/android/support/v4:support-v4"), react_native_dep("third-party/java/infer-annotations:infer-annotations"), react_native_dep("third-party/java/jsr-305:jsr-305"), react_native_target("java/com/facebook/react/bridge:bridge"), diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/slider/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/slider/BUCK index 50e606647ea0da..3b17320b90b9b2 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/slider/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/slider/BUCK @@ -3,14 +3,12 @@ load("//tools/build_defs/oss:rn_defs.bzl", "YOGA_TARGET", "react_native_dep", "r rn_android_library( name = "slider", srcs = glob(["*.java"]), - provided_deps = [ - react_native_dep("third-party/android/support/v7/appcompat-orig:appcompat"), - ], visibility = [ "PUBLIC", ], deps = [ YOGA_TARGET, + react_native_dep("third-party/android/support/appcompat-v7:appcompat-v7"), react_native_dep("third-party/java/jsr-305:jsr-305"), react_native_target("java/com/facebook/react/bridge:bridge"), react_native_target("java/com/facebook/react/common:common"), diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/BUCK index 6bc4c1ae773d7a..fb51289efa0125 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/BUCK @@ -3,13 +3,11 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_tar rn_android_library( name = "swiperefresh", srcs = glob(["*.java"]), - provided_deps = [ - react_native_dep("third-party/android/support/v4:lib-support-v4"), - ], visibility = [ "PUBLIC", ], deps = [ + react_native_dep("third-party/android/support/v4:support-v4"), react_native_dep("third-party/java/jsr-305:jsr-305"), react_native_target("java/com/facebook/react/bridge:bridge"), react_native_target("java/com/facebook/react/common:common"), diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/switchview/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/switchview/BUCK index cb5257ca5fe519..482613bb7f70c5 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/switchview/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/switchview/BUCK @@ -3,14 +3,12 @@ load("//tools/build_defs/oss:rn_defs.bzl", "YOGA_TARGET", "react_native_dep", "r rn_android_library( name = "switchview", srcs = glob(["*.java"]), - provided_deps = [ - react_native_dep("third-party/android/support/v7/appcompat-orig:appcompat"), - ], visibility = [ "PUBLIC", ], deps = [ YOGA_TARGET, + react_native_dep("third-party/android/support/appcompat-v7:appcompat-v7"), react_native_dep("third-party/java/jsr-305:jsr-305"), react_native_target("java/com/facebook/react/bridge:bridge"), react_native_target("java/com/facebook/react/common:common"), diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/BUCK index 3c29c2262fcb4f..905757fa0a5883 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/BUCK @@ -3,15 +3,13 @@ load("//tools/build_defs/oss:rn_defs.bzl", "YOGA_TARGET", "react_native_dep", "r rn_android_library( name = "textinput", srcs = glob(["*.java"]), - provided_deps = [ - react_native_dep("third-party/android/support/v4:lib-support-v4"), - ], required_for_source_only_abi = True, visibility = [ "PUBLIC", ], deps = [ YOGA_TARGET, + react_native_dep("third-party/android/support/v4:support-v4"), react_native_dep("third-party/java/infer-annotations:infer-annotations"), react_native_dep("third-party/java/jsr-305:jsr-305"), react_native_target("java/com/facebook/react/bridge:bridge"), diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/BUCK index 76dd4b1d4b2765..3337f7489e25c3 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/BUCK @@ -3,15 +3,12 @@ load("//tools/build_defs/oss:rn_defs.bzl", "YOGA_TARGET", "react_native_dep", "r rn_android_library( name = "toolbar", srcs = glob(["**/*.java"]), - provided_deps = [ - react_native_dep("third-party/android/support/v4:lib-support-v4"), - react_native_dep("third-party/android/support/v7/appcompat-orig:appcompat"), - ], visibility = [ "PUBLIC", ], deps = [ YOGA_TARGET, + react_native_dep("third-party/android/support/appcompat-v7:appcompat-v7"), react_native_dep("libraries/fresco/fresco-react-native:fbcore"), react_native_dep("libraries/fresco/fresco-react-native:fresco-drawee"), react_native_dep("libraries/fresco/fresco-react-native:fresco-react-native"), diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/BUCK index 953bdc042a049a..c230210a98f16e 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/BUCK @@ -3,14 +3,12 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_tar rn_android_library( name = "viewpager", srcs = glob(["**/*.java"]), - provided_deps = [ - react_native_dep("third-party/android/support/v4:lib-support-v4"), - ], required_for_source_only_abi = True, visibility = [ "PUBLIC", ], deps = [ + react_native_dep("third-party/android/support/v4:support-v4"), react_native_dep("third-party/java/infer-annotations:infer-annotations"), react_native_dep("third-party/java/jsr-305:jsr-305"), react_native_target("java/com/facebook/react/bridge:bridge"), diff --git a/ReactAndroid/src/main/third-party/android/support-annotations/BUCK b/ReactAndroid/src/main/third-party/android/support/annotations/BUCK similarity index 87% rename from ReactAndroid/src/main/third-party/android/support-annotations/BUCK rename to ReactAndroid/src/main/third-party/android/support/annotations/BUCK index 80a5ef65b053f4..f31c83bf591587 100644 --- a/ReactAndroid/src/main/third-party/android/support-annotations/BUCK +++ b/ReactAndroid/src/main/third-party/android/support/annotations/BUCK @@ -1,5 +1,5 @@ prebuilt_jar( - name = "android-support-annotations", + name = "support-annotations", binary_jar = ":support-annotations-binary.jar", visibility = ["//ReactAndroid/..."], ) diff --git a/ReactAndroid/src/main/third-party/android/support/v7/appcompat-orig/BUCK b/ReactAndroid/src/main/third-party/android/support/appcompat-v7/BUCK similarity index 94% rename from ReactAndroid/src/main/third-party/android/support/v7/appcompat-orig/BUCK rename to ReactAndroid/src/main/third-party/android/support/appcompat-v7/BUCK index 1feeab85b5f7b3..7f59de09737b04 100644 --- a/ReactAndroid/src/main/third-party/android/support/v7/appcompat-orig/BUCK +++ b/ReactAndroid/src/main/third-party/android/support/appcompat-v7/BUCK @@ -10,7 +10,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "rn_android_libra # All this mumbo jumbo will go away after t10182713 rn_android_library( - name = "appcompat", + name = "appcompat-v7", visibility = [ "PUBLIC", ], @@ -19,7 +19,7 @@ rn_android_library( ], exported_deps = [ ":classes-for-react-native", - react_native_dep("third-party/android/support-annotations:android-support-annotations"), + react_native_dep("third-party/android/support/v4:support-v4"), ], ) diff --git a/ReactAndroid/src/main/third-party/android/support/v7/appcompat-orig/aar-unpacker.py b/ReactAndroid/src/main/third-party/android/support/appcompat-v7/aar-unpacker.py similarity index 100% rename from ReactAndroid/src/main/third-party/android/support/v7/appcompat-orig/aar-unpacker.py rename to ReactAndroid/src/main/third-party/android/support/appcompat-v7/aar-unpacker.py diff --git a/ReactAndroid/src/main/third-party/java/testing-support-lib/BUCK b/ReactAndroid/src/main/third-party/android/support/test/BUCK similarity index 100% rename from ReactAndroid/src/main/third-party/java/testing-support-lib/BUCK rename to ReactAndroid/src/main/third-party/android/support/test/BUCK diff --git a/ReactAndroid/src/main/third-party/android/support/v4/BUCK b/ReactAndroid/src/main/third-party/android/support/v4/BUCK index 27aec407f2907b..89734229d39a76 100644 --- a/ReactAndroid/src/main/third-party/android/support/v4/BUCK +++ b/ReactAndroid/src/main/third-party/android/support/v4/BUCK @@ -1,114 +1,117 @@ -android_library( - name = "lib-support-v4", +load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "rn_android_library") + +rn_android_library( + name = "support-v4", visibility = ["PUBLIC"], exported_deps = [ - ":android-lifecycle-common", - ":android-lifecycle-core", - ":android-lifecycle-runtime", - ":android-lifecycle-viewmodel", - ":lib-support-v4-support-compat", - ":lib-support-v4-support-core-ui", - ":lib-support-v4-support-core-utils", - ":lib-support-v4-support-fragment", - ":lib-support-v4-support-media-compat", + react_native_dep("third-party/android/support/annotations:support-annotations"), + ":lifecycle-common", + ":lifecycle-core", + ":lifecycle-runtime", + ":lifecycle-viewmodel", + ":support-compat", + ":support-core-ui", + ":support-core-utils", + ":support-fragment", + ":support-media-compat", ], ) prebuilt_jar( - name = "android-lifecycle-common", - binary_jar = ":android-lifecycle-common.jar", + name = "lifecycle-common", + binary_jar = ":lifecycle-common.jar", ) prebuilt_jar( - name = "android-lifecycle-core", - binary_jar = ":android-lifecycle-core.jar", + name = "lifecycle-core", + binary_jar = ":lifecycle-core.jar", ) android_prebuilt_aar( - name = "android-lifecycle-runtime", - aar = ":android-lifecycle-runtime-aar", + name = "lifecycle-runtime", + aar = ":lifecycle-runtime-aar", ) android_prebuilt_aar( - name = "android-lifecycle-viewmodel", - aar = ":android-lifecycle-viewmodel-aar", + name = "lifecycle-viewmodel", + aar = ":lifecycle-viewmodel-aar", ) android_prebuilt_aar( - name = "lib-support-v4-support-compat", - aar = ":lib-support-v4-support-compat-aar", + name = "support-compat", + aar = ":support-compat-aar", ) android_prebuilt_aar( - name = "lib-support-v4-support-core-utils", - aar = ":lib-support-v4-support-core-utils-aar", + name = "support-core-utils", + aar = ":support-core-utils-aar", ) android_prebuilt_aar( - name = "lib-support-v4-support-core-ui", - aar = ":lib-support-v4-support-core-ui-aar", + name = "support-core-ui", + aar = ":support-core-ui-aar", ) android_prebuilt_aar( - name = "lib-support-v4-support-media-compat", - aar = ":lib-support-v4-support-media-compat-aar", + name = "support-media-compat", + aar = ":support-media-compat-aar", ) android_prebuilt_aar( - name = "lib-support-v4-support-fragment", - aar = ":lib-support-v4-support-fragment-aar", + name = "support-fragment", + aar = ":support-fragment-aar", ) remote_file( - name = "android-lifecycle-runtime-aar", + name = "lifecycle-runtime-aar", sha1 = "95428e5f6bf6875a6a1125d2157c3836a1a837f5", url = "mvn:android.arch.lifecycle:runtime:aar:1.1.0", ) remote_file( - name = "android-lifecycle-common.jar", + name = "lifecycle-common.jar", sha1 = "0edf3f7bfb84a7521d0599efa3b0113a0ee90f85", url = "mvn:android.arch.lifecycle:common:jar:1.1.0", ) remote_file( - name = "android-lifecycle-core.jar", + name = "lifecycle-core.jar", sha1 = "8007981f7d7540d89cd18471b8e5dcd2b4f99167", url = "mvn:android.arch.core:common:jar:1.1.0", ) remote_file( - name = "android-lifecycle-viewmodel-aar", + name = "lifecycle-viewmodel-aar", sha1 = "74ee369b874da61b5b81bebd7b8df0c2577309c8", url = "mvn:android.arch.lifecycle:viewmodel:aar:1.1.0", ) remote_file( - name = "lib-support-v4-support-compat-aar", + name = "support-compat-aar", sha1 = "a55ad550d0b84c7fec7ecca012690636062c0e64", url = "mvn:com.android.support:support-compat:aar:27.1.1", ) remote_file( - name = "lib-support-v4-support-core-utils-aar", + name = "support-core-utils-aar", sha1 = "b3a7a4040fda0c5138dbc8c477103b6723b9dbe6", url = "mvn:com.android.support:support-core-utils:aar:27.1.1", ) remote_file( - name = "lib-support-v4-support-core-ui-aar", + name = "support-core-ui-aar", sha1 = "f9acdb8a4c3a9fe883fd7fa5efd3f0426bb9dcda", url = "mvn:com.android.support:support-core-ui:aar:27.1.1", ) remote_file( - name = "lib-support-v4-support-media-compat-aar", + name = "support-media-compat-aar", sha1 = "10e309e2cc22ff4cab30bd5f573e4bb30be707ad", url = "mvn:com.android.support:support-media-compat:aar:27.1.1", ) remote_file( - name = "lib-support-v4-support-fragment-aar", + name = "support-fragment-aar", sha1 = "eb8053ebf038b7561c29e5e8964664fac05f375e", url = "mvn:com.android.support:support-fragment:aar:27.1.1", ) diff --git a/ReactAndroid/src/test/java/com/facebook/react/BUCK b/ReactAndroid/src/test/java/com/facebook/react/BUCK index 3eecaae58b7f51..6ec7319c2d2401 100644 --- a/ReactAndroid/src/test/java/com/facebook/react/BUCK +++ b/ReactAndroid/src/test/java/com/facebook/react/BUCK @@ -8,7 +8,7 @@ rn_robolectric_test( deps = [ YOGA_TARGET, react_native_dep("libraries/fbcore/src/test/java/com/facebook/powermock:powermock"), - react_native_dep("third-party/android/support/v4:lib-support-v4"), + react_native_dep("third-party/android/support/v4:support-v4"), react_native_dep("third-party/java/fest:fest"), react_native_dep("third-party/java/jsr-305:jsr-305"), react_native_dep("third-party/java/junit:junit"), diff --git a/ReactAndroid/src/test/java/com/facebook/react/fabric/BUCK b/ReactAndroid/src/test/java/com/facebook/react/fabric/BUCK index 7470610e7f12ae..38bb4561316d37 100644 --- a/ReactAndroid/src/test/java/com/facebook/react/fabric/BUCK +++ b/ReactAndroid/src/test/java/com/facebook/react/fabric/BUCK @@ -25,7 +25,7 @@ rn_robolectric_test( react_native_dep("third-party/java/robolectric3/robolectric:robolectric"), react_native_dep("libraries/fbcore/src/test/java/com/facebook/powermock:powermock"), react_native_dep("libraries/soloader/java/com/facebook/soloader:soloader"), - react_native_dep("third-party/android/support/v4:lib-support-v4"), + react_native_dep("third-party/android/support/v4:support-v4"), react_native_target("java/com/facebook/react:react"), react_native_target("java/com/facebook/react/bridge:bridge"), react_native_target("java/com/facebook/react/common:common"), diff --git a/ReactAndroid/src/test/java/com/facebook/react/modules/BUCK b/ReactAndroid/src/test/java/com/facebook/react/modules/BUCK index 2206284f930891..71ee9408344388 100644 --- a/ReactAndroid/src/test/java/com/facebook/react/modules/BUCK +++ b/ReactAndroid/src/test/java/com/facebook/react/modules/BUCK @@ -11,7 +11,7 @@ rn_robolectric_test( deps = [ YOGA_TARGET, react_native_dep("libraries/fbcore/src/test/java/com/facebook/powermock:powermock"), - react_native_dep("third-party/android/support/v4:lib-support-v4"), + react_native_dep("third-party/android/support/v4:support-v4"), react_native_dep("third-party/java/fest:fest"), react_native_dep("third-party/java/jsr-305:jsr-305"), react_native_dep("third-party/java/junit:junit"), diff --git a/ReactAndroid/src/test/java/com/facebook/react/uimanager/BUCK b/ReactAndroid/src/test/java/com/facebook/react/uimanager/BUCK index 917eef734d1504..872de31f5597da 100644 --- a/ReactAndroid/src/test/java/com/facebook/react/uimanager/BUCK +++ b/ReactAndroid/src/test/java/com/facebook/react/uimanager/BUCK @@ -17,7 +17,7 @@ rn_robolectric_test( deps = [ YOGA_TARGET, react_native_dep("libraries/fbcore/src/test/java/com/facebook/powermock:powermock"), - react_native_dep("third-party/android/support/v4:lib-support-v4"), + react_native_dep("third-party/android/support/v4:support-v4"), react_native_dep("third-party/java/fest:fest"), react_native_dep("third-party/java/jsr-305:jsr-305"), react_native_dep("third-party/java/junit:junit"), diff --git a/ReactAndroid/src/test/java/com/facebook/react/views/BUCK b/ReactAndroid/src/test/java/com/facebook/react/views/BUCK index de2c90b84f4083..cb1613364df6d6 100644 --- a/ReactAndroid/src/test/java/com/facebook/react/views/BUCK +++ b/ReactAndroid/src/test/java/com/facebook/react/views/BUCK @@ -14,7 +14,7 @@ rn_robolectric_test( react_native_dep("libraries/fresco/fresco-react-native:fresco-react-native"), react_native_dep("libraries/fresco/fresco-react-native:imagepipeline"), react_native_dep("libraries/soloader/java/com/facebook/soloader:soloader"), - react_native_dep("third-party/android/support/v4:lib-support-v4"), + react_native_dep("third-party/android/support/v4:support-v4"), react_native_dep("third-party/java/fest:fest"), react_native_dep("third-party/java/jsr-305:jsr-305"), react_native_dep("third-party/java/junit:junit"),