From 7f6ab5068cb8a253c26d521aae6ec7aa16cef330 Mon Sep 17 00:00:00 2001 From: Rick Ratmansky Date: Wed, 3 Apr 2019 07:46:45 -0700 Subject: [PATCH] Removing unused and very old versions of the support library resources Summary: TSIA Differential Revision: D14727969 fbshipit-source-id: 1c73534dea7225f2d952ef0f20ea602894d78f04 --- RNTester/android/app/BUCK | 2 +- .../src/androidTest/java/com/facebook/react/testing/rule/BUCK | 2 +- ReactAndroid/src/androidTest/java/com/facebook/react/tests/BUCK | 2 +- .../src/main/android_res/com/facebook/catalyst/appcompat/BUCK | 2 +- ReactAndroid/src/main/java/com/facebook/react/BUCK | 2 +- .../src/main/java/com/facebook/react/views/checkbox/BUCK | 2 +- ReactAndroid/src/main/java/com/facebook/react/views/picker/BUCK | 2 +- ReactAndroid/src/main/java/com/facebook/react/views/slider/BUCK | 2 +- .../src/main/java/com/facebook/react/views/switchview/BUCK | 2 +- ReactAndroid/src/main/java/com/facebook/react/views/text/BUCK | 2 +- .../src/main/java/com/facebook/react/views/toolbar/BUCK | 2 +- .../android/support/v7/{appcompat-orig => appcompat}/BUCK | 0 .../support/v7/{appcompat-orig => appcompat}/aar-unpacker.py | 0 13 files changed, 11 insertions(+), 11 deletions(-) rename ReactAndroid/src/main/third-party/android/support/v7/{appcompat-orig => appcompat}/BUCK (100%) rename ReactAndroid/src/main/third-party/android/support/v7/{appcompat-orig => appcompat}/aar-unpacker.py (100%) diff --git a/RNTester/android/app/BUCK b/RNTester/android/app/BUCK index 6af3bb0e5ec..95e5318015a 100644 --- a/RNTester/android/app/BUCK +++ b/RNTester/android/app/BUCK @@ -16,7 +16,7 @@ rn_android_library( 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/v7/appcompat:appcompat"), 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/common:build_config"), 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 833d7246599..d1963d369ea 100644 --- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/rule/BUCK +++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/rule/BUCK @@ -21,7 +21,7 @@ rn_android_library( 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/v7/appcompat:appcompat"), 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 e7e4481dd7a..72d5eb328ca 100644 --- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/BUCK +++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/BUCK @@ -8,7 +8,7 @@ rn_android_library( "PUBLIC", ], deps = [ - react_native_dep("third-party/android/support/v7/appcompat-orig:appcompat"), + react_native_dep("third-party/android/support/v7/appcompat:appcompat"), react_native_dep("third-party/android/support/v4:lib-support-v4"), react_native_dep("third-party/java/jsr-305:jsr-305"), react_native_dep("third-party/java/junit:junit"), 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 d0d6a03da81..895f28a83f5 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/v7/appcompat: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 f869e109cf7..04b76cf812b 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/BUCK @@ -5,7 +5,7 @@ rn_android_library( srcs = glob(["*.java"]), is_androidx = True, provided_deps = [ - react_native_dep("third-party/android/support/v7/appcompat-orig:appcompat"), + react_native_dep("third-party/android/support/v7/appcompat:appcompat"), react_native_dep("third-party/android/support/v4:lib-support-v4"), ], visibility = [ 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 68cb8eb4e7d..ed9aecafe2d 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/checkbox/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/checkbox/BUCK @@ -6,7 +6,7 @@ rn_android_library( is_androidx = True, provided_deps = [ 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/v7/appcompat:appcompat"), ], visibility = [ "PUBLIC", diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/picker/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/picker/BUCK index 8b35c9144e2..1291385c0c3 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/picker/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/picker/BUCK @@ -6,7 +6,7 @@ rn_android_library( is_androidx = True, provided_deps = [ 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/v7/appcompat:appcompat"), ], visibility = [ "PUBLIC", 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 ed8109be801..b717203f6b8 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/slider/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/slider/BUCK @@ -9,7 +9,7 @@ rn_android_library( ], deps = [ YOGA_TARGET, - react_native_dep("third-party/android/support/v7/appcompat-orig:appcompat"), + react_native_dep("third-party/android/support/v7/appcompat:appcompat"), react_native_dep("third-party/android/support/v4:lib-support-v4"), 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/switchview/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/switchview/BUCK index 3535a85c992..b86d46e7f1d 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/switchview/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/switchview/BUCK @@ -6,7 +6,7 @@ rn_android_library( is_androidx = True, provided_deps = [ 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/v7/appcompat:appcompat"), ], visibility = [ "PUBLIC", 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 6c23775eae7..0a44dbe9004 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/text/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/BUCK @@ -11,7 +11,7 @@ rn_android_library( deps = [ YOGA_TARGET, 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/v7/appcompat:appcompat"), 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/views/toolbar/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/BUCK index ac2b9fd7fec..37c0c69d008 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/BUCK @@ -6,7 +6,7 @@ rn_android_library( is_androidx = True, provided_deps = [ 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/v7/appcompat:appcompat"), ], visibility = [ "PUBLIC", diff --git a/ReactAndroid/src/main/third-party/android/support/v7/appcompat-orig/BUCK b/ReactAndroid/src/main/third-party/android/support/v7/appcompat/BUCK similarity index 100% rename from ReactAndroid/src/main/third-party/android/support/v7/appcompat-orig/BUCK rename to ReactAndroid/src/main/third-party/android/support/v7/appcompat/BUCK diff --git a/ReactAndroid/src/main/third-party/android/support/v7/appcompat-orig/aar-unpacker.py b/ReactAndroid/src/main/third-party/android/support/v7/appcompat/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/v7/appcompat/aar-unpacker.py