From 6b61995647c789a567845521fed7b0cc1e0cddb7 Mon Sep 17 00:00:00 2001
From: Gabriel Donadel Dall'Agnol <donadeldev@gmail.com>
Date: Thu, 10 Feb 2022 09:50:40 -0800
Subject: [PATCH] build(deps): Bump android Appcompat to 1.4.1 (#33072)

Summary:
Currently we are using Appcompat in version 1.0.2 which is almost 4 years old now, this PR updates it to version 1.4.1.

Using Appcompat 1.0.2 was also causing a crash on RNTester due to an error where FontFamily's method was not found (Related to https://github.com/facebook/react-native/issues/33065)

Closes https://github.com/facebook/react-native/issues/31620

## Changelog

[Android] [Changed] - Bump android Appcompat to 1.4.1

Pull Request resolved: https://github.com/facebook/react-native/pull/33072

Test Plan: Use `./scripts/test-manual-e2e.sh` to test both RNTester and a new app

Reviewed By: cortinico

Differential Revision: D34107105

Pulled By: ShikaSD

fbshipit-source-id: 966e4687b09ae50a88ee518622f073d72e8c6550
---
 ReactAndroid/build.gradle                     |  3 ++-
 ReactAndroid/gradle.properties                |  1 +
 .../main/third-party/android/androidx/BUCK    | 20 +++++++++++++++----
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/ReactAndroid/build.gradle b/ReactAndroid/build.gradle
index 3e0f804219c135..d391da8576cef9 100644
--- a/ReactAndroid/build.gradle
+++ b/ReactAndroid/build.gradle
@@ -370,7 +370,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}")
diff --git a/ReactAndroid/gradle.properties b/ReactAndroid/gradle.properties
index 66206964b121f7..a93702dfcb8fe1 100644
--- a/ReactAndroid/gradle.properties
+++ b/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
diff --git a/ReactAndroid/src/main/third-party/android/androidx/BUCK b/ReactAndroid/src/main/third-party/android/androidx/BUCK
index d8398497d33652..8bea0a99bf3a6c 100644
--- a/ReactAndroid/src/main/third-party/android/androidx/BUCK
+++ b/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(