From ba4424fccacd175d47efa4c1326171700bad7d2d Mon Sep 17 00:00:00 2001
From: Lorenzo Sciandra <notkelset@kelset.dev>
Date: Fri, 18 Jun 2021 09:21:54 +0100
Subject: [PATCH] Revert "Revert "bump buildToolsVersion to 30.0.2 (#31627)""

This reverts commit 0a15927dc154c9f586bec5ac2d481032f84d972f.
---
 .circleci/config.yml          | 2 +-
 scripts/.tests.env            | 2 +-
 template/android/build.gradle | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index dc1337a2e107e0..f790f06ee8c543 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -618,7 +618,7 @@ jobs:
       - ANDROID_HOME: "C:\\Android\\android-sdk"
       - ANDROID_NDK: "C:\\Android\\android-sdk\\ndk\\20.1.5948944"
       - ANDROID_BUILD_VERSION: 30
-      - ANDROID_TOOLS_VERSION: 29.0.3
+      - ANDROID_TOOLS_VERSION: 30.0.2
       - GRADLE_OPTS: -Dorg.gradle.daemon=false
       - NDK_VERSION: 20.1.5948944
     steps:
diff --git a/scripts/.tests.env b/scripts/.tests.env
index d01ca84fbd5b9f..4d771013a35311 100644
--- a/scripts/.tests.env
+++ b/scripts/.tests.env
@@ -4,7 +4,7 @@
 
 ## ANDROID ##
 # Android SDK Build Tools revision
-export ANDROID_SDK_BUILD_TOOLS_REVISION=29.0.3
+export ANDROID_SDK_BUILD_TOOLS_REVISION=30.0.2
 # Android API Level we build with
 export ANDROID_SDK_BUILD_API_LEVEL="28"
 # Google APIs for Android level
diff --git a/template/android/build.gradle b/template/android/build.gradle
index 41f387ac9b4f28..e64d31e5fb6666 100644
--- a/template/android/build.gradle
+++ b/template/android/build.gradle
@@ -2,7 +2,7 @@
 
 buildscript {
     ext {
-        buildToolsVersion = "29.0.3"
+        buildToolsVersion = "30.0.2"
         minSdkVersion = 21
         compileSdkVersion = 30
         targetSdkVersion = 30