Revert D42014650: Remove legacy-support-core-ui

Differential Revision:
D42014650 (6fe6d08)

Original commit changeset: 4a4cf263fbd8

Original Phabricator Diff: D42014650 (6fe6d08)

fbshipit-source-id: 4eb8b6636b4c1672867ba66865c4bcda5421e6a1

ReactAndroid/src/androidTest/java/com/facebook/react/testing/BUCK

@@ -20,6 +20,7 @@ rn_android_library(
         react_native_dep("third-party/android/androidx:annotation"),
         react_native_dep("third-party/android/androidx:core"),
         react_native_dep("third-party/android/androidx:fragment"),
+        react_native_dep("third-party/android/androidx:legacy-support-core-ui"),
         react_native_dep("third-party/android/androidx:legacy-support-core-utils"),
         react_native_dep("third-party/java/buck-android-support:buck-android-support"),
         react_native_dep("third-party/java/infer-annotations:infer-annotations"),

ReactAndroid/src/androidTest/java/com/facebook/react/testing/network/BUCK

@@ -15,6 +15,7 @@ rn_android_library(
         react_native_dep("third-party/android/androidx:annotation"),
         react_native_dep("third-party/android/androidx:core"),
         react_native_dep("third-party/android/androidx:fragment"),
+        react_native_dep("third-party/android/androidx:legacy-support-core-ui"),
         react_native_dep("third-party/android/androidx:legacy-support-core-utils"),
         react_native_dep("third-party/java/jsr-305:jsr-305"),
         react_native_target("java/com/facebook/react/bridge:bridge"),

ReactAndroid/src/androidTest/java/com/facebook/react/testing/rule/BUCK

@@ -23,6 +23,7 @@ rn_android_library(
         react_native_dep("third-party/android/androidx:appcompat"),
         react_native_dep("third-party/android/androidx:core"),
         react_native_dep("third-party/android/androidx:fragment"),
+        react_native_dep("third-party/android/androidx:legacy-support-core-ui"),
         react_native_dep("third-party/android/androidx:legacy-support-core-utils"),
         react_native_dep("third-party/android/androidx:test-rules"),
         react_native_dep("third-party/android/androidx:test-runner"),

ReactAndroid/src/androidTest/java/com/facebook/react/tests/BUCK

@@ -13,6 +13,7 @@ rn_android_library(
         react_native_dep("third-party/android/androidx:appcompat"),
         react_native_dep("third-party/android/androidx:core"),
         react_native_dep("third-party/android/androidx:fragment"),
+        react_native_dep("third-party/android/androidx:legacy-support-core-ui"),
         react_native_dep("third-party/android/androidx:legacy-support-core-utils"),
         react_native_dep("third-party/java/jsr-305:jsr-305"),
         react_native_dep("third-party/java/junit:junit"),

ReactAndroid/src/main/java/com/facebook/react/BUCK

@@ -15,6 +15,7 @@ rn_android_library(
         react_native_dep("third-party/android/androidx:appcompat"),
         react_native_dep("third-party/android/androidx:core"),
         react_native_dep("third-party/android/androidx:fragment"),
+        react_native_dep("third-party/android/androidx:legacy-support-core-ui"),
         react_native_dep("third-party/android/androidx:legacy-support-core-utils"),
         react_native_dep("third-party/android/androidx:autofill"),
     ],

ReactAndroid/src/main/java/com/facebook/react/animated/BUCK

@@ -14,6 +14,7 @@ rn_android_library(
         react_native_dep("third-party/android/androidx:annotation"),
         react_native_dep("third-party/android/androidx:core"),
         react_native_dep("third-party/android/androidx:fragment"),
+        react_native_dep("third-party/android/androidx:legacy-support-core-ui"),
         react_native_dep("third-party/android/androidx:legacy-support-core-utils"),
     ],
     visibility = [

ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK

@@ -30,6 +30,7 @@ rn_android_library(
         react_native_dep("third-party/android/androidx:annotation"),
         react_native_dep("third-party/android/androidx:core"),
         react_native_dep("third-party/android/androidx:fragment"),
+        react_native_dep("third-party/android/androidx:legacy-support-core-ui"),
         react_native_dep("third-party/android/androidx:legacy-support-core-utils"),
     ],
     required_for_source_only_abi = True,
@@ -77,6 +78,7 @@ rn_android_library(
         react_native_dep("third-party/android/androidx:annotation"),
         react_native_dep("third-party/android/androidx:core"),
         react_native_dep("third-party/android/androidx:fragment"),
+        react_native_dep("third-party/android/androidx:legacy-support-core-ui"),
         react_native_dep("third-party/android/androidx:legacy-support-core-utils"),
     ],
     required_for_source_only_abi = True,

ReactAndroid/src/main/java/com/facebook/react/common/BUCK

@@ -20,6 +20,7 @@ rn_android_library(
         react_native_dep("third-party/android/androidx:annotation"),
         react_native_dep("third-party/android/androidx:core"),
         react_native_dep("third-party/android/androidx:fragment"),
+        react_native_dep("third-party/android/androidx:legacy-support-core-ui"),
         react_native_dep("third-party/android/androidx:legacy-support-core-utils"),
     ],
     required_for_source_only_abi = True,

ReactAndroid/src/main/java/com/facebook/react/devsupport/BUCK

@@ -12,6 +12,7 @@ rn_android_library(
     provided_deps = [
         react_native_dep("third-party/android/androidx:core"),
         react_native_dep("third-party/android/androidx:fragment"),
+        react_native_dep("third-party/android/androidx:legacy-support-core-ui"),
         react_native_dep("third-party/android/androidx:legacy-support-core-utils"),
     ],
     visibility = [

ReactAndroid/src/main/java/com/facebook/react/fabric/BUCK

@@ -20,6 +20,7 @@ rn_android_library(
         react_native_dep("third-party/android/androidx:annotation"),
         react_native_dep("third-party/android/androidx:core"),
         react_native_dep("third-party/android/androidx:fragment"),
+        react_native_dep("third-party/android/androidx:legacy-support-core-ui"),
         react_native_dep("third-party/android/androidx:legacy-support-core-utils"),
     ],
     pure_kotlin = False,

ReactAndroid/src/main/java/com/facebook/react/modules/blob/BUCK

@@ -12,6 +12,7 @@ rn_android_library(
         react_native_dep("third-party/android/androidx:annotation"),
         react_native_dep("third-party/android/androidx:core"),
         react_native_dep("third-party/android/androidx:fragment"),
+        react_native_dep("third-party/android/androidx:legacy-support-core-ui"),
         react_native_dep("third-party/android/androidx:legacy-support-core-utils"),
     ],
     visibility = [

ReactAndroid/src/main/java/com/facebook/react/modules/fresco/BUCK

@@ -12,6 +12,7 @@ rn_android_library(
         react_native_dep("third-party/android/androidx:annotation"),
         react_native_dep("third-party/android/androidx:core"),
         react_native_dep("third-party/android/androidx:fragment"),
+        react_native_dep("third-party/android/androidx:legacy-support-core-ui"),
         react_native_dep("third-party/android/androidx:legacy-support-core-utils"),
     ],
     visibility = [

ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/BUCK

@@ -12,6 +12,7 @@ rn_android_library(
         react_native_dep("third-party/android/androidx:annotation"),
         react_native_dep("third-party/android/androidx:core"),
         react_native_dep("third-party/android/androidx:fragment"),
+        react_native_dep("third-party/android/androidx:legacy-support-core-ui"),
         react_native_dep("third-party/android/androidx:legacy-support-core-utils"),
     ],
     visibility = [

ReactAndroid/src/main/java/com/facebook/react/modules/network/BUCK

@@ -12,6 +12,7 @@ rn_android_library(
         react_native_dep("third-party/android/androidx:annotation"),
         react_native_dep("third-party/android/androidx:core"),
         react_native_dep("third-party/android/androidx:fragment"),
+        react_native_dep("third-party/android/androidx:legacy-support-core-ui"),
         react_native_dep("third-party/android/androidx:legacy-support-core-utils"),
     ],
     visibility = [

ReactAndroid/src/main/java/com/facebook/react/modules/statusbar/BUCK

@@ -12,6 +12,7 @@ rn_android_library(
         react_native_dep("third-party/android/androidx:annotation"),
         react_native_dep("third-party/android/androidx:core"),
         react_native_dep("third-party/android/androidx:fragment"),
+        react_native_dep("third-party/android/androidx:legacy-support-core-ui"),
         react_native_dep("third-party/android/androidx:legacy-support-core-utils"),
     ],
     visibility = [

ReactAndroid/src/main/java/com/facebook/react/shell/BUCK

@@ -12,6 +12,7 @@ rn_android_library(
         react_native_dep("third-party/android/androidx:annotation"),
         react_native_dep("third-party/android/androidx:core"),
         react_native_dep("third-party/android/androidx:fragment"),
+        react_native_dep("third-party/android/androidx:legacy-support-core-ui"),
         react_native_dep("third-party/android/androidx:legacy-support-core-utils"),
     ],
     visibility = [

ReactAndroid/src/main/java/com/facebook/react/surface/BUCK

@@ -17,6 +17,7 @@ rn_android_library(
         react_native_dep("third-party/android/androidx:annotation"),
         react_native_dep("third-party/android/androidx:core"),
         react_native_dep("third-party/android/androidx:fragment"),
+        react_native_dep("third-party/android/androidx:legacy-support-core-ui"),
         react_native_dep("third-party/android/androidx:legacy-support-core-utils"),
         react_native_dep("third-party/java/infer-annotations:infer-annotations"),
         react_native_dep("third-party/java/jsr-305:jsr-305"),

ReactAndroid/src/main/java/com/facebook/react/uimanager/BUCK

@@ -55,6 +55,7 @@ rn_android_library(
     provided_deps = [
         react_native_dep("third-party/android/androidx:core"),
         react_native_dep("third-party/android/androidx:fragment"),
+        react_native_dep("third-party/android/androidx:legacy-support-core-ui"),
         react_native_dep("third-party/android/androidx:legacy-support-core-utils"),
     ],
     required_for_source_only_abi = True,

ReactAndroid/src/main/java/com/facebook/react/uimanager/common/BUCK

@@ -12,6 +12,7 @@ rn_android_library(
         react_native_dep("third-party/android/androidx:annotation"),
         react_native_dep("third-party/android/androidx:core"),
         react_native_dep("third-party/android/androidx:fragment"),
+        react_native_dep("third-party/android/androidx:legacy-support-core-ui"),
         react_native_dep("third-party/android/androidx:legacy-support-core-utils"),
     ],
     required_for_source_only_abi = True,

ReactAndroid/src/main/java/com/facebook/react/views/common/BUCK

@@ -13,6 +13,7 @@ rn_android_library(
         react_native_dep("third-party/android/androidx:annotation"),
         react_native_dep("third-party/android/androidx:core"),
         react_native_dep("third-party/android/androidx:fragment"),
+        react_native_dep("third-party/android/androidx:legacy-support-core-ui"),
         react_native_dep("third-party/android/androidx:legacy-support-core-utils"),
     ],
     visibility = [

ReactAndroid/src/main/java/com/facebook/react/views/drawer/BUCK

@@ -11,8 +11,8 @@ rn_android_library(
     provided_deps = [
         react_native_dep("third-party/android/androidx:annotation"),
         react_native_dep("third-party/android/androidx:core"),
-        react_native_dep("third-party/android/androidx:drawerlayout"),
         react_native_dep("third-party/android/androidx:fragment"),
+        react_native_dep("third-party/android/androidx:legacy-support-core-ui"),
         react_native_dep("third-party/android/androidx:legacy-support-core-utils"),
     ],
     visibility = [

ReactAndroid/src/main/java/com/facebook/react/views/image/BUCK

@@ -16,6 +16,7 @@ rn_android_library(
         react_native_dep("third-party/android/androidx:annotation"),
         react_native_dep("third-party/android/androidx:core"),
         react_native_dep("third-party/android/androidx:fragment"),
+        react_native_dep("third-party/android/androidx:legacy-support-core-ui"),
         react_native_dep("third-party/android/androidx:legacy-support-core-utils"),
     ],
     required_for_source_only_abi = True,
@@ -42,6 +43,7 @@ rn_android_library(
         react_native_dep("third-party/android/androidx:annotation"),
         react_native_dep("third-party/android/androidx:core"),
         react_native_dep("third-party/android/androidx:fragment"),
+        react_native_dep("third-party/android/androidx:legacy-support-core-ui"),
         react_native_dep("third-party/android/androidx:legacy-support-core-utils"),
     ],
     visibility = [

ReactAndroid/src/main/java/com/facebook/react/views/scroll/BUCK

@@ -12,6 +12,7 @@ rn_android_library(
         react_native_dep("third-party/android/androidx:annotation"),
         react_native_dep("third-party/android/androidx:core"),
         react_native_dep("third-party/android/androidx:fragment"),
+        react_native_dep("third-party/android/androidx:legacy-support-core-ui"),
         react_native_dep("third-party/android/androidx:legacy-support-core-utils"),
     ],
     visibility = [

ReactAndroid/src/main/java/com/facebook/react/views/slider/BUCK

@@ -17,6 +17,7 @@ rn_android_library(
         react_native_dep("third-party/android/androidx:appcompat"),
         react_native_dep("third-party/android/androidx:core"),
         react_native_dep("third-party/android/androidx:fragment"),
+        react_native_dep("third-party/android/androidx:legacy-support-core-ui"),
         react_native_dep("third-party/android/androidx:legacy-support-core-utils"),
         react_native_dep("third-party/java/jsr-305:jsr-305"),
         react_native_target("java/com/facebook/react/bridge:bridge"),

ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/BUCK

@@ -12,13 +12,13 @@ rn_android_library(
         react_native_dep("third-party/android/androidx:annotation"),
         react_native_dep("third-party/android/androidx:core"),
         react_native_dep("third-party/android/androidx:fragment"),
+        react_native_dep("third-party/android/androidx:legacy-support-core-ui"),
         react_native_dep("third-party/android/androidx:legacy-support-core-utils"),
     ],
     visibility = [
         "PUBLIC",
     ],
     deps = [
-        react_native_dep("third-party/android/androidx:swiperefreshlayout"),
         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"),

ReactAndroid/src/main/java/com/facebook/react/views/switchview/BUCK

@@ -12,6 +12,7 @@ rn_android_library(
         react_native_dep("third-party/android/androidx:appcompat"),
         react_native_dep("third-party/android/androidx:core"),
         react_native_dep("third-party/android/androidx:fragment"),
+        react_native_dep("third-party/android/androidx:legacy-support-core-ui"),
         react_native_dep("third-party/android/androidx:legacy-support-core-utils"),
     ],
     visibility = [

ReactAndroid/src/main/java/com/facebook/react/views/text/BUCK

@@ -22,6 +22,7 @@ rn_android_library(
         react_native_dep("third-party/android/androidx:appcompat"),
         react_native_dep("third-party/android/androidx:core"),
         react_native_dep("third-party/android/androidx:fragment"),
+        react_native_dep("third-party/android/androidx:legacy-support-core-ui"),
         react_native_dep("third-party/android/androidx:legacy-support-core-utils"),
         react_native_dep("libraries/fbcore/src/main/java/com/facebook/common/logging:logging"),
         react_native_dep("third-party/java/infer-annotations:infer-annotations"),

ReactAndroid/src/main/java/com/facebook/react/views/unimplementedview/BUCK

@@ -12,6 +12,7 @@ rn_android_library(
         react_native_dep("third-party/android/androidx:annotation"),
         react_native_dep("third-party/android/androidx:core"),
         react_native_dep("third-party/android/androidx:fragment"),
+        react_native_dep("third-party/android/androidx:legacy-support-core-ui"),
         react_native_dep("third-party/android/androidx:legacy-support-core-utils"),
         react_native_dep("third-party/android/androidx:appcompat"),
     ],

ReactAndroid/src/main/java/com/facebook/react/views/view/BUCK

@@ -14,6 +14,7 @@ rn_android_library(
     provided_deps = [
         react_native_dep("third-party/android/androidx:core"),
         react_native_dep("third-party/android/androidx:fragment"),
+        react_native_dep("third-party/android/androidx:legacy-support-core-ui"),
         react_native_dep("third-party/android/androidx:legacy-support-core-utils"),
     ],
     pure_kotlin = False,

ReactAndroid/src/main/third-party/android/androidx/BUCK

@@ -138,6 +138,7 @@ fb_native.android_library(
         ":annotation",
         ":core",
         ":fragment-binary",
+        ":legacy-support-core-ui",
         ":legacy-support-core-utils",
         ":lifecycle-viewmodel",
         ":loader",
@@ -153,6 +154,26 @@ fb_native.android_library(
     ],
 )
 
+fb_native.android_library(
+    name = "legacy-support-core-ui",
+    visibility = ["PUBLIC"],
+    exported_deps = [
+        ":annotation",
+        ":asynclayoutinflater",
+        ":coordinatorlayout",
+        ":core",
+        ":cursoradapter",
+        ":customview",
+        ":drawerlayout",
+        ":interpolator",
+        ":legacy-support-core-ui-binary",
+        ":legacy-support-core-utils",
+        ":slidingpanelayout",
+        ":swiperefreshlayout",
+        ":viewpager",
+    ],
+)
+
 fb_native.android_library(
     name = "legacy-support-core-utils",
     visibility = ["PUBLIC"],
@@ -321,6 +342,7 @@ fb_native.android_library(
     name = "vectordrawable-animated",
     visibility = ["PUBLIC"],
     exported_deps = [
+        ":legacy-support-core-ui",
         ":vectordrawable",
         ":vectordrawable-animated-binary",
     ],
@@ -423,6 +445,11 @@ fb_native.android_prebuilt_aar(
     aar = ":interpolator-binary-aar",
 )
 
+fb_native.android_prebuilt_aar(
+    name = "legacy-support-core-ui-binary",
+    aar = ":legacy-support-core-ui-binary-aar",
+)
+
 fb_native.android_prebuilt_aar(
     name = "legacy-support-core-utils-binary",
     aar = ":legacy-support-core-utils-binary-aar",
@@ -615,6 +642,12 @@ fb_native.remote_file(
     url = "mvn:androidx.interpolator:interpolator:aar:1.0.0",
 )
 
+fb_native.remote_file(
+    name = "legacy-support-core-ui-binary-aar",
+    sha1 = "61a264f996046e059f889914050fae1e75d3b702",
+    url = "mvn:androidx.legacy:legacy-support-core-ui:aar:1.0.0",
+)
+
 fb_native.remote_file(
     name = "legacy-support-core-utils-binary-aar",
     sha1 = "9b9570042115da8629519090dfeb71df75da59fc",

ReactAndroid/src/test/java/com/facebook/react/BUCK

@@ -10,6 +10,7 @@ rn_robolectric_test(
         react_native_dep("third-party/android/androidx:annotation"),
         react_native_dep("third-party/android/androidx:core"),
         react_native_dep("third-party/android/androidx:fragment"),
+        react_native_dep("third-party/android/androidx:legacy-support-core-ui"),
         react_native_dep("third-party/android/androidx:legacy-support-core-utils"),
         react_native_dep("third-party/java/assertj:assertj-core"),
         react_native_dep("third-party/java/jsr-305:jsr-305"),

ReactAndroid/src/test/java/com/facebook/react/modules/BUCK

@@ -13,6 +13,7 @@ rn_robolectric_test(
         react_native_dep("third-party/android/androidx:annotation"),
         react_native_dep("third-party/android/androidx:core"),
         react_native_dep("third-party/android/androidx:fragment"),
+        react_native_dep("third-party/android/androidx:legacy-support-core-ui"),
         react_native_dep("third-party/android/androidx:legacy-support-core-utils"),
         react_native_dep("third-party/java/assertj:assertj-core"),
         react_native_dep("third-party/java/jsr-305:jsr-305"),

ReactAndroid/src/test/java/com/facebook/react/uimanager/BUCK

@@ -19,6 +19,7 @@ rn_robolectric_test(
         react_native_dep("third-party/android/androidx:annotation"),
         react_native_dep("third-party/android/androidx:core"),
         react_native_dep("third-party/android/androidx:fragment"),
+        react_native_dep("third-party/android/androidx:legacy-support-core-ui"),
         react_native_dep("third-party/android/androidx:legacy-support-core-utils"),
         react_native_dep("third-party/java/assertj:assertj-core"),
         react_native_dep("third-party/java/jsr-305:jsr-305"),

ReactAndroid/src/test/java/com/facebook/react/views/BUCK

@@ -19,6 +19,7 @@ rn_robolectric_test(
         react_native_dep("third-party/android/androidx:annotation"),
         react_native_dep("third-party/android/androidx:core"),
         react_native_dep("third-party/android/androidx:fragment"),
+        react_native_dep("third-party/android/androidx:legacy-support-core-ui"),
         react_native_dep("third-party/android/androidx:legacy-support-core-utils"),
         react_native_dep("third-party/java/assertj:assertj-core"),
         react_native_dep("third-party/java/jsr-305:jsr-305"),

packages/rn-tester/android/app/_BUCK

@@ -19,6 +19,7 @@ rn_android_library(
         react_native_dep("third-party/android/androidx:appcompat"),
         react_native_dep("third-party/android/androidx:core"),
         react_native_dep("third-party/android/androidx:fragment"),
+        react_native_dep("third-party/android/androidx:legacy-support-core-ui"),
         react_native_dep("third-party/android/androidx:legacy-support-core-utils"),
         react_native_dep("third-party/java/jsr-305:jsr-305"),
         react_native_target("java/com/facebook/react:react"),