From 87acdfb436a63185319276dc24884e4ced29bac2 Mon Sep 17 00:00:00 2001 From: Joshua Selbo Date: Wed, 5 Oct 2022 13:49:48 -0700 Subject: [PATCH] Remove androidx args on library wrappers Summary: Changelog: [Internal][Removed] - Remove legacy AndroidX arguments on buck targets Differential Revision: D39835294 fbshipit-source-id: dbbdd7546d60c459b7f9184654dad7a8d5a196e8 --- .../src/androidTest/java/com/facebook/react/testing/BUCK | 1 - .../java/com/facebook/react/testing/idledetection/BUCK | 1 - .../src/androidTest/java/com/facebook/react/testing/rule/BUCK | 1 - .../src/androidTest/java/com/facebook/react/tests/BUCK | 1 - .../src/androidTest/java/com/facebook/react/tests/core/BUCK | 1 - ReactAndroid/src/main/java/com/facebook/react/BUCK | 1 - ReactAndroid/src/main/java/com/facebook/react/animated/BUCK | 1 - ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK | 2 -- ReactAndroid/src/main/java/com/facebook/react/common/BUCK | 1 - .../src/main/java/com/facebook/react/common/mapbuffer/BUCK | 1 - ReactAndroid/src/main/java/com/facebook/react/devsupport/BUCK | 2 -- ReactAndroid/src/main/java/com/facebook/react/fabric/BUCK | 1 - .../java/com/facebook/react/modules/accessibilityinfo/BUCK | 1 - .../src/main/java/com/facebook/react/modules/appearance/BUCK | 1 - .../src/main/java/com/facebook/react/modules/blob/BUCK | 1 - .../src/main/java/com/facebook/react/modules/bundleloader/BUCK | 1 - .../src/main/java/com/facebook/react/modules/camera/BUCK | 1 - .../src/main/java/com/facebook/react/modules/core/BUCK | 1 - .../src/main/java/com/facebook/react/modules/debug/BUCK | 1 - .../src/main/java/com/facebook/react/modules/deviceinfo/BUCK | 1 - .../src/main/java/com/facebook/react/modules/dialog/BUCK | 1 - .../src/main/java/com/facebook/react/modules/fresco/BUCK | 1 - .../src/main/java/com/facebook/react/modules/i18nmanager/BUCK | 1 - .../src/main/java/com/facebook/react/modules/image/BUCK | 1 - .../src/main/java/com/facebook/react/modules/intent/BUCK | 1 - .../src/main/java/com/facebook/react/modules/network/BUCK | 1 - .../src/main/java/com/facebook/react/modules/sound/BUCK | 1 - .../src/main/java/com/facebook/react/modules/statusbar/BUCK | 1 - .../src/main/java/com/facebook/react/modules/storage/BUCK | 1 - .../src/main/java/com/facebook/react/modules/systeminfo/BUCK | 2 -- .../src/main/java/com/facebook/react/modules/websocket/BUCK | 1 - .../src/main/java/com/facebook/react/packagerconnection/BUCK | 1 - ReactAndroid/src/main/java/com/facebook/react/shell/BUCK | 1 - ReactAndroid/src/main/java/com/facebook/react/surface/BUCK | 1 - ReactAndroid/src/main/java/com/facebook/react/touch/BUCK | 1 - .../java/com/facebook/react/turbomodule/core/interfaces/BUCK | 1 - ReactAndroid/src/main/java/com/facebook/react/uimanager/BUCK | 3 --- .../main/java/com/facebook/react/uimanager/annotations/BUCK | 1 - .../src/main/java/com/facebook/react/uimanager/common/BUCK | 1 - .../src/main/java/com/facebook/react/uimanager/util/BUCK | 1 - .../src/main/java/com/facebook/react/views/common/BUCK | 1 - .../src/main/java/com/facebook/react/views/drawer/BUCK | 1 - ReactAndroid/src/main/java/com/facebook/react/views/image/BUCK | 2 -- .../src/main/java/com/facebook/react/views/imagehelper/BUCK | 2 -- ReactAndroid/src/main/java/com/facebook/react/views/modal/BUCK | 1 - .../src/main/java/com/facebook/react/views/progressbar/BUCK | 1 - .../src/main/java/com/facebook/react/views/scroll/BUCK | 1 - .../src/main/java/com/facebook/react/views/slider/BUCK | 1 - .../src/main/java/com/facebook/react/views/swiperefresh/BUCK | 1 - .../src/main/java/com/facebook/react/views/switchview/BUCK | 1 - ReactAndroid/src/main/java/com/facebook/react/views/text/BUCK | 1 - .../main/java/com/facebook/react/views/text/frescosupport/BUCK | 1 - .../src/main/java/com/facebook/react/views/textinput/BUCK | 1 - .../main/java/com/facebook/react/views/unimplementedview/BUCK | 1 - ReactAndroid/src/main/java/com/facebook/react/views/view/BUCK | 1 - packages/rn-tester/android/app/_BUCK | 1 - tools/build_defs/oss/rn_defs.bzl | 3 --- 57 files changed, 66 deletions(-) diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/BUCK b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/BUCK index 6fd26eed858..b26a35bdc13 100644 --- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/BUCK +++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/BUCK @@ -10,7 +10,6 @@ rn_android_library( ], ), autoglob = False, - is_androidx = True, language = "JAVA", visibility = [ "PUBLIC", 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 cbfd829e308..3823068318f 100644 --- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/BUCK +++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/BUCK @@ -4,7 +4,6 @@ rn_android_library( name = "idledetection", srcs = glob(["**/*.java"]), autoglob = False, - is_androidx = True, language = "JAVA", visibility = [ "PUBLIC", 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 b5ee34ece70..5cd084b3b8b 100644 --- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/rule/BUCK +++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/rule/BUCK @@ -11,7 +11,6 @@ rn_android_library( name = "rule", srcs = glob(["*.java"]), autoglob = False, - is_androidx = True, language = "JAVA", visibility = [ "PUBLIC", diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/BUCK b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/BUCK index 9fddb2d16ba..5b08ffe862f 100644 --- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/BUCK +++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/BUCK @@ -4,7 +4,6 @@ rn_android_library( name = "tests", srcs = glob(["*.java"]), autoglob = False, - is_androidx = True, language = "JAVA", visibility = [ "PUBLIC", 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 8ad673708e4..7689d9ff310 100644 --- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/core/BUCK +++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/core/BUCK @@ -11,7 +11,6 @@ rn_android_library( name = "core", srcs = glob(["*.java"]), autoglob = False, - is_androidx = True, language = "JAVA", deps = [ react_native_dep("third-party/android/androidx:test-espresso-core"), diff --git a/ReactAndroid/src/main/java/com/facebook/react/BUCK b/ReactAndroid/src/main/java/com/facebook/react/BUCK index 7425996b563..0d19c05abb2 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/BUCK @@ -4,7 +4,6 @@ rn_android_library( name = "react", srcs = glob(["*.java"]), autoglob = False, - is_androidx = True, labels = [ "pfh:ReactNative_CommonInfrastructurePlaceholder", "supermodule:xplat/default/public.react_native.infra", diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/BUCK b/ReactAndroid/src/main/java/com/facebook/react/animated/BUCK index dccd121b3e8..0338f109ca4 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/animated/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/animated/BUCK @@ -6,7 +6,6 @@ rn_android_library( "*.java", ]), autoglob = False, - is_androidx = True, labels = [ "pfh:ReactNative_CommonInfrastructurePlaceholder", "supermodule:xplat/default/public.react_native.infra", diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK b/ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK index 2e19dc700b1..a4a184ee960 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK @@ -21,7 +21,6 @@ rn_android_library( exclude = INTERFACES, ), autoglob = False, - is_androidx = True, labels = [ "pfh:ReactNative_CommonInfrastructurePlaceholder", "supermodule:xplat/default/public.react_native.infra", @@ -71,7 +70,6 @@ rn_android_library( name = "interfaces", srcs = glob(INTERFACES), autoglob = False, - is_androidx = True, labels = [ "pfh:ReactNative_CommonInfrastructurePlaceholder", "supermodule:xplat/default/public.react_native.infra", diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/BUCK b/ReactAndroid/src/main/java/com/facebook/react/common/BUCK index a654b44e727..72d22b5d904 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/common/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/common/BUCK @@ -12,7 +12,6 @@ rn_android_library( exclude = SUB_PROJECTS, ), autoglob = False, - is_androidx = True, labels = [ "pfh:ReactNative_CommonInfrastructurePlaceholder", "supermodule:xplat/default/public.react_native.infra", diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/BUCK b/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/BUCK index cf73290ace2..9df3e38fea0 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/BUCK @@ -7,7 +7,6 @@ rn_android_library( "*.kt", ]), autoglob = False, - is_androidx = True, labels = [ "pfh:ReactNative_CommonInfrastructurePlaceholder", "supermodule:xplat/default/public.react_native.infra", diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/BUCK b/ReactAndroid/src/main/java/com/facebook/react/devsupport/BUCK index 5dd56e4c3b9..e5fefce0739 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/BUCK @@ -4,7 +4,6 @@ rn_android_library( name = "devsupport", srcs = glob(["*.java"]), autoglob = False, - is_androidx = True, labels = [ "pfh:ReactNative_CommonInfrastructurePlaceholder", "supermodule:xplat/default/public.react_native.infra", @@ -52,7 +51,6 @@ rn_android_library( name = "interfaces", srcs = glob(["interfaces/*.java"]), autoglob = False, - is_androidx = True, labels = [ "pfh:ReactNative_CommonInfrastructurePlaceholder", "supermodule:xplat/default/public.react_native.infra", diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/BUCK b/ReactAndroid/src/main/java/com/facebook/react/fabric/BUCK index b619d69ccab..3d87775297e 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/BUCK @@ -12,7 +12,6 @@ rn_android_library( "mounting/**/*.java", ]), autoglob = False, - is_androidx = True, labels = [ "pfh:ReactNative_CommonInfrastructurePlaceholder", "supermodule:xplat/default/public.react_native.infra", diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/accessibilityinfo/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/accessibilityinfo/BUCK index 6b1d56805ef..38d30f79574 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/accessibilityinfo/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/accessibilityinfo/BUCK @@ -4,7 +4,6 @@ rn_android_library( name = "accessibilityinfo", srcs = glob(["**/*.java"]), autoglob = False, - is_androidx = True, labels = [ "pfh:ReactNative_CommonInfrastructurePlaceholder", "supermodule:xplat/default/public.react_native.infra", diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/appearance/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/appearance/BUCK index 8b52d631c61..8c049346b4d 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/appearance/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/appearance/BUCK @@ -4,7 +4,6 @@ rn_android_library( name = "appearance", srcs = glob(["**/*.java"]), autoglob = False, - is_androidx = True, labels = [ "pfh:ReactNative_CommonInfrastructurePlaceholder", "supermodule:xplat/default/public.react_native.infra", 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 9986f483230..1ee7922e990 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BUCK @@ -4,7 +4,6 @@ rn_android_library( name = "blob", srcs = glob(["**/*.java"]), autoglob = False, - is_androidx = True, labels = [ "pfh:ReactNative_CommonInfrastructurePlaceholder", "supermodule:xplat/default/public.react_native.infra", diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/bundleloader/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/bundleloader/BUCK index 90789e450a3..eecf913ab61 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/bundleloader/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/bundleloader/BUCK @@ -4,7 +4,6 @@ rn_android_library( name = "bundleloader", srcs = glob(["*.java"]), autoglob = False, - is_androidx = True, labels = [ "pfh:ReactNative_CommonInfrastructurePlaceholder", "supermodule:xplat/default/public.react_native.infra", diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/camera/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/camera/BUCK index b16798bf487..63a6461624d 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/camera/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/camera/BUCK @@ -4,7 +4,6 @@ rn_android_library( name = "camera", srcs = glob(["**/*.java"]), autoglob = False, - is_androidx = True, labels = [ "pfh:ReactNative_CommonInfrastructurePlaceholder", "supermodule:xplat/default/public.react_native.infra", diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/core/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/core/BUCK index f92e3e18f8e..2dd59ad7934 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/core/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/core/BUCK @@ -4,7 +4,6 @@ rn_android_library( name = "core", srcs = glob(["**/*.java"]), autoglob = False, - is_androidx = True, labels = [ "pfh:ReactNative_CommonInfrastructurePlaceholder", "supermodule:xplat/default/public.react_native.infra", diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/debug/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/debug/BUCK index 0eee8c6c07b..d04b516ddbe 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/debug/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/debug/BUCK @@ -4,7 +4,6 @@ rn_android_library( name = "debug", srcs = glob(["*.java"]), autoglob = False, - is_androidx = True, labels = [ "pfh:ReactNative_CommonInfrastructurePlaceholder", "supermodule:xplat/default/public.react_native.infra", diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/BUCK index 67398a892f6..242477710c4 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/BUCK @@ -4,7 +4,6 @@ rn_android_library( name = "deviceinfo", srcs = glob(["**/*.java"]), autoglob = False, - is_androidx = True, labels = [ "pfh:ReactNative_CommonInfrastructurePlaceholder", "supermodule:xplat/default/public.react_native.infra", 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 17f1ff6e260..7aa3ae4f7e4 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/BUCK @@ -4,7 +4,6 @@ rn_android_library( name = "dialog", srcs = glob(["**/*.java"]), autoglob = False, - is_androidx = True, labels = [ "pfh:ReactNative_CommonInfrastructurePlaceholder", "supermodule:xplat/default/public.react_native.infra", 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 edef8dc8e32..61f5a7ff841 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/BUCK @@ -4,7 +4,6 @@ rn_android_library( name = "fresco", srcs = glob(["**/*.java"]), autoglob = False, - is_androidx = True, labels = [ "pfh:ReactNative_CommonInfrastructurePlaceholder", "supermodule:xplat/default/public.react_native.infra", 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 c574ef4317a..36ece730ccc 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/BUCK @@ -4,7 +4,6 @@ rn_android_library( name = "i18nmanager", srcs = glob(["*.java"]), autoglob = False, - is_androidx = True, labels = [ "pfh:ReactNative_CommonInfrastructurePlaceholder", "supermodule:xplat/default/public.react_native.infra", diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/image/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/image/BUCK index e3fd907c5a1..a7d8147d96b 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/image/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/image/BUCK @@ -4,7 +4,6 @@ rn_android_library( name = "image", srcs = glob(["*.java"]), autoglob = False, - is_androidx = True, labels = [ "pfh:ReactNative_CommonInfrastructurePlaceholder", "supermodule:xplat/default/public.react_native.infra", diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/intent/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/intent/BUCK index c09e21e5b79..90085b857a4 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/intent/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/intent/BUCK @@ -4,7 +4,6 @@ rn_android_library( name = "intent", srcs = glob(["**/*.java"]), autoglob = False, - is_androidx = True, labels = [ "pfh:ReactNative_CommonInfrastructurePlaceholder", "supermodule:xplat/default/public.react_native.infra", 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 4b7d7e2b950..a5b303e804b 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/network/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/network/BUCK @@ -4,7 +4,6 @@ rn_android_library( name = "network", srcs = glob(["**/*.java"]), autoglob = False, - is_androidx = True, labels = [ "pfh:ReactNative_CommonInfrastructurePlaceholder", "supermodule:xplat/default/public.react_native.infra", diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/sound/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/sound/BUCK index 0351a135f76..cfced8fd4de 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/sound/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/sound/BUCK @@ -4,7 +4,6 @@ rn_android_library( name = "sound", srcs = glob(["**/*.java"]), autoglob = False, - is_androidx = True, labels = [ "pfh:ReactNative_CommonInfrastructurePlaceholder", "supermodule:xplat/default/public.react_native.infra", 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 89c9b6991f7..0e30979aa4e 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/statusbar/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/statusbar/BUCK @@ -4,7 +4,6 @@ rn_android_library( name = "statusbar", srcs = glob(["**/*.java"]), autoglob = False, - is_androidx = True, labels = [ "pfh:ReactNative_CommonInfrastructurePlaceholder", "supermodule:xplat/default/public.react_native.infra", diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/storage/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/storage/BUCK index 73632c65b44..657049a8286 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/storage/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/storage/BUCK @@ -4,7 +4,6 @@ rn_android_library( name = "storage", srcs = glob(["**/*.java"]), autoglob = False, - is_androidx = True, labels = [ "pfh:ReactNative_CommonInfrastructurePlaceholder", "supermodule:xplat/default/public.react_native.infra", diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/BUCK index 1fcefc767c9..bb8f5fb90e9 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/BUCK @@ -7,7 +7,6 @@ rn_android_library( "ReactNativeVersion.java", ], autoglob = False, - is_androidx = True, labels = [ "pfh:ReactNative_CommonInfrastructurePlaceholder", "supermodule:xplat/default/public.react_native.infra", @@ -37,7 +36,6 @@ rn_android_library( "AndroidInfoHelpers.java", ], autoglob = False, - is_androidx = True, labels = [ "pfh:ReactNative_CommonInfrastructurePlaceholder", "supermodule:xplat/default/public.react_native.infra", diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/websocket/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/websocket/BUCK index 4a94227ae28..19d66776d63 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/websocket/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/websocket/BUCK @@ -4,7 +4,6 @@ rn_android_library( name = "websocket", srcs = glob(["**/*.java"]), autoglob = False, - is_androidx = True, labels = [ "pfh:ReactNative_CommonInfrastructurePlaceholder", "supermodule:xplat/default/public.react_native.infra", diff --git a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/BUCK b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/BUCK index a0a16974d46..42c6a3f5e4b 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/BUCK @@ -6,7 +6,6 @@ rn_android_library( ["**/*.java"], ), autoglob = False, - is_androidx = True, labels = [ "pfh:ReactNative_CommonInfrastructurePlaceholder", "supermodule:xplat/default/public.react_native.infra", diff --git a/ReactAndroid/src/main/java/com/facebook/react/shell/BUCK b/ReactAndroid/src/main/java/com/facebook/react/shell/BUCK index 65bf1513c1c..bb87ef93981 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/shell/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/shell/BUCK @@ -4,7 +4,6 @@ rn_android_library( name = "shell", srcs = glob(["**/*.java"]), autoglob = False, - is_androidx = True, labels = [ "pfh:ReactNative_CommonInfrastructurePlaceholder", "supermodule:xplat/default/public.react_native.infra", diff --git a/ReactAndroid/src/main/java/com/facebook/react/surface/BUCK b/ReactAndroid/src/main/java/com/facebook/react/surface/BUCK index 5dd4efa696a..d3d5528ba05 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/surface/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/surface/BUCK @@ -4,7 +4,6 @@ rn_android_library( name = "surface", srcs = glob(["*.java"]), autoglob = False, - is_androidx = True, labels = [ "pfh:ReactNative_CommonInfrastructurePlaceholder", "supermodule:xplat/default/public.react_native.infra", diff --git a/ReactAndroid/src/main/java/com/facebook/react/touch/BUCK b/ReactAndroid/src/main/java/com/facebook/react/touch/BUCK index a9771388ede..e5471242b5e 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/touch/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/touch/BUCK @@ -4,7 +4,6 @@ rn_android_library( name = "touch", srcs = glob(["**/*.java"]), autoglob = False, - is_androidx = True, labels = [ "pfh:ReactNative_CommonInfrastructurePlaceholder", "supermodule:xplat/default/public.react_native.infra", diff --git a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/interfaces/BUCK b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/interfaces/BUCK index dac3cd10b04..a49b2fe64a2 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/interfaces/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/interfaces/BUCK @@ -6,7 +6,6 @@ rn_android_library( ["*.java"], ), autoglob = False, - is_androidx = True, labels = [ "pfh:ReactNative_CommonInfrastructurePlaceholder", "supermodule:xplat/default/public.react_native.infra", diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/BUCK b/ReactAndroid/src/main/java/com/facebook/react/uimanager/BUCK index 27ad7f64b71..8265cdd77e3 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/BUCK @@ -13,7 +13,6 @@ rn_android_library( name = "interfaces", srcs = glob(INTERFACES_FILES), autoglob = False, - is_androidx = True, labels = [ "pfh:ReactNative_CommonInfrastructurePlaceholder", "supermodule:xplat/default/public.react_native.infra", @@ -50,7 +49,6 @@ rn_android_library( exported_provided_deps = [ react_native_dep("third-party/android/androidx:annotation"), ], - is_androidx = True, labels = [ "pfh:ReactNative_CommonInfrastructurePlaceholder", "supermodule:xplat/default/public.react_native.infra", @@ -102,7 +100,6 @@ rn_android_library( "DisplayMetricsHolder.java", ], autoglob = False, - is_androidx = True, labels = [ "pfh:ReactNative_CommonInfrastructurePlaceholder", "supermodule:xplat/default/public.react_native.infra", diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/annotations/BUCK b/ReactAndroid/src/main/java/com/facebook/react/uimanager/annotations/BUCK index 7b5fdff30d9..d491ea59e62 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/annotations/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/annotations/BUCK @@ -4,7 +4,6 @@ rn_android_library( name = "annotations", srcs = glob(["*.java"]), autoglob = False, - is_androidx = True, labels = [ "pfh:ReactNative_CommonInfrastructurePlaceholder", "supermodule:xplat/default/public.react_native.infra", 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 f76e8c71b0e..c57e41af0a1 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/BUCK @@ -4,7 +4,6 @@ rn_android_library( name = "common", srcs = glob(["*.java"]), autoglob = False, - is_androidx = True, labels = [ "pfh:ReactNative_CommonInfrastructurePlaceholder", "supermodule:xplat/default/public.react_native.infra", diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/util/BUCK b/ReactAndroid/src/main/java/com/facebook/react/uimanager/util/BUCK index 6792e1ac8c2..3f09b83c2f2 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/util/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/util/BUCK @@ -4,7 +4,6 @@ rn_android_library( name = "util", srcs = glob(["*.java"]), autoglob = False, - is_androidx = True, labels = [ "pfh:ReactNative_CommonInfrastructurePlaceholder", "supermodule:xplat/default/public.react_native.infra", 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 d243c13c491..43d00ad73cb 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/common/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/common/BUCK @@ -4,7 +4,6 @@ rn_android_library( name = "common", srcs = glob(["*.java"]), autoglob = False, - is_androidx = True, labels = [ "pfh:ReactNative_CommonInfrastructurePlaceholder", "supermodule:xplat/default/public.react_native.infra", 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 280adadfce5..0c993a54bc9 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/drawer/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/drawer/BUCK @@ -4,7 +4,6 @@ rn_android_library( name = "drawer", srcs = glob(["**/*.java"]), autoglob = False, - is_androidx = True, labels = [ "pfh:ReactNative_CommonInfrastructurePlaceholder", "supermodule:xplat/default/public.react_native.infra", 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 0c8b6134b45..c89210b226d 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/image/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/image/BUCK @@ -8,7 +8,6 @@ rn_android_library( name = "imageevents", srcs = IMAGE_EVENT_FILES, autoglob = False, - is_androidx = True, labels = [ "pfh:ReactNative_CommonInfrastructurePlaceholder", "supermodule:xplat/default/public.react_native.infra", @@ -37,7 +36,6 @@ rn_android_library( exclude = IMAGE_EVENT_FILES, ), autoglob = False, - is_androidx = True, labels = [ "pfh:ReactNative_CommonInfrastructurePlaceholder", "supermodule:xplat/default/public.react_native.infra", diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/BUCK index a4b86706208..818a2ba0924 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/BUCK @@ -7,7 +7,6 @@ rn_android_library( exclude = ["MultiSourceHelper.java"], ), autoglob = False, - is_androidx = True, labels = [ "pfh:ReactNative_CommonInfrastructurePlaceholder", "supermodule:xplat/default/public.react_native.infra", @@ -27,7 +26,6 @@ rn_android_library( name = "withmultisource", srcs = ["MultiSourceHelper.java"], autoglob = False, - is_androidx = True, labels = [ "pfh:ReactNative_CommonInfrastructurePlaceholder", "supermodule:xplat/default/public.react_native.infra", diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/modal/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/modal/BUCK index 5c946b073f3..d3895aa23fe 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/modal/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/modal/BUCK @@ -4,7 +4,6 @@ rn_android_library( name = "modal", srcs = glob(["*.java"]), autoglob = False, - is_androidx = True, labels = [ "pfh:ReactNative_CommonInfrastructurePlaceholder", "supermodule:xplat/default/public.react_native.infra", diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/BUCK index 22d65ad2fde..60ecb039b65 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/BUCK @@ -4,7 +4,6 @@ rn_android_library( name = "progressbar", srcs = glob(["*.java"]), autoglob = False, - is_androidx = True, labels = [ "pfh:ReactNative_CommonInfrastructurePlaceholder", "supermodule:xplat/default/public.react_native.infra", 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 691b5837d12..29f8fd6304c 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/BUCK @@ -4,7 +4,6 @@ rn_android_library( name = "scroll", srcs = glob(["*.java"]), autoglob = False, - is_androidx = True, labels = [ "pfh:ReactNative_CommonInfrastructurePlaceholder", "supermodule:xplat/default/public.react_native.infra", 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 08c8ed857ba..cb002240d04 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/slider/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/slider/BUCK @@ -4,7 +4,6 @@ rn_android_library( name = "slider", srcs = glob(["*.java"]), autoglob = False, - is_androidx = True, labels = [ "pfh:ReactNative_CommonInfrastructurePlaceholder", "supermodule:xplat/default/public.react_native.infra", 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 d9dc3facec1..b3c98e1e2ed 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/BUCK @@ -4,7 +4,6 @@ rn_android_library( name = "swiperefresh", srcs = glob(["*.java"]), autoglob = False, - is_androidx = True, labels = [ "pfh:ReactNative_CommonInfrastructurePlaceholder", "supermodule:xplat/default/public.react_native.infra", 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 8b41f567cb5..156cd456848 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/switchview/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/switchview/BUCK @@ -4,7 +4,6 @@ rn_android_library( name = "switchview", srcs = glob(["*.java"]), autoglob = False, - is_androidx = True, labels = [ "pfh:ReactNative_CommonInfrastructurePlaceholder", "supermodule:xplat/default/public.react_native.infra", diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/text/BUCK index bdbb666184a..e4246e01d4c 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/text/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/BUCK @@ -7,7 +7,6 @@ rn_android_library( name = "text", srcs = glob(["*.java"]), autoglob = False, - is_androidx = True, labels = [ "pfh:ReactNative_CommonInfrastructurePlaceholder", "supermodule:xplat/default/public.react_native.infra", diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/BUCK index 76225cec3f8..eb58075cd7f 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/BUCK @@ -4,7 +4,6 @@ rn_android_library( name = "frescosupport", srcs = glob(["*.java"]), autoglob = False, - is_androidx = True, labels = [ "pfh:ReactNative_CommonInfrastructurePlaceholder", "supermodule:xplat/default/public.react_native.infra", 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 7a4dc3e6097..a96a49653f7 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/BUCK @@ -7,7 +7,6 @@ rn_android_library( name = "textinput", srcs = glob(["*.java"]), autoglob = False, - is_androidx = True, labels = [ "pfh:ReactNative_CommonInfrastructurePlaceholder", "supermodule:xplat/default/public.react_native.infra", diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/unimplementedview/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/unimplementedview/BUCK index a4f854d9545..ef5359611ea 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/unimplementedview/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/unimplementedview/BUCK @@ -4,7 +4,6 @@ rn_android_library( name = "unimplementedview", srcs = glob(["*.java"]), autoglob = False, - is_androidx = True, labels = [ "pfh:ReactNative_CommonInfrastructurePlaceholder", "supermodule:xplat/default/public.react_native.infra", diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/view/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/view/BUCK index 4c78e7313b1..ffb6b23499c 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/view/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/view/BUCK @@ -7,7 +7,6 @@ rn_android_library( "*.kt", ]), autoglob = False, - is_androidx = True, labels = [ "pfh:ReactNative_CommonInfrastructurePlaceholder", "supermodule:xplat/default/public.react_native.infra", diff --git a/packages/rn-tester/android/app/_BUCK b/packages/rn-tester/android/app/_BUCK index 36279061dd8..fa2ba5a645a 100644 --- a/packages/rn-tester/android/app/_BUCK +++ b/packages/rn-tester/android/app/_BUCK @@ -12,7 +12,6 @@ rn_android_binary( rn_android_library( name = "rntester-lib", srcs = glob(["src/main/java/**/*.java"]), - is_androidx = True, deps = [ ":res", react_native_dep("libraries/soloader/java/com/facebook/soloader:soloader"), diff --git a/tools/build_defs/oss/rn_defs.bzl b/tools/build_defs/oss/rn_defs.bzl index 228c9fe9b75..292874373d8 100644 --- a/tools/build_defs/oss/rn_defs.bzl +++ b/tools/build_defs/oss/rn_defs.bzl @@ -192,7 +192,6 @@ def _unique(li): # React property preprocessor def rn_android_library(name, deps = [], plugins = [], *args, **kwargs): _ = kwargs.pop("autoglob", False) - _ = kwargs.pop("is_androidx", False) _ = kwargs.pop("pure_kotlin", False) if react_native_target( "java/com/facebook/react/uimanager/annotations:annotations", @@ -238,7 +237,6 @@ def rn_apple_library(*args, **kwargs): fb_apple_library(*args, **kwargs) def rn_java_library(*args, **kwargs): - _ = kwargs.pop("is_androidx", False) native.java_library(*args, **kwargs) def rn_java_annotation_processor(*args, **kwargs): @@ -257,7 +255,6 @@ def rn_robolectric_test(name, srcs, vm_args = None, *args, **kwargs): vm_args = vm_args or [] _ = kwargs.pop("autoglob", False) - _ = kwargs.pop("is_androidx", False) kwargs["deps"] = kwargs.pop("deps", []) + [ react_native_android_toplevel_dep("third-party/java/mockito2:mockito2"),