Merge pull request #1236 from rasaha91/cherry-pick-appcompat-upgrade

Cherry-pick: Bump android Appcompat to 1.4.1

Author: rasaha91

ReactAndroid/build.gradle

@@ -378,7 +378,8 @@ dependencies {
     api("com.facebook.infer.annotation:infer-annotation:0.18.0")
     api("com.facebook.yoga:proguard-annotations:1.19.0")
     api("javax.inject:javax.inject:1")
-    api("androidx.appcompat:appcompat:1.0.2")
+    api("androidx.appcompat:appcompat:${APPCOMPAT_VERSION}")
+    api("androidx.appcompat:appcompat-resources:${APPCOMPAT_VERSION}")
     api("androidx.autofill:autofill:1.1.0")
     api("androidx.swiperefreshlayout:swiperefreshlayout:1.0.0")
     api("com.facebook.fresco:fresco:${FRESCO_VERSION}")

ReactAndroid/gradle.properties

@@ -11,6 +11,7 @@ ROBOLECTRIC_VERSION=4.4
 JUNIT_VERSION=4.12
 
 ANDROIDX_TEST_VERSION=1.1.0
+APPCOMPAT_VERSION=1.4.1
 FRESCO_VERSION=2.5.0
 OKHTTP_VERSION=4.9.2
 SO_LOADER_VERSION=0.10.3

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

@@ -12,6 +12,7 @@ fb_native.android_library(
     exported_deps = [
         ":annotation",
         ":appcompat-binary",
+        ":appcompat-resources-binary",
         ":collection",
         ":core",
         ":cursoradapter",
@@ -365,6 +366,11 @@ fb_native.android_prebuilt_aar(
     aar = ":appcompat-binary-aar",
 )
 
+fb_native.android_prebuilt_aar(
+    name = "appcompat-resources-binary",
+    aar = ":appcompat-resources-binary-aar",
+)
+
 fb_native.android_prebuilt_aar(
     name = "asynclayoutinflater-binary",
     aar = ":asynclayoutinflater-binary-aar",
@@ -534,8 +540,14 @@ fb_native.remote_file(
 
 fb_native.remote_file(
     name = "appcompat-binary-aar",
-    sha1 = "002533a36c928bb27a3cc6843a25f83754b3c3ae",
-    url = "mvn:androidx.appcompat:appcompat:aar:1.0.2",
+    sha1 = "d384d125d196ed4997b418d7ba6fc18a4680ed22",
+    url = "mvn:androidx.appcompat:appcompat:aar:1.4.1",
+)
+
+fb_native.remote_file(
+    name = "appcompat-resources-binary-aar",
+    sha1 = "527d93d44bb18bc7dcf5213df8d4d069f0ceff61",
+    url = "mvn:androidx.appcompat:appcompat-resources:aar:1.4.1",
 )
 
 fb_native.remote_file(
@@ -558,8 +570,8 @@ fb_native.remote_file(
 
 fb_native.remote_file(
     name = "core-binary-aar",
-    sha1 = "263deba7f9c24bd0cefb93c0aaaf402cc50828ee",
-    url = "mvn:androidx.core:core:aar:1.0.1",
+    sha1 = "b26edc58f29ca0671e60828a68582760f880acdd",
+    url = "mvn:androidx.core:core:aar:1.7.0",
 )
 
 fb_native.remote_file(