From 6ccd0cdebb2be335eaed93563ec9ed84677f9484 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ramos?= <hector@hectorramos.com>
Date: Tue, 2 Mar 2021 16:38:23 -0800
Subject: [PATCH] Bump Android compileSdkVersion and targetSdkVersion to 30
 (#31078)

Summary:
## Summary

Bump Android compileSdkVersion and targetSdkVersion to 30

## Changelog

[Android][Changed] Bump Android compileSdkVersion and targetSdkVersion from 29 to 30

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

Test Plan: Circle CI and Sandcastle

Reviewed By: mdvacca

Differential Revision: D26765188

Pulled By: hramos

fbshipit-source-id: a971641cea4860df58ce6e9b0f14405bfc4e0979
---
 .buckconfig                              | 2 +-
 .circleci/Dockerfiles/Dockerfile.android | 2 +-
 .circleci/config.yml                     | 4 ++--
 ReactAndroid/build.gradle                | 2 +-
 package.json                             | 2 +-
 template/android/build.gradle            | 4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.buckconfig b/.buckconfig
index 0740647479601e..3d98e74d71e06a 100644
--- a/.buckconfig
+++ b/.buckconfig
@@ -1,6 +1,6 @@
 
 [android]
-  target = android-29
+  target = android-30
 
 [download]
   max_number_of_retries = 3
diff --git a/.circleci/Dockerfiles/Dockerfile.android b/.circleci/Dockerfiles/Dockerfile.android
index 5b313b53bfa679..92bf645af1d260 100644
--- a/.circleci/Dockerfiles/Dockerfile.android
+++ b/.circleci/Dockerfiles/Dockerfile.android
@@ -14,7 +14,7 @@
 # and build a Android application that can be used to run the
 # tests specified in the scripts/ directory.
 #
-FROM reactnativecommunity/react-native-android:2.1
+FROM reactnativecommunity/react-native-android:3.2
 
 LABEL Description="React Native Android Test Image"
 LABEL maintainer="Héctor Ramos <hector@fb.com>"
diff --git a/.circleci/config.yml b/.circleci/config.yml
index ca3e88fc57bad4..dc1337a2e107e0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -35,7 +35,7 @@ executors:
   reactnativeandroid:
     <<: *defaults
     docker:
-      - image: reactnativecommunity/react-native-android:2.1
+      - image: reactnativecommunity/react-native-android:3.2
     resource_class: "large"
     environment:
       - TERM: "dumb"
@@ -617,7 +617,7 @@ jobs:
     environment:
       - ANDROID_HOME: "C:\\Android\\android-sdk"
       - ANDROID_NDK: "C:\\Android\\android-sdk\\ndk\\20.1.5948944"
-      - ANDROID_BUILD_VERSION: 28
+      - ANDROID_BUILD_VERSION: 30
       - ANDROID_TOOLS_VERSION: 29.0.3
       - GRADLE_OPTS: -Dorg.gradle.daemon=false
       - NDK_VERSION: 20.1.5948944
diff --git a/ReactAndroid/build.gradle b/ReactAndroid/build.gradle
index 8b8a05d29e4738..0944a54a9bab74 100644
--- a/ReactAndroid/build.gradle
+++ b/ReactAndroid/build.gradle
@@ -378,7 +378,7 @@ task extractJNIFiles {
 }
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 30
     ndkVersion ANDROID_NDK_VERSION
     compileOptions {
         sourceCompatibility(JavaVersion.VERSION_1_8)
diff --git a/package.json b/package.json
index b3e149b7080a26..0a415efadd3699 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
     "prettier": "prettier --write \"./**/*.{js,md,yml}\"",
     "format-check": "prettier --list-different \"./**/*.{js,md,yml}\"",
     "update-lock": "npx yarn-deduplicate",
-    "docker-setup-android": "docker pull reactnativecommunity/react-native-android:2.1",
+    "docker-setup-android": "docker pull reactnativecommunity/react-native-android:3.2",
     "docker-build-android": "docker build -t reactnativeci/android -f .circleci/Dockerfiles/Dockerfile.android .",
     "test-android-run-instrumentation": "docker run --cap-add=SYS_ADMIN -it reactnativeci/android bash .circleci/Dockerfiles/scripts/run-android-docker-instrumentation-tests.sh",
     "test-android-run-unit": "docker run --cap-add=SYS_ADMIN -it reactnativeci/android bash .circleci/Dockerfiles/scripts/run-android-docker-unit-tests.sh",
diff --git a/template/android/build.gradle b/template/android/build.gradle
index 93232f5fca9389..ac4d64714c0bfb 100644
--- a/template/android/build.gradle
+++ b/template/android/build.gradle
@@ -4,8 +4,8 @@ buildscript {
     ext {
         buildToolsVersion = "29.0.3"
         minSdkVersion = 21
-        compileSdkVersion = 29
-        targetSdkVersion = 29
+        compileSdkVersion = 30
+        targetSdkVersion = 30
         ndkVersion = "20.1.5948944"
     }
     repositories {