From 46f1f0b2ee5d9404ace4a449ea0999e4f995a4cd Mon Sep 17 00:00:00 2001
From: Jon Simantov <jsimantov@google.com>
Date: Wed, 13 Dec 2023 10:23:40 -0800
Subject: [PATCH] Update Android SDK dependency, including updated Gradle and
 compileSDK version, and including GMA (#1473)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Update Android dependencies - Tue Oct 10 2023

[Triggered](https://github.com/firebase/firebase-android-sdk/actions/runs/6475704829) by [firebase-android-sdk Oct 10 release](https://github.com/firebase/firebase-android-sdk/commit/a135c514ee4d6a48cfc6680d7a35e97e6a666736).

  ### Android

- com.google.android.gms.play_services_ads → 22.4.0

> Created by [Update Android and iOS dependencies workflow](https://github.com/firebase/firebase-cpp-sdk/actions/runs/6475709960).

* Build GMA with Android 31.

* Increment all gradle wrapper versions to 6.7.1.

* Fix quote in classpath.

* Update all gradle plugin versions to 4.2.1.

* Force NDK path to environment variable for new Gradle version.

* Update build tools version.

* Add gradle.properties with useAndroidX=true flag.

* Remove NDK path from unneeded gradle files.

* Force name of included C++ SDK build to be firebase_cpp_sdk.

This fixes a breaking change in Gradle 6 where included builds
no longer have their name propagated, but instead they use
their path (unless you explicitly set the name, as in this change).

* Update Firestore internal test also.

* Add gradle.properties files.

* Update readme with new version.

* Add cleanup directory.

* Add to .gitignore.

* Add changed .externalNativeBuild --> .cxx directory to script
and ProGuard rules.

* Revert "Add cleanup directory."

This reverts commit ec1e0463c25798336b7070a5671cee2c77f4f590.

* Add cleanup directory (again).

* Project tweaks to build on Android SDK 33, required for GMA.

* Update Android dependencies - Thu Oct 19 2023 (#1481)

* Update Android dependencies - Thu Oct 19 2023

### Android

- com.google.firebase.firebase_bom → 32.4.0

> Created by [Update Android and iOS dependencies workflow](https://github.com/firebase/firebase-cpp-sdk/actions/runs/6580059572).

* Enable multidex.

---------

Co-authored-by: firebase-workflow-trigger-bot <firebase-workflow-trigger-bot@google.com>
Co-authored-by: Jon Simantov <jsimantov@google.com>

* Update to 32.4.1 bom.

* Update readme.

* Update Android dependencies to 32.7.0. (#1498)

---------

Co-authored-by: firebase-workflow-trigger-bot <firebase-workflow-trigger-bot@google.com>
Co-authored-by: firebase-workflow-trigger[bot] <80733318+firebase-workflow-trigger[bot]@users.noreply.github.com>
---
 .gitignore                                             |  1 +
 Android/firebase_dependencies.gradle                   |  4 ++--
 analytics/build.gradle                                 |  7 ++++---
 analytics/integration_test/AndroidManifest.xml         |  1 -
 analytics/integration_test/build.gradle                |  7 ++++---
 analytics/integration_test/gradle.properties           |  2 ++
 .../gradle/wrapper/gradle-wrapper.properties           |  2 +-
 analytics/integration_test/settings.gradle             |  4 +++-
 android_build_files/generate_proguard.gradle           |  2 +-
 app/app_resources/build.gradle                         |  6 +++---
 app/build.gradle                                       |  7 ++++---
 app/google_api_resources/build.gradle                  |  6 +++---
 app/integration_test/AndroidManifest.xml               |  1 -
 app/integration_test/build.gradle                      |  7 ++++---
 app/integration_test/gradle.properties                 |  2 ++
 .../gradle/wrapper/gradle-wrapper.properties           |  2 +-
 app/integration_test/settings.gradle                   |  4 +++-
 app/invites_resources/build.gradle                     |  6 +++---
 app/test_resources/build.gradle                        |  4 ++--
 app_check/app_check_resources/build.gradle             |  6 +++---
 app_check/build.gradle                                 |  7 ++++---
 app_check/integration_test/AndroidManifest.xml         |  1 -
 app_check/integration_test/build.gradle                |  7 ++++---
 app_check/integration_test/gradle.properties           |  2 ++
 .../gradle/wrapper/gradle-wrapper.properties           |  2 +-
 app_check/integration_test/settings.gradle             |  4 +++-
 auth/auth_resources/build.gradle                       |  6 +++---
 auth/build.gradle                                      |  7 ++++---
 auth/integration_test/AndroidManifest.xml              |  1 -
 auth/integration_test/build.gradle                     |  8 +++++---
 auth/integration_test/gradle.properties                |  2 ++
 .../gradle/wrapper/gradle-wrapper.properties           |  2 +-
 auth/integration_test/settings.gradle                  |  4 +++-
 build_scripts/android/build.sh                         |  9 ++++++---
 database/build.gradle                                  |  7 ++++---
 database/database_resources/build.gradle               |  6 +++---
 database/integration_test/AndroidManifest.xml          |  1 -
 database/integration_test/build.gradle                 |  8 +++++---
 database/integration_test/gradle.properties            |  2 ++
 .../gradle/wrapper/gradle-wrapper.properties           |  2 +-
 database/integration_test/settings.gradle              |  4 +++-
 dynamic_links/build.gradle                             |  7 ++++---
 dynamic_links/integration_test/AndroidManifest.xml     |  1 -
 dynamic_links/integration_test/build.gradle            |  7 ++++---
 dynamic_links/integration_test/gradle.properties       |  2 ++
 .../gradle/wrapper/gradle-wrapper.properties           |  2 +-
 dynamic_links/integration_test/settings.gradle         |  4 +++-
 firestore/build.gradle                                 |  7 ++++---
 firestore/firestore_resources/build.gradle             |  6 +++---
 firestore/integration_test/AndroidManifest.xml         |  1 -
 firestore/integration_test/build.gradle                |  7 ++++---
 firestore/integration_test/gradle.properties           |  2 ++
 .../gradle/wrapper/gradle-wrapper.properties           |  2 +-
 firestore/integration_test/settings.gradle             |  4 +++-
 .../integration_test_internal/AndroidManifest.xml      |  1 -
 firestore/integration_test_internal/build.gradle       |  7 ++++---
 firestore/integration_test_internal/gradle.properties  |  2 ++
 .../gradle/wrapper/gradle-wrapper.properties           |  2 +-
 firestore/integration_test_internal/settings.gradle    |  4 +++-
 functions/build.gradle                                 |  7 ++++---
 functions/integration_test/AndroidManifest.xml         |  1 -
 functions/integration_test/build.gradle                |  8 +++++---
 functions/integration_test/gradle.properties           |  2 ++
 .../gradle/wrapper/gradle-wrapper.properties           |  2 +-
 functions/integration_test/settings.gradle             |  4 +++-
 gma/build.gradle                                       |  7 ++++---
 gma/gma_resources/build.gradle                         |  8 ++++----
 gma/integration_test/AndroidManifest.xml               |  1 -
 gma/integration_test/build.gradle                      |  7 ++++---
 gma/integration_test/gradle.properties                 |  2 ++
 .../gradle/wrapper/gradle-wrapper.properties           |  2 +-
 gma/integration_test/settings.gradle                   |  4 +++-
 gradle.properties                                      |  2 ++
 gradle/wrapper/gradle-wrapper.properties               |  2 +-
 installations/build.gradle                             |  7 ++++---
 installations/integration_test/AndroidManifest.xml     |  1 -
 installations/integration_test/build.gradle            |  7 ++++---
 installations/integration_test/gradle.properties       |  2 ++
 .../gradle/wrapper/gradle-wrapper.properties           |  2 +-
 installations/integration_test/settings.gradle         |  4 +++-
 messaging/build.gradle                                 |  7 ++++---
 messaging/integration_test/AndroidManifest.xml         |  1 -
 messaging/integration_test/build.gradle                |  7 ++++---
 messaging/integration_test/gradle.properties           |  2 ++
 .../gradle/wrapper/gradle-wrapper.properties           |  2 +-
 messaging/integration_test/settings.gradle             |  4 +++-
 messaging/messaging_java/build.gradle                  |  6 +++---
 .../Android/firebase_dependencies.gradle               |  4 ++--
 release_build_files/readme.md                          | 10 +++++++---
 remote_config/build.gradle                             |  7 ++++---
 remote_config/integration_test/AndroidManifest.xml     |  1 -
 remote_config/integration_test/build.gradle            |  7 ++++---
 remote_config/integration_test/gradle.properties       |  2 ++
 .../gradle/wrapper/gradle-wrapper.properties           |  2 +-
 remote_config/integration_test/settings.gradle         |  4 +++-
 remote_config/remote_config_resources/build.gradle     |  6 +++---
 scripts/gha/build_testapps.py                          |  1 +
 .../integration_testing/gameloop_android/build.gradle  |  2 +-
 .../gradle/wrapper/gradle-wrapper.properties           |  2 +-
 scripts/gha/ui_testing/uitest_android/app/build.gradle |  5 +++--
 scripts/gha/ui_testing/uitest_android/build.gradle     |  2 +-
 .../gradle/wrapper/gradle-wrapper.properties           |  2 +-
 storage/build.gradle                                   |  7 ++++---
 storage/integration_test/AndroidManifest.xml           |  1 -
 storage/integration_test/build.gradle                  |  8 +++++---
 storage/integration_test/gradle.properties             |  2 ++
 .../gradle/wrapper/gradle-wrapper.properties           |  2 +-
 storage/integration_test/settings.gradle               |  4 +++-
 storage/storage_resources/build.gradle                 |  6 +++---
 testing/build.gradle                                   |  7 ++++---
 110 files changed, 266 insertions(+), 180 deletions(-)
 create mode 100644 analytics/integration_test/gradle.properties
 create mode 100644 app/integration_test/gradle.properties
 create mode 100644 app_check/integration_test/gradle.properties
 create mode 100644 auth/integration_test/gradle.properties
 create mode 100644 database/integration_test/gradle.properties
 create mode 100644 dynamic_links/integration_test/gradle.properties
 create mode 100644 firestore/integration_test/gradle.properties
 create mode 100644 firestore/integration_test_internal/gradle.properties
 create mode 100644 functions/integration_test/gradle.properties
 create mode 100644 gma/integration_test/gradle.properties
 create mode 100644 gradle.properties
 create mode 100644 installations/integration_test/gradle.properties
 create mode 100644 messaging/integration_test/gradle.properties
 create mode 100644 remote_config/integration_test/gradle.properties
 create mode 100644 storage/integration_test/gradle.properties

diff --git a/.gitignore b/.gitignore
index d86b432e3c..9b0a74e964 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@ __pycache__/
 .gradle
 **/build/
 **/.externalNativeBuild/
+**/.cxx/
 
 ### IDE generated files
 .vscode/
diff --git a/Android/firebase_dependencies.gradle b/Android/firebase_dependencies.gradle
index 601fa3ad6a..517049d182 100644
--- a/Android/firebase_dependencies.gradle
+++ b/Android/firebase_dependencies.gradle
@@ -27,7 +27,7 @@ def firebaseDependenciesMap = [
   'dynamic_links' : ['com.google.firebase:firebase-dynamic-links'],
   'firestore' : ['com.google.firebase:firebase-firestore'],
   'functions' : ['com.google.firebase:firebase-functions'],
-  'gma' : ['com.google.android.gms:play-services-ads:22.3.0',
+  'gma' : ['com.google.android.gms:play-services-ads:22.6.0',
            'com.google.android.ump:user-messaging-platform:2.1.0'],
   'installations' : ['com.google.firebase:firebase-installations'],
   'invites' : ['com.google.firebase:firebase-invites'],
@@ -159,7 +159,7 @@ project.afterEvaluate {
 
     // Add the bill-of-materials
     project.dependencies {
-      implementation platform('com.google.firebase:firebase-bom:32.3.1')
+      implementation platform('com.google.firebase:firebase-bom:32.7.0')
     }
     for (String lib : firebaseCpp.dependencies.libSet) {
       // Generate and include the proguard file
diff --git a/analytics/build.gradle b/analytics/build.gradle
index 3409aeb9b8..2b6bf6fb2a 100644
--- a/analytics/build.gradle
+++ b/analytics/build.gradle
@@ -18,7 +18,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.3.3'
+    classpath 'com.android.tools.build:gradle:4.2.1'
   }
 }
 allprojects {
@@ -31,8 +31,9 @@ allprojects {
 apply plugin: 'com.android.library'
 
 android {
-  compileSdkVersion 28
-  buildToolsVersion '28.0.3'
+  compileSdkVersion 33
+  ndkPath System.getenv('ANDROID_NDK_HOME')
+  buildToolsVersion '30.0.2'
 
   sourceSets {
     main {
diff --git a/analytics/integration_test/AndroidManifest.xml b/analytics/integration_test/AndroidManifest.xml
index 236a1e4abe..ebe7ffaea6 100644
--- a/analytics/integration_test/AndroidManifest.xml
+++ b/analytics/integration_test/AndroidManifest.xml
@@ -22,7 +22,6 @@
   <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
   <uses-permission android:name="android.permission.WAKE_LOCK" />
-  <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="28" />
   <application android:label="@string/app_name">
     <activity android:name="android.app.NativeActivity"
               android:screenOrientation="portrait"
diff --git a/analytics/integration_test/build.gradle b/analytics/integration_test/build.gradle
index f6215c06bf..cfaf518fd7 100644
--- a/analytics/integration_test/build.gradle
+++ b/analytics/integration_test/build.gradle
@@ -20,7 +20,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.3.3'
+    classpath 'com.android.tools.build:gradle:4.2.1'
     classpath 'com.google.gms:google-services:4.0.1'
   }
 }
@@ -40,8 +40,9 @@ android {
     sourceCompatibility 1.8
     targetCompatibility 1.8
   }
-  compileSdkVersion 28
-  buildToolsVersion '28.0.3'
+  compileSdkVersion 33
+  ndkPath System.getenv('ANDROID_NDK_HOME')
+  buildToolsVersion '30.0.2'
 
   sourceSets {
     main {
diff --git a/analytics/integration_test/gradle.properties b/analytics/integration_test/gradle.properties
new file mode 100644
index 0000000000..ac891ac594
--- /dev/null
+++ b/analytics/integration_test/gradle.properties
@@ -0,0 +1,2 @@
+android.useAndroidX = true
+org.gradle.jvmargs=-Xmx2560m
diff --git a/analytics/integration_test/gradle/wrapper/gradle-wrapper.properties b/analytics/integration_test/gradle/wrapper/gradle-wrapper.properties
index 9e09cdb6ad..65340c1b59 100644
--- a/analytics/integration_test/gradle/wrapper/gradle-wrapper.properties
+++ b/analytics/integration_test/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https://services.gradle.org/distributions/gradle-6.7.1-all.zip
diff --git a/analytics/integration_test/settings.gradle b/analytics/integration_test/settings.gradle
index 2270c51ca4..8b600af5be 100644
--- a/analytics/integration_test/settings.gradle
+++ b/analytics/integration_test/settings.gradle
@@ -36,4 +36,6 @@ if (!(new File(firebase_cpp_sdk_dir)).exists()) {
             firebase_cpp_sdk_dir))
 }
 gradle.ext.firebase_cpp_sdk_dir = "$firebase_cpp_sdk_dir"
-includeBuild "$firebase_cpp_sdk_dir"
\ No newline at end of file
+includeBuild("$firebase_cpp_sdk_dir") {
+  name = "firebase_cpp_sdk"
+}
diff --git a/android_build_files/generate_proguard.gradle b/android_build_files/generate_proguard.gradle
index 55f5c87246..6bb8e47391 100644
--- a/android_build_files/generate_proguard.gradle
+++ b/android_build_files/generate_proguard.gradle
@@ -72,7 +72,7 @@ def defineGenerateProguardFile(String subproject, String buildType,
       String nativeBuildDir =
           project.android.externalNativeBuild.cmake.buildStagingDirectory
       if (nativeBuildDir == null || nativeBuildDir.isEmpty()) {
-        nativeBuildDir = file('.externalNativeBuild/cmake').absolutePath
+        nativeBuildDir = file('.cxx/cmake').absolutePath
       }
 
       // Find the static library that was built. Note that there are multiple
diff --git a/app/app_resources/build.gradle b/app/app_resources/build.gradle
index ae1c95e847..f718bed509 100644
--- a/app/app_resources/build.gradle
+++ b/app/app_resources/build.gradle
@@ -18,7 +18,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.3.3'
+    classpath 'com.android.tools.build:gradle:4.2.1'
     classpath 'com.google.gms:google-services:4.2.0'
   }
 }
@@ -36,7 +36,7 @@ android {
     sourceCompatibility 1.8
     targetCompatibility 1.8
   }
-  compileSdkVersion 28
+  compileSdkVersion 33
 
   sourceSets {
     main {
@@ -50,7 +50,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:32.3.1')
+  implementation platform('com.google.firebase:firebase-bom:32.7.0')
   implementation 'com.google.firebase:firebase-analytics'
 }
 
diff --git a/app/build.gradle b/app/build.gradle
index 2198421eff..59e5e1c137 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -18,7 +18,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.3.3'
+    classpath 'com.android.tools.build:gradle:4.2.1'
   }
 }
 allprojects {
@@ -31,8 +31,9 @@ allprojects {
 apply plugin: 'com.android.library'
 
 android {
-  compileSdkVersion 28
-  buildToolsVersion '28.0.3'
+  compileSdkVersion 33
+  ndkPath System.getenv('ANDROID_NDK_HOME')
+  buildToolsVersion '30.0.2'
 
   sourceSets {
     main {
diff --git a/app/google_api_resources/build.gradle b/app/google_api_resources/build.gradle
index 629f8ecf69..cf77af86e4 100644
--- a/app/google_api_resources/build.gradle
+++ b/app/google_api_resources/build.gradle
@@ -18,7 +18,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.3.3'
+    classpath 'com.android.tools.build:gradle:4.2.1'
     classpath 'com.google.gms:google-services:4.2.0'
   }
 }
@@ -36,7 +36,7 @@ android {
     sourceCompatibility 1.8
     targetCompatibility 1.8
   }
-  compileSdkVersion 28
+  compileSdkVersion 33
 
   sourceSets {
     main {
@@ -53,7 +53,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:32.3.1')
+  implementation platform('com.google.firebase:firebase-bom:32.7.0')
   implementation 'com.google.firebase:firebase-analytics'
   implementation 'com.google.android.gms:play-services-base:18.2.0'
   implementation project(':app:app_resources')
diff --git a/app/integration_test/AndroidManifest.xml b/app/integration_test/AndroidManifest.xml
index 6691ae2a44..3d7f17903e 100644
--- a/app/integration_test/AndroidManifest.xml
+++ b/app/integration_test/AndroidManifest.xml
@@ -22,7 +22,6 @@
   <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
   <uses-permission android:name="android.permission.WAKE_LOCK" />
-  <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="28" />
   <application android:label="@string/app_name">
     <activity android:name="android.app.NativeActivity"
               android:screenOrientation="portrait"
diff --git a/app/integration_test/build.gradle b/app/integration_test/build.gradle
index 0b8046916c..6ba58fc179 100644
--- a/app/integration_test/build.gradle
+++ b/app/integration_test/build.gradle
@@ -20,7 +20,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.3.3'
+    classpath 'com.android.tools.build:gradle:4.2.1'
     classpath 'com.google.gms:google-services:4.0.1'
   }
 }
@@ -40,8 +40,9 @@ android {
     sourceCompatibility 1.8
     targetCompatibility 1.8
   }
-  compileSdkVersion 28
-  buildToolsVersion '28.0.3'
+  compileSdkVersion 33
+  ndkPath System.getenv('ANDROID_NDK_HOME')
+  buildToolsVersion '30.0.2'
 
   sourceSets {
     main {
diff --git a/app/integration_test/gradle.properties b/app/integration_test/gradle.properties
new file mode 100644
index 0000000000..ac891ac594
--- /dev/null
+++ b/app/integration_test/gradle.properties
@@ -0,0 +1,2 @@
+android.useAndroidX = true
+org.gradle.jvmargs=-Xmx2560m
diff --git a/app/integration_test/gradle/wrapper/gradle-wrapper.properties b/app/integration_test/gradle/wrapper/gradle-wrapper.properties
index 9e09cdb6ad..65340c1b59 100644
--- a/app/integration_test/gradle/wrapper/gradle-wrapper.properties
+++ b/app/integration_test/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https://services.gradle.org/distributions/gradle-6.7.1-all.zip
diff --git a/app/integration_test/settings.gradle b/app/integration_test/settings.gradle
index 2270c51ca4..8b600af5be 100644
--- a/app/integration_test/settings.gradle
+++ b/app/integration_test/settings.gradle
@@ -36,4 +36,6 @@ if (!(new File(firebase_cpp_sdk_dir)).exists()) {
             firebase_cpp_sdk_dir))
 }
 gradle.ext.firebase_cpp_sdk_dir = "$firebase_cpp_sdk_dir"
-includeBuild "$firebase_cpp_sdk_dir"
\ No newline at end of file
+includeBuild("$firebase_cpp_sdk_dir") {
+  name = "firebase_cpp_sdk"
+}
diff --git a/app/invites_resources/build.gradle b/app/invites_resources/build.gradle
index 27031a758b..eb0e7cbc7a 100644
--- a/app/invites_resources/build.gradle
+++ b/app/invites_resources/build.gradle
@@ -18,7 +18,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.3.3'
+    classpath 'com.android.tools.build:gradle:4.2.1'
     classpath 'com.google.gms:google-services:4.2.0'
   }
 }
@@ -36,7 +36,7 @@ android {
     sourceCompatibility 1.8
     targetCompatibility 1.8
   }
-  compileSdkVersion 28
+  compileSdkVersion 33
 
   sourceSets {
     main {
@@ -49,7 +49,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:32.3.1')
+  implementation platform('com.google.firebase:firebase-bom:32.7.0')
   implementation 'com.google.firebase:firebase-analytics'
   implementation 'com.google.firebase:firebase-dynamic-links'
   implementation project(':app:app_resources')
diff --git a/app/test_resources/build.gradle b/app/test_resources/build.gradle
index 2e145d15ba..a16efe05b3 100644
--- a/app/test_resources/build.gradle
+++ b/app/test_resources/build.gradle
@@ -18,7 +18,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.3.3'
+    classpath 'com.android.tools.build:gradle:4.2.1'
     classpath 'com.google.gms:google-services:4.2.0'
   }
 }
@@ -32,7 +32,7 @@ allprojects {
 apply plugin: 'com.android.library'
 
 android {
-  compileSdkVersion 28
+  compileSdkVersion 33
 
   sourceSets {
     main {
diff --git a/app_check/app_check_resources/build.gradle b/app_check/app_check_resources/build.gradle
index 6eba43dc42..debb12d9ce 100644
--- a/app_check/app_check_resources/build.gradle
+++ b/app_check/app_check_resources/build.gradle
@@ -18,7 +18,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.3.3'
+    classpath 'com.android.tools.build:gradle:4.2.1'
     classpath 'com.google.gms:google-services:4.2.0'
   }
 }
@@ -36,7 +36,7 @@ android {
     sourceCompatibility 1.8
     targetCompatibility 1.8
   }
-  compileSdkVersion 28
+  compileSdkVersion 33
 
   sourceSets {
     main {
@@ -49,7 +49,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:32.3.1')
+  implementation platform('com.google.firebase:firebase-bom:32.7.0')
   implementation 'com.google.firebase:firebase-appcheck'
 }
 
diff --git a/app_check/build.gradle b/app_check/build.gradle
index 1a5b936094..e4c3e17f1f 100644
--- a/app_check/build.gradle
+++ b/app_check/build.gradle
@@ -18,7 +18,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.3.3'
+    classpath 'com.android.tools.build:gradle:4.2.1'
   }
 }
 allprojects {
@@ -31,8 +31,9 @@ allprojects {
 apply plugin: 'com.android.library'
 
 android {
-  compileSdkVersion 28
-  buildToolsVersion '28.0.3'
+  compileSdkVersion 33
+  ndkPath System.getenv('ANDROID_NDK_HOME')
+  buildToolsVersion '30.0.2'
 
   sourceSets {
     main {
diff --git a/app_check/integration_test/AndroidManifest.xml b/app_check/integration_test/AndroidManifest.xml
index 1882a20b62..4751790d91 100644
--- a/app_check/integration_test/AndroidManifest.xml
+++ b/app_check/integration_test/AndroidManifest.xml
@@ -22,7 +22,6 @@
   <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
   <uses-permission android:name="android.permission.WAKE_LOCK" />
-  <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="28" />
   <application android:label="@string/app_name">
     <activity android:name="android.app.NativeActivity"
               android:screenOrientation="portrait"
diff --git a/app_check/integration_test/build.gradle b/app_check/integration_test/build.gradle
index 7111eaa8cf..98e49fd9c4 100644
--- a/app_check/integration_test/build.gradle
+++ b/app_check/integration_test/build.gradle
@@ -20,7 +20,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.3.3'
+    classpath 'com.android.tools.build:gradle:4.2.1'
     classpath 'com.google.gms:google-services:4.0.1'
   }
 }
@@ -40,8 +40,9 @@ android {
     sourceCompatibility 1.8
     targetCompatibility 1.8
   }
-  compileSdkVersion 28
-  buildToolsVersion '28.0.3'
+  compileSdkVersion 33
+  ndkPath System.getenv('ANDROID_NDK_HOME')
+  buildToolsVersion '30.0.2'
 
   sourceSets {
     main {
diff --git a/app_check/integration_test/gradle.properties b/app_check/integration_test/gradle.properties
new file mode 100644
index 0000000000..ac891ac594
--- /dev/null
+++ b/app_check/integration_test/gradle.properties
@@ -0,0 +1,2 @@
+android.useAndroidX = true
+org.gradle.jvmargs=-Xmx2560m
diff --git a/app_check/integration_test/gradle/wrapper/gradle-wrapper.properties b/app_check/integration_test/gradle/wrapper/gradle-wrapper.properties
index 9e09cdb6ad..65340c1b59 100644
--- a/app_check/integration_test/gradle/wrapper/gradle-wrapper.properties
+++ b/app_check/integration_test/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https://services.gradle.org/distributions/gradle-6.7.1-all.zip
diff --git a/app_check/integration_test/settings.gradle b/app_check/integration_test/settings.gradle
index 5d33554481..95c0c079d2 100644
--- a/app_check/integration_test/settings.gradle
+++ b/app_check/integration_test/settings.gradle
@@ -36,4 +36,6 @@ if (!(new File(firebase_cpp_sdk_dir)).exists()) {
             firebase_cpp_sdk_dir))
 }
 gradle.ext.firebase_cpp_sdk_dir = "$firebase_cpp_sdk_dir"
-includeBuild "$firebase_cpp_sdk_dir"
+includeBuild("$firebase_cpp_sdk_dir") {
+  name = "firebase_cpp_sdk"
+}
diff --git a/auth/auth_resources/build.gradle b/auth/auth_resources/build.gradle
index 392128769e..45a7bce9da 100644
--- a/auth/auth_resources/build.gradle
+++ b/auth/auth_resources/build.gradle
@@ -18,7 +18,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.3.3'
+    classpath 'com.android.tools.build:gradle:4.2.1'
     classpath 'com.google.gms:google-services:4.2.0'
   }
 }
@@ -36,7 +36,7 @@ android {
     sourceCompatibility 1.8
     targetCompatibility 1.8
   }
-  compileSdkVersion 28
+  compileSdkVersion 33
 
   sourceSets {
     main {
@@ -49,7 +49,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:32.3.1')
+  implementation platform('com.google.firebase:firebase-bom:32.7.0')
   implementation 'com.google.firebase:firebase-analytics'
   implementation 'com.google.firebase:firebase-auth'
   implementation project(':app:app_resources')
diff --git a/auth/build.gradle b/auth/build.gradle
index 5938e531eb..b47f614610 100644
--- a/auth/build.gradle
+++ b/auth/build.gradle
@@ -18,7 +18,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.3.3'
+    classpath 'com.android.tools.build:gradle:4.2.1'
   }
 }
 allprojects {
@@ -31,8 +31,9 @@ allprojects {
 apply plugin: 'com.android.library'
 
 android {
-  compileSdkVersion 28
-  buildToolsVersion '28.0.3'
+  compileSdkVersion 33
+  ndkPath System.getenv('ANDROID_NDK_HOME')
+  buildToolsVersion '30.0.2'
 
   sourceSets {
     main {
diff --git a/auth/integration_test/AndroidManifest.xml b/auth/integration_test/AndroidManifest.xml
index 374200a7d6..04eef11c90 100644
--- a/auth/integration_test/AndroidManifest.xml
+++ b/auth/integration_test/AndroidManifest.xml
@@ -22,7 +22,6 @@
   <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
   <uses-permission android:name="android.permission.WAKE_LOCK" />
-  <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="28" />
   <application android:label="@string/app_name">
     <activity android:name="android.app.NativeActivity"
               android:screenOrientation="portrait"
diff --git a/auth/integration_test/build.gradle b/auth/integration_test/build.gradle
index 141b152cc6..e52a9ffb1a 100644
--- a/auth/integration_test/build.gradle
+++ b/auth/integration_test/build.gradle
@@ -20,7 +20,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.3.3'
+    classpath 'com.android.tools.build:gradle:4.2.1'
     classpath 'com.google.gms:google-services:4.0.1'
   }
 }
@@ -40,8 +40,9 @@ android {
     sourceCompatibility 1.8
     targetCompatibility 1.8
   }
-  compileSdkVersion 28
-  buildToolsVersion '28.0.3'
+  compileSdkVersion 33
+  ndkPath System.getenv('ANDROID_NDK_HOME')
+  buildToolsVersion '30.0.2'
 
   sourceSets {
     main {
@@ -61,6 +62,7 @@ android {
     externalNativeBuild.cmake {
       arguments "-DFIREBASE_CPP_SDK_DIR=$gradle.firebase_cpp_sdk_dir"
     }
+    multiDexEnabled true
   }
   externalNativeBuild.cmake {
     path 'CMakeLists.txt'
diff --git a/auth/integration_test/gradle.properties b/auth/integration_test/gradle.properties
new file mode 100644
index 0000000000..ac891ac594
--- /dev/null
+++ b/auth/integration_test/gradle.properties
@@ -0,0 +1,2 @@
+android.useAndroidX = true
+org.gradle.jvmargs=-Xmx2560m
diff --git a/auth/integration_test/gradle/wrapper/gradle-wrapper.properties b/auth/integration_test/gradle/wrapper/gradle-wrapper.properties
index 9e09cdb6ad..65340c1b59 100644
--- a/auth/integration_test/gradle/wrapper/gradle-wrapper.properties
+++ b/auth/integration_test/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https://services.gradle.org/distributions/gradle-6.7.1-all.zip
diff --git a/auth/integration_test/settings.gradle b/auth/integration_test/settings.gradle
index 2270c51ca4..8b600af5be 100644
--- a/auth/integration_test/settings.gradle
+++ b/auth/integration_test/settings.gradle
@@ -36,4 +36,6 @@ if (!(new File(firebase_cpp_sdk_dir)).exists()) {
             firebase_cpp_sdk_dir))
 }
 gradle.ext.firebase_cpp_sdk_dir = "$firebase_cpp_sdk_dir"
-includeBuild "$firebase_cpp_sdk_dir"
\ No newline at end of file
+includeBuild("$firebase_cpp_sdk_dir") {
+  name = "firebase_cpp_sdk"
+}
diff --git a/build_scripts/android/build.sh b/build_scripts/android/build.sh
index d8ae0faf41..0f4d63cb94 100755
--- a/build_scripts/android/build.sh
+++ b/build_scripts/android/build.sh
@@ -51,9 +51,9 @@ for retry in {1..10} error; do
 done
 set -e
 
-# Gradle puts the build output inside the source tree, in various
-# "build" and ".externalNativeBuild" directories. Grab them and place
-# them in the build output directory.
+# Gradle puts the build output inside the source tree, in various "build",
+# ".externalNativeBuild", and ".cxx" directories. Grab them and place them in
+# the build output directory.
 declare -a paths
 for lib in *; do
     if [[ -d "${lib}/build" ]]; then
@@ -62,6 +62,9 @@ for lib in *; do
     if [[ -d "${lib}/.externalNativeBuild" ]]; then
         paths+=("${lib}/.externalNativeBuild")
     fi
+    if [[ -d "${lib}/.cxx" ]]; then
+        paths+=("${lib}/.cxx")
+    fi
     if [[ -d "${lib}/${lib}_resources/build" ]]; then
         paths+=("${lib}/${lib}_resources/build")
     fi
diff --git a/database/build.gradle b/database/build.gradle
index 0399e831b7..cc990d3bba 100644
--- a/database/build.gradle
+++ b/database/build.gradle
@@ -18,7 +18,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.3.3'
+    classpath 'com.android.tools.build:gradle:4.2.1'
   }
 }
 allprojects {
@@ -31,8 +31,9 @@ allprojects {
 apply plugin: 'com.android.library'
 
 android {
-  compileSdkVersion 28
-  buildToolsVersion '28.0.3'
+  compileSdkVersion 33
+  ndkPath System.getenv('ANDROID_NDK_HOME')
+  buildToolsVersion '30.0.2'
 
   sourceSets {
     main {
diff --git a/database/database_resources/build.gradle b/database/database_resources/build.gradle
index 54c3a74ebb..be0abdff20 100644
--- a/database/database_resources/build.gradle
+++ b/database/database_resources/build.gradle
@@ -18,7 +18,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.3.3'
+    classpath 'com.android.tools.build:gradle:4.2.1'
     classpath 'com.google.gms:google-services:4.2.0'
   }
 }
@@ -32,7 +32,7 @@ allprojects {
 apply plugin: 'com.android.library'
 
 android {
-  compileSdkVersion 28
+  compileSdkVersion 33
 
   sourceSets {
     main {
@@ -45,7 +45,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:32.3.1')
+  implementation platform('com.google.firebase:firebase-bom:32.7.0')
   implementation 'com.google.firebase:firebase-analytics'
   implementation 'com.google.firebase:firebase-database'
   //implementation project(':app:app_resources')
diff --git a/database/integration_test/AndroidManifest.xml b/database/integration_test/AndroidManifest.xml
index dfdc23221e..c0251204fd 100644
--- a/database/integration_test/AndroidManifest.xml
+++ b/database/integration_test/AndroidManifest.xml
@@ -22,7 +22,6 @@
   <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
   <uses-permission android:name="android.permission.WAKE_LOCK" />
-  <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="28" />
   <application android:label="@string/app_name">
     <activity android:name="android.app.NativeActivity"
               android:screenOrientation="portrait"
diff --git a/database/integration_test/build.gradle b/database/integration_test/build.gradle
index 1db332084d..c4a838aec9 100644
--- a/database/integration_test/build.gradle
+++ b/database/integration_test/build.gradle
@@ -20,7 +20,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.3.3'
+    classpath 'com.android.tools.build:gradle:4.2.1'
     classpath 'com.google.gms:google-services:4.0.1'
   }
 }
@@ -40,8 +40,9 @@ android {
     sourceCompatibility 1.8
     targetCompatibility 1.8
   }
-  compileSdkVersion 28
-  buildToolsVersion '28.0.3'
+  compileSdkVersion 33
+  ndkPath System.getenv('ANDROID_NDK_HOME')
+  buildToolsVersion '30.0.2'
 
   sourceSets {
     main {
@@ -61,6 +62,7 @@ android {
     externalNativeBuild.cmake {
       arguments "-DFIREBASE_CPP_SDK_DIR=$gradle.firebase_cpp_sdk_dir"
     }
+    multiDexEnabled true
   }
   externalNativeBuild.cmake {
     path 'CMakeLists.txt'
diff --git a/database/integration_test/gradle.properties b/database/integration_test/gradle.properties
new file mode 100644
index 0000000000..ac891ac594
--- /dev/null
+++ b/database/integration_test/gradle.properties
@@ -0,0 +1,2 @@
+android.useAndroidX = true
+org.gradle.jvmargs=-Xmx2560m
diff --git a/database/integration_test/gradle/wrapper/gradle-wrapper.properties b/database/integration_test/gradle/wrapper/gradle-wrapper.properties
index 9e09cdb6ad..65340c1b59 100644
--- a/database/integration_test/gradle/wrapper/gradle-wrapper.properties
+++ b/database/integration_test/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https://services.gradle.org/distributions/gradle-6.7.1-all.zip
diff --git a/database/integration_test/settings.gradle b/database/integration_test/settings.gradle
index 2270c51ca4..8b600af5be 100644
--- a/database/integration_test/settings.gradle
+++ b/database/integration_test/settings.gradle
@@ -36,4 +36,6 @@ if (!(new File(firebase_cpp_sdk_dir)).exists()) {
             firebase_cpp_sdk_dir))
 }
 gradle.ext.firebase_cpp_sdk_dir = "$firebase_cpp_sdk_dir"
-includeBuild "$firebase_cpp_sdk_dir"
\ No newline at end of file
+includeBuild("$firebase_cpp_sdk_dir") {
+  name = "firebase_cpp_sdk"
+}
diff --git a/dynamic_links/build.gradle b/dynamic_links/build.gradle
index a19d2ba9a1..e244825c73 100644
--- a/dynamic_links/build.gradle
+++ b/dynamic_links/build.gradle
@@ -18,7 +18,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.3.3'
+    classpath 'com.android.tools.build:gradle:4.2.1'
   }
 }
 allprojects {
@@ -31,8 +31,9 @@ allprojects {
 apply plugin: 'com.android.library'
 
 android {
-  compileSdkVersion 28
-  buildToolsVersion '28.0.3'
+  compileSdkVersion 33
+  ndkPath System.getenv('ANDROID_NDK_HOME')
+  buildToolsVersion '30.0.2'
 
   sourceSets {
     main {
diff --git a/dynamic_links/integration_test/AndroidManifest.xml b/dynamic_links/integration_test/AndroidManifest.xml
index 393b4458df..d3effcad4f 100644
--- a/dynamic_links/integration_test/AndroidManifest.xml
+++ b/dynamic_links/integration_test/AndroidManifest.xml
@@ -22,7 +22,6 @@
   <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
   <uses-permission android:name="android.permission.WAKE_LOCK" />
-  <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="28" />
   <application android:label="@string/app_name">
     <activity android:name="android.app.NativeActivity"
               android:screenOrientation="portrait"
diff --git a/dynamic_links/integration_test/build.gradle b/dynamic_links/integration_test/build.gradle
index b6af122248..85157e99f5 100644
--- a/dynamic_links/integration_test/build.gradle
+++ b/dynamic_links/integration_test/build.gradle
@@ -20,7 +20,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.3.3'
+    classpath 'com.android.tools.build:gradle:4.2.1'
     classpath 'com.google.gms:google-services:4.0.1'
   }
 }
@@ -40,8 +40,9 @@ android {
     sourceCompatibility 1.8
     targetCompatibility 1.8
   }
-  compileSdkVersion 28
-  buildToolsVersion '28.0.3'
+  compileSdkVersion 33
+  ndkPath System.getenv('ANDROID_NDK_HOME')
+  buildToolsVersion '30.0.2'
 
   sourceSets {
     main {
diff --git a/dynamic_links/integration_test/gradle.properties b/dynamic_links/integration_test/gradle.properties
new file mode 100644
index 0000000000..ac891ac594
--- /dev/null
+++ b/dynamic_links/integration_test/gradle.properties
@@ -0,0 +1,2 @@
+android.useAndroidX = true
+org.gradle.jvmargs=-Xmx2560m
diff --git a/dynamic_links/integration_test/gradle/wrapper/gradle-wrapper.properties b/dynamic_links/integration_test/gradle/wrapper/gradle-wrapper.properties
index 9e09cdb6ad..65340c1b59 100644
--- a/dynamic_links/integration_test/gradle/wrapper/gradle-wrapper.properties
+++ b/dynamic_links/integration_test/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https://services.gradle.org/distributions/gradle-6.7.1-all.zip
diff --git a/dynamic_links/integration_test/settings.gradle b/dynamic_links/integration_test/settings.gradle
index 2270c51ca4..8b600af5be 100644
--- a/dynamic_links/integration_test/settings.gradle
+++ b/dynamic_links/integration_test/settings.gradle
@@ -36,4 +36,6 @@ if (!(new File(firebase_cpp_sdk_dir)).exists()) {
             firebase_cpp_sdk_dir))
 }
 gradle.ext.firebase_cpp_sdk_dir = "$firebase_cpp_sdk_dir"
-includeBuild "$firebase_cpp_sdk_dir"
\ No newline at end of file
+includeBuild("$firebase_cpp_sdk_dir") {
+  name = "firebase_cpp_sdk"
+}
diff --git a/firestore/build.gradle b/firestore/build.gradle
index e9f0723f58..5cae4bacf6 100644
--- a/firestore/build.gradle
+++ b/firestore/build.gradle
@@ -18,7 +18,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.3.3'
+    classpath 'com.android.tools.build:gradle:4.2.1'
   }
 }
 allprojects {
@@ -31,8 +31,9 @@ allprojects {
 apply plugin: 'com.android.library'
 
 android {
-  compileSdkVersion 28
-  buildToolsVersion '28.0.3'
+  compileSdkVersion 33
+  ndkPath System.getenv('ANDROID_NDK_HOME')
+  buildToolsVersion '30.0.2'
 
   sourceSets {
     main {
diff --git a/firestore/firestore_resources/build.gradle b/firestore/firestore_resources/build.gradle
index 33e5738460..da63b8d882 100644
--- a/firestore/firestore_resources/build.gradle
+++ b/firestore/firestore_resources/build.gradle
@@ -18,7 +18,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.3.3'
+    classpath 'com.android.tools.build:gradle:4.2.1'
     classpath 'com.google.gms:google-services:4.2.0'
   }
 }
@@ -36,7 +36,7 @@ android {
     sourceCompatibility 1.8
     targetCompatibility 1.8
   }
-  compileSdkVersion 28
+  compileSdkVersion 33
 
   sourceSets {
     main {
@@ -53,7 +53,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:32.3.1')
+  implementation platform('com.google.firebase:firebase-bom:32.7.0')
   implementation 'com.google.firebase:firebase-analytics'
   implementation 'com.google.firebase:firebase-firestore'
 }
diff --git a/firestore/integration_test/AndroidManifest.xml b/firestore/integration_test/AndroidManifest.xml
index 143614d6bc..ada4f0f225 100644
--- a/firestore/integration_test/AndroidManifest.xml
+++ b/firestore/integration_test/AndroidManifest.xml
@@ -22,7 +22,6 @@
   <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
   <uses-permission android:name="android.permission.WAKE_LOCK" />
-  <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="28" />
   <application android:label="@string/app_name">
     <activity android:name="android.app.NativeActivity"
               android:screenOrientation="portrait"
diff --git a/firestore/integration_test/build.gradle b/firestore/integration_test/build.gradle
index 2e1eb443c9..877ea4d19f 100644
--- a/firestore/integration_test/build.gradle
+++ b/firestore/integration_test/build.gradle
@@ -20,7 +20,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.3.3'
+    classpath 'com.android.tools.build:gradle:4.2.1'
     classpath 'com.google.gms:google-services:4.0.1'
   }
 }
@@ -40,8 +40,9 @@ android {
     sourceCompatibility 1.8
     targetCompatibility 1.8
   }
-  compileSdkVersion 28
-  buildToolsVersion '28.0.3'
+  compileSdkVersion 33
+  ndkPath System.getenv('ANDROID_NDK_HOME')
+  buildToolsVersion '30.0.2'
 
   sourceSets {
     main {
diff --git a/firestore/integration_test/gradle.properties b/firestore/integration_test/gradle.properties
new file mode 100644
index 0000000000..ac891ac594
--- /dev/null
+++ b/firestore/integration_test/gradle.properties
@@ -0,0 +1,2 @@
+android.useAndroidX = true
+org.gradle.jvmargs=-Xmx2560m
diff --git a/firestore/integration_test/gradle/wrapper/gradle-wrapper.properties b/firestore/integration_test/gradle/wrapper/gradle-wrapper.properties
index 9e09cdb6ad..65340c1b59 100644
--- a/firestore/integration_test/gradle/wrapper/gradle-wrapper.properties
+++ b/firestore/integration_test/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https://services.gradle.org/distributions/gradle-6.7.1-all.zip
diff --git a/firestore/integration_test/settings.gradle b/firestore/integration_test/settings.gradle
index 2270c51ca4..8b600af5be 100644
--- a/firestore/integration_test/settings.gradle
+++ b/firestore/integration_test/settings.gradle
@@ -36,4 +36,6 @@ if (!(new File(firebase_cpp_sdk_dir)).exists()) {
             firebase_cpp_sdk_dir))
 }
 gradle.ext.firebase_cpp_sdk_dir = "$firebase_cpp_sdk_dir"
-includeBuild "$firebase_cpp_sdk_dir"
\ No newline at end of file
+includeBuild("$firebase_cpp_sdk_dir") {
+  name = "firebase_cpp_sdk"
+}
diff --git a/firestore/integration_test_internal/AndroidManifest.xml b/firestore/integration_test_internal/AndroidManifest.xml
index 0c0c914edd..0e36543bf4 100644
--- a/firestore/integration_test_internal/AndroidManifest.xml
+++ b/firestore/integration_test_internal/AndroidManifest.xml
@@ -22,7 +22,6 @@
   <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
   <uses-permission android:name="android.permission.WAKE_LOCK" />
-  <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="28" />
   <application android:label="@string/app_name">
     <activity android:name="android.app.NativeActivity"
               android:screenOrientation="portrait"
diff --git a/firestore/integration_test_internal/build.gradle b/firestore/integration_test_internal/build.gradle
index 27aca20365..64d149b6ad 100644
--- a/firestore/integration_test_internal/build.gradle
+++ b/firestore/integration_test_internal/build.gradle
@@ -20,7 +20,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.3.3'
+    classpath 'com.android.tools.build:gradle:4.2.1'
     classpath 'com.google.gms:google-services:4.0.1'
   }
 }
@@ -40,8 +40,9 @@ android {
     sourceCompatibility 1.8
     targetCompatibility 1.8
   }
-  compileSdkVersion 28
-  buildToolsVersion '28.0.3'
+  compileSdkVersion 33
+  ndkPath System.getenv('ANDROID_NDK_HOME')
+  buildToolsVersion '30.0.2'
 
   sourceSets {
     main {
diff --git a/firestore/integration_test_internal/gradle.properties b/firestore/integration_test_internal/gradle.properties
new file mode 100644
index 0000000000..ac891ac594
--- /dev/null
+++ b/firestore/integration_test_internal/gradle.properties
@@ -0,0 +1,2 @@
+android.useAndroidX = true
+org.gradle.jvmargs=-Xmx2560m
diff --git a/firestore/integration_test_internal/gradle/wrapper/gradle-wrapper.properties b/firestore/integration_test_internal/gradle/wrapper/gradle-wrapper.properties
index 9e09cdb6ad..65340c1b59 100644
--- a/firestore/integration_test_internal/gradle/wrapper/gradle-wrapper.properties
+++ b/firestore/integration_test_internal/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https://services.gradle.org/distributions/gradle-6.7.1-all.zip
diff --git a/firestore/integration_test_internal/settings.gradle b/firestore/integration_test_internal/settings.gradle
index 2270c51ca4..8b600af5be 100644
--- a/firestore/integration_test_internal/settings.gradle
+++ b/firestore/integration_test_internal/settings.gradle
@@ -36,4 +36,6 @@ if (!(new File(firebase_cpp_sdk_dir)).exists()) {
             firebase_cpp_sdk_dir))
 }
 gradle.ext.firebase_cpp_sdk_dir = "$firebase_cpp_sdk_dir"
-includeBuild "$firebase_cpp_sdk_dir"
\ No newline at end of file
+includeBuild("$firebase_cpp_sdk_dir") {
+  name = "firebase_cpp_sdk"
+}
diff --git a/functions/build.gradle b/functions/build.gradle
index 55da3b4d2e..ac1d7ca2d2 100644
--- a/functions/build.gradle
+++ b/functions/build.gradle
@@ -18,7 +18,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.3.3'
+    classpath 'com.android.tools.build:gradle:4.2.1'
   }
 }
 allprojects {
@@ -31,8 +31,9 @@ allprojects {
 apply plugin: 'com.android.library'
 
 android {
-  compileSdkVersion 28
-  buildToolsVersion '28.0.3'
+  compileSdkVersion 33
+  ndkPath System.getenv('ANDROID_NDK_HOME')
+  buildToolsVersion '30.0.2'
 
   sourceSets {
     main {
diff --git a/functions/integration_test/AndroidManifest.xml b/functions/integration_test/AndroidManifest.xml
index bf1479b828..9982a95e43 100644
--- a/functions/integration_test/AndroidManifest.xml
+++ b/functions/integration_test/AndroidManifest.xml
@@ -22,7 +22,6 @@
   <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
   <uses-permission android:name="android.permission.WAKE_LOCK" />
-  <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="28" />
   <application android:label="@string/app_name">
     <activity android:name="android.app.NativeActivity"
               android:screenOrientation="portrait"
diff --git a/functions/integration_test/build.gradle b/functions/integration_test/build.gradle
index a1e6bd038e..644d111afb 100644
--- a/functions/integration_test/build.gradle
+++ b/functions/integration_test/build.gradle
@@ -20,7 +20,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.3.3'
+    classpath 'com.android.tools.build:gradle:4.2.1'
     classpath 'com.google.gms:google-services:4.0.1'
   }
 }
@@ -40,8 +40,9 @@ android {
     sourceCompatibility 1.8
     targetCompatibility 1.8
   }
-  compileSdkVersion 28
-  buildToolsVersion '28.0.3'
+  compileSdkVersion 33
+  ndkPath System.getenv('ANDROID_NDK_HOME')
+  buildToolsVersion '30.0.2'
 
   sourceSets {
     main {
@@ -61,6 +62,7 @@ android {
     externalNativeBuild.cmake {
       arguments "-DFIREBASE_CPP_SDK_DIR=$gradle.firebase_cpp_sdk_dir"
     }
+    multiDexEnabled true
   }
   externalNativeBuild.cmake {
     path 'CMakeLists.txt'
diff --git a/functions/integration_test/gradle.properties b/functions/integration_test/gradle.properties
new file mode 100644
index 0000000000..ac891ac594
--- /dev/null
+++ b/functions/integration_test/gradle.properties
@@ -0,0 +1,2 @@
+android.useAndroidX = true
+org.gradle.jvmargs=-Xmx2560m
diff --git a/functions/integration_test/gradle/wrapper/gradle-wrapper.properties b/functions/integration_test/gradle/wrapper/gradle-wrapper.properties
index 9e09cdb6ad..65340c1b59 100644
--- a/functions/integration_test/gradle/wrapper/gradle-wrapper.properties
+++ b/functions/integration_test/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https://services.gradle.org/distributions/gradle-6.7.1-all.zip
diff --git a/functions/integration_test/settings.gradle b/functions/integration_test/settings.gradle
index 2270c51ca4..8b600af5be 100644
--- a/functions/integration_test/settings.gradle
+++ b/functions/integration_test/settings.gradle
@@ -36,4 +36,6 @@ if (!(new File(firebase_cpp_sdk_dir)).exists()) {
             firebase_cpp_sdk_dir))
 }
 gradle.ext.firebase_cpp_sdk_dir = "$firebase_cpp_sdk_dir"
-includeBuild "$firebase_cpp_sdk_dir"
\ No newline at end of file
+includeBuild("$firebase_cpp_sdk_dir") {
+  name = "firebase_cpp_sdk"
+}
diff --git a/gma/build.gradle b/gma/build.gradle
index c0c2687bd1..8788d55400 100644
--- a/gma/build.gradle
+++ b/gma/build.gradle
@@ -18,7 +18,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.3.3'
+    classpath 'com.android.tools.build:gradle:4.2.1'
   }
 }
 allprojects {
@@ -31,8 +31,9 @@ allprojects {
 apply plugin: 'com.android.library'
 
 android {
-  compileSdkVersion 28
-  buildToolsVersion '28.0.3'
+  compileSdkVersion 33
+  ndkPath System.getenv('ANDROID_NDK_HOME')
+  buildToolsVersion '30.0.2'
 
   sourceSets {
     main {
diff --git a/gma/gma_resources/build.gradle b/gma/gma_resources/build.gradle
index 22ae76f5fd..861f4bee98 100644
--- a/gma/gma_resources/build.gradle
+++ b/gma/gma_resources/build.gradle
@@ -18,7 +18,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.3.3'
+    classpath 'com.android.tools.build:gradle:4.2.1'
     classpath 'com.google.gms:google-services:4.2.0'
   }
 }
@@ -37,7 +37,7 @@ android {
     targetCompatibility 1.8
   }
 
-  compileSdkVersion 28
+  compileSdkVersion 33
 
   sourceSets {
     main {
@@ -50,9 +50,9 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:32.3.1')
+  implementation platform('com.google.firebase:firebase-bom:32.7.0')
   implementation 'com.google.firebase:firebase-analytics'
-  implementation 'com.google.android.gms:play-services-ads:22.3.0'
+  implementation 'com.google.android.gms:play-services-ads:22.6.0'
   implementation 'com.google.android.ump:user-messaging-platform:2.1.0'
 }
 
diff --git a/gma/integration_test/AndroidManifest.xml b/gma/integration_test/AndroidManifest.xml
index 84cd08da84..9cc47e3d27 100644
--- a/gma/integration_test/AndroidManifest.xml
+++ b/gma/integration_test/AndroidManifest.xml
@@ -22,7 +22,6 @@
   <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
   <uses-permission android:name="android.permission.WAKE_LOCK" />
-  <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
   <application android:label="@string/app_name">
     <!-- You may replace the sample App ID below with your own App ID. -->
     <meta-data
diff --git a/gma/integration_test/build.gradle b/gma/integration_test/build.gradle
index 95d4ec2081..aa05d340b9 100644
--- a/gma/integration_test/build.gradle
+++ b/gma/integration_test/build.gradle
@@ -20,7 +20,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.3.3'
+    classpath 'com.android.tools.build:gradle:4.2.1'
     classpath 'com.google.gms:google-services:4.0.1'
   }
 }
@@ -40,8 +40,9 @@ android {
     sourceCompatibility 1.8
     targetCompatibility 1.8
   }
-  compileSdkVersion 28
-  buildToolsVersion '28.0.3'
+  compileSdkVersion 33
+  ndkPath System.getenv('ANDROID_NDK_HOME')
+  buildToolsVersion '30.0.2'
 
   sourceSets {
     main {
diff --git a/gma/integration_test/gradle.properties b/gma/integration_test/gradle.properties
new file mode 100644
index 0000000000..ac891ac594
--- /dev/null
+++ b/gma/integration_test/gradle.properties
@@ -0,0 +1,2 @@
+android.useAndroidX = true
+org.gradle.jvmargs=-Xmx2560m
diff --git a/gma/integration_test/gradle/wrapper/gradle-wrapper.properties b/gma/integration_test/gradle/wrapper/gradle-wrapper.properties
index 9e09cdb6ad..65340c1b59 100644
--- a/gma/integration_test/gradle/wrapper/gradle-wrapper.properties
+++ b/gma/integration_test/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https://services.gradle.org/distributions/gradle-6.7.1-all.zip
diff --git a/gma/integration_test/settings.gradle b/gma/integration_test/settings.gradle
index c392653ed3..7e56f6228e 100644
--- a/gma/integration_test/settings.gradle
+++ b/gma/integration_test/settings.gradle
@@ -36,4 +36,6 @@ if (!(new File(firebase_cpp_sdk_dir)).exists()) {
             firebase_cpp_sdk_dir))
 }
 gradle.ext.firebase_cpp_sdk_dir = "$firebase_cpp_sdk_dir"
-includeBuild "$firebase_cpp_sdk_dir"
+includeBuild("$firebase_cpp_sdk_dir") {
+  name = "firebase_cpp_sdk"
+}
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 0000000000..ac891ac594
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,2 @@
+android.useAndroidX = true
+org.gradle.jvmargs=-Xmx2560m
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index fe42a4138e..39e18027f1 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https://services.gradle.org/distributions/gradle-6.7.1-all.zip
diff --git a/installations/build.gradle b/installations/build.gradle
index 58fd6f1f47..17bdb76c78 100644
--- a/installations/build.gradle
+++ b/installations/build.gradle
@@ -18,7 +18,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.3.3'
+    classpath 'com.android.tools.build:gradle:4.2.1'
   }
 }
 allprojects {
@@ -31,8 +31,9 @@ allprojects {
 apply plugin: 'com.android.library'
 
 android {
-  compileSdkVersion 28
-  buildToolsVersion '28.0.3'
+  compileSdkVersion 33
+  ndkPath System.getenv('ANDROID_NDK_HOME')
+  buildToolsVersion '30.0.2'
 
   sourceSets {
     main {
diff --git a/installations/integration_test/AndroidManifest.xml b/installations/integration_test/AndroidManifest.xml
index edb5b768fe..baf79eb982 100644
--- a/installations/integration_test/AndroidManifest.xml
+++ b/installations/integration_test/AndroidManifest.xml
@@ -22,7 +22,6 @@
   <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
   <uses-permission android:name="android.permission.WAKE_LOCK" />
-  <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="28" />
   <application android:label="@string/app_name">
     <activity android:name="android.app.NativeActivity"
               android:screenOrientation="portrait"
diff --git a/installations/integration_test/build.gradle b/installations/integration_test/build.gradle
index 7ac3ce618a..87e60a9686 100644
--- a/installations/integration_test/build.gradle
+++ b/installations/integration_test/build.gradle
@@ -20,7 +20,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.3.3'
+    classpath 'com.android.tools.build:gradle:4.2.1'
     classpath 'com.google.gms:google-services:4.0.1'
   }
 }
@@ -40,8 +40,9 @@ android {
     sourceCompatibility 1.8
     targetCompatibility 1.8
   }
-  compileSdkVersion 28
-  buildToolsVersion '28.0.3'
+  compileSdkVersion 33
+  ndkPath System.getenv('ANDROID_NDK_HOME')
+  buildToolsVersion '30.0.2'
 
   sourceSets {
     main {
diff --git a/installations/integration_test/gradle.properties b/installations/integration_test/gradle.properties
new file mode 100644
index 0000000000..ac891ac594
--- /dev/null
+++ b/installations/integration_test/gradle.properties
@@ -0,0 +1,2 @@
+android.useAndroidX = true
+org.gradle.jvmargs=-Xmx2560m
diff --git a/installations/integration_test/gradle/wrapper/gradle-wrapper.properties b/installations/integration_test/gradle/wrapper/gradle-wrapper.properties
index 9e09cdb6ad..65340c1b59 100644
--- a/installations/integration_test/gradle/wrapper/gradle-wrapper.properties
+++ b/installations/integration_test/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https://services.gradle.org/distributions/gradle-6.7.1-all.zip
diff --git a/installations/integration_test/settings.gradle b/installations/integration_test/settings.gradle
index 89167daf03..8b600af5be 100644
--- a/installations/integration_test/settings.gradle
+++ b/installations/integration_test/settings.gradle
@@ -36,4 +36,6 @@ if (!(new File(firebase_cpp_sdk_dir)).exists()) {
             firebase_cpp_sdk_dir))
 }
 gradle.ext.firebase_cpp_sdk_dir = "$firebase_cpp_sdk_dir"
-includeBuild "$firebase_cpp_sdk_dir"
+includeBuild("$firebase_cpp_sdk_dir") {
+  name = "firebase_cpp_sdk"
+}
diff --git a/messaging/build.gradle b/messaging/build.gradle
index a9bf5ae9b4..729b3e1906 100644
--- a/messaging/build.gradle
+++ b/messaging/build.gradle
@@ -18,7 +18,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.3.3'
+    classpath 'com.android.tools.build:gradle:4.2.1'
   }
 }
 allprojects {
@@ -31,8 +31,9 @@ allprojects {
 apply plugin: 'com.android.library'
 
 android {
-  compileSdkVersion 28
-  buildToolsVersion '28.0.3'
+  compileSdkVersion 33
+  ndkPath System.getenv('ANDROID_NDK_HOME')
+  buildToolsVersion '30.0.2'
 
   sourceSets {
     main {
diff --git a/messaging/integration_test/AndroidManifest.xml b/messaging/integration_test/AndroidManifest.xml
index 261592d676..08d6b95a92 100644
--- a/messaging/integration_test/AndroidManifest.xml
+++ b/messaging/integration_test/AndroidManifest.xml
@@ -19,7 +19,6 @@
           package="com.google.firebase.cpp.messaging.testapp"
           android:versionCode="1"
           android:versionName="1.0">
-  <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="28" />
   <!-- Required by firebase-iid from
        java/com/google/android/gmscore/integ/client/firebase-iid/\
        AndroidManifest.xml -->
diff --git a/messaging/integration_test/build.gradle b/messaging/integration_test/build.gradle
index 210859b4f6..3991e49a24 100644
--- a/messaging/integration_test/build.gradle
+++ b/messaging/integration_test/build.gradle
@@ -20,7 +20,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.3.3'
+    classpath 'com.android.tools.build:gradle:4.2.1'
     classpath 'com.google.gms:google-services:4.0.1'
   }
 }
@@ -40,8 +40,9 @@ android {
     sourceCompatibility 1.8
     targetCompatibility 1.8
   }
-  compileSdkVersion 28
-  buildToolsVersion '28.0.3'
+  compileSdkVersion 33
+  ndkPath System.getenv('ANDROID_NDK_HOME')
+  buildToolsVersion '30.0.2'
 
   sourceSets {
     main {
diff --git a/messaging/integration_test/gradle.properties b/messaging/integration_test/gradle.properties
new file mode 100644
index 0000000000..ac891ac594
--- /dev/null
+++ b/messaging/integration_test/gradle.properties
@@ -0,0 +1,2 @@
+android.useAndroidX = true
+org.gradle.jvmargs=-Xmx2560m
diff --git a/messaging/integration_test/gradle/wrapper/gradle-wrapper.properties b/messaging/integration_test/gradle/wrapper/gradle-wrapper.properties
index 9e09cdb6ad..65340c1b59 100644
--- a/messaging/integration_test/gradle/wrapper/gradle-wrapper.properties
+++ b/messaging/integration_test/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https://services.gradle.org/distributions/gradle-6.7.1-all.zip
diff --git a/messaging/integration_test/settings.gradle b/messaging/integration_test/settings.gradle
index 2270c51ca4..8b600af5be 100644
--- a/messaging/integration_test/settings.gradle
+++ b/messaging/integration_test/settings.gradle
@@ -36,4 +36,6 @@ if (!(new File(firebase_cpp_sdk_dir)).exists()) {
             firebase_cpp_sdk_dir))
 }
 gradle.ext.firebase_cpp_sdk_dir = "$firebase_cpp_sdk_dir"
-includeBuild "$firebase_cpp_sdk_dir"
\ No newline at end of file
+includeBuild("$firebase_cpp_sdk_dir") {
+  name = "firebase_cpp_sdk"
+}
diff --git a/messaging/messaging_java/build.gradle b/messaging/messaging_java/build.gradle
index 4ec8598643..9520c42a47 100644
--- a/messaging/messaging_java/build.gradle
+++ b/messaging/messaging_java/build.gradle
@@ -18,7 +18,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.3.3'
+    classpath 'com.android.tools.build:gradle:4.2.1'
     classpath 'com.google.gms:google-services:4.2.0'
     // This uses Flatbuffers at 1.9 because the 1.10 version added a feature
     // that requires using a newer version of the JDK and at least Android N.
@@ -41,7 +41,7 @@ android {
     sourceCompatibility 1.8
     targetCompatibility 1.8
   }
-  compileSdkVersion 28
+  compileSdkVersion 33
 
   sourceSets {
     main {
@@ -55,7 +55,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:32.3.1')
+  implementation platform('com.google.firebase:firebase-bom:32.7.0')
   implementation 'com.google.firebase:firebase-analytics'
   implementation 'com.google.firebase:firebase-messaging'
   implementation 'com.google.flatbuffers:flatbuffers-java:1.12.0'
diff --git a/release_build_files/Android/firebase_dependencies.gradle b/release_build_files/Android/firebase_dependencies.gradle
index 0e4c71a3af..a4964e2231 100644
--- a/release_build_files/Android/firebase_dependencies.gradle
+++ b/release_build_files/Android/firebase_dependencies.gradle
@@ -27,7 +27,7 @@ def firebaseDependenciesMap = [
   'dynamic_links' : ['com.google.firebase:firebase-dynamic-links'],
   'firestore' : ['com.google.firebase:firebase-firestore'],
   'functions' : ['com.google.firebase:firebase-functions'],
-  'gma' : ['com.google.android.gms:play-services-ads:22.3.0',
+  'gma' : ['com.google.android.gms:play-services-ads:22.6.0',
            'com.google.android.ump:user-messaging-platform:2.1.0'],
   'installations' : ['com.google.firebase:firebase-installations'],
   'invites' : ['com.google.firebase:firebase-invites'],
@@ -132,7 +132,7 @@ project.afterEvaluate {
 
       // Add the bill-of-materials
     project.dependencies {
-      implementation platform('com.google.firebase:firebase-bom:32.3.1')
+      implementation platform('com.google.firebase:firebase-bom:32.7.0')
     }
     for (String lib : firebaseCpp.dependencies.libSet) {
       // Messaging includes an aar, which to be depended on properly requires
diff --git a/release_build_files/readme.md b/release_build_files/readme.md
index 100ed9203d..bfa4c1b750 100644
--- a/release_build_files/readme.md
+++ b/release_build_files/readme.md
@@ -86,7 +86,7 @@ distributed as part of the core Firebase
 
 Feature                    | Required Libraries and Gradle Packages
 -------------------------- | --------------------------------------
-All Firebase SDKs          | platform(com.google.firebase:firebase-bom:32.3.1)
+All Firebase SDKs          | platform(com.google.firebase:firebase-bom:32.7.0)
 |                          | (Android Bill of Materials)
 Firebase Analytics         | libfirebase_analytics.a
 |                          | libfirebase_app.a
@@ -134,7 +134,7 @@ Google Mobile Ads          | libfirebase_gma.a
 |                          | libfirebase_app.a
 |                          | com.google.firebase:firebase-analytics
 |                          | (Maven package)
-|                          | com.google.android.gms:play-services-ads:22.3.0
+|                          | com.google.android.gms:play-services-ads:22.6.0
 |                          | (Maven package)
 |                          | com.google.android.ump:user-messaging-platform:2.1.0
 |                          | (Maven package)
@@ -633,8 +633,12 @@ code.
 ## Release Notes
 ### Upcoming Release
 -   Changes
+    - General (Android): Firebase C++ on Android is now built using Android API
+      level 33 and Gradle 6.7.1.
+    - General (Android): Update to Firebase Android BoM version 32.3.1.
     - General (iOS): Update to Firebase Cocoapods version 10.17.0.
-    
+    - GMA (Android) Updated dependency to play-services-ads version 22.4.0.
+
 ### 11.6.0
 -   Changes
     - General (iOS): Update to Firebase Cocoapods version 10.15.0.
diff --git a/remote_config/build.gradle b/remote_config/build.gradle
index 5470c449c0..1506391b16 100644
--- a/remote_config/build.gradle
+++ b/remote_config/build.gradle
@@ -18,7 +18,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.3.3'
+    classpath 'com.android.tools.build:gradle:4.2.1'
   }
 }
 allprojects {
@@ -31,8 +31,9 @@ allprojects {
 apply plugin: 'com.android.library'
 
 android {
-  compileSdkVersion 28
-  buildToolsVersion '28.0.3'
+  compileSdkVersion 33
+  ndkPath System.getenv('ANDROID_NDK_HOME')
+  buildToolsVersion '30.0.2'
 
   sourceSets {
     main {
diff --git a/remote_config/integration_test/AndroidManifest.xml b/remote_config/integration_test/AndroidManifest.xml
index bffc82a2f3..338223292e 100644
--- a/remote_config/integration_test/AndroidManifest.xml
+++ b/remote_config/integration_test/AndroidManifest.xml
@@ -22,7 +22,6 @@
   <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
   <uses-permission android:name="android.permission.WAKE_LOCK" />
-  <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="28" />
   <application android:label="@string/app_name">
     <activity android:name="android.app.NativeActivity"
               android:screenOrientation="portrait"
diff --git a/remote_config/integration_test/build.gradle b/remote_config/integration_test/build.gradle
index 8ddbe64e5e..c56ef4c1b4 100644
--- a/remote_config/integration_test/build.gradle
+++ b/remote_config/integration_test/build.gradle
@@ -20,7 +20,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.3.3'
+    classpath 'com.android.tools.build:gradle:4.2.1'
     classpath 'com.google.gms:google-services:4.0.1'
   }
 }
@@ -40,8 +40,9 @@ android {
     sourceCompatibility 1.8
     targetCompatibility 1.8
   }
-  compileSdkVersion 28
-  buildToolsVersion '28.0.3'
+  compileSdkVersion 33
+  ndkPath System.getenv('ANDROID_NDK_HOME')
+  buildToolsVersion '30.0.2'
 
   sourceSets {
     main {
diff --git a/remote_config/integration_test/gradle.properties b/remote_config/integration_test/gradle.properties
new file mode 100644
index 0000000000..ac891ac594
--- /dev/null
+++ b/remote_config/integration_test/gradle.properties
@@ -0,0 +1,2 @@
+android.useAndroidX = true
+org.gradle.jvmargs=-Xmx2560m
diff --git a/remote_config/integration_test/gradle/wrapper/gradle-wrapper.properties b/remote_config/integration_test/gradle/wrapper/gradle-wrapper.properties
index 9e09cdb6ad..65340c1b59 100644
--- a/remote_config/integration_test/gradle/wrapper/gradle-wrapper.properties
+++ b/remote_config/integration_test/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https://services.gradle.org/distributions/gradle-6.7.1-all.zip
diff --git a/remote_config/integration_test/settings.gradle b/remote_config/integration_test/settings.gradle
index 2270c51ca4..8b600af5be 100644
--- a/remote_config/integration_test/settings.gradle
+++ b/remote_config/integration_test/settings.gradle
@@ -36,4 +36,6 @@ if (!(new File(firebase_cpp_sdk_dir)).exists()) {
             firebase_cpp_sdk_dir))
 }
 gradle.ext.firebase_cpp_sdk_dir = "$firebase_cpp_sdk_dir"
-includeBuild "$firebase_cpp_sdk_dir"
\ No newline at end of file
+includeBuild("$firebase_cpp_sdk_dir") {
+  name = "firebase_cpp_sdk"
+}
diff --git a/remote_config/remote_config_resources/build.gradle b/remote_config/remote_config_resources/build.gradle
index 598fffaa07..eecbc8b1f7 100644
--- a/remote_config/remote_config_resources/build.gradle
+++ b/remote_config/remote_config_resources/build.gradle
@@ -18,7 +18,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.3.3'
+    classpath 'com.android.tools.build:gradle:4.2.1'
     classpath 'com.google.gms:google-services:4.2.0'
   }
 }
@@ -36,7 +36,7 @@ android {
     sourceCompatibility 1.8
     targetCompatibility 1.8
   }
-  compileSdkVersion 28
+  compileSdkVersion 33
 
   sourceSets {
     main {
@@ -49,7 +49,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:32.3.1')
+  implementation platform('com.google.firebase:firebase-bom:32.7.0')
   implementation 'com.google.firebase:firebase-config'
 }
 
diff --git a/scripts/gha/build_testapps.py b/scripts/gha/build_testapps.py
index d10e7704ad..a4f8fd8fd3 100644
--- a/scripts/gha/build_testapps.py
+++ b/scripts/gha/build_testapps.py
@@ -367,6 +367,7 @@ def _build(
           Failure(testapp=testapp, platform=_ANDROID, error_message=str(e)))
     _rm_dir_safe(os.path.join(project_dir, "build", "intermediates"))
     _rm_dir_safe(os.path.join(project_dir, ".externalNativeBuild"))
+    _rm_dir_safe(os.path.join(project_dir, ".cxx"))
     logging.info("END %s, %s", testapp, _ANDROID)
 
   if _IOS in platforms:
diff --git a/scripts/gha/integration_testing/gameloop_android/build.gradle b/scripts/gha/integration_testing/gameloop_android/build.gradle
index 9c0ad89bc5..dfcc273d9e 100644
--- a/scripts/gha/integration_testing/gameloop_android/build.gradle
+++ b/scripts/gha/integration_testing/gameloop_android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:4.0.1"
+        classpath 'com.android.tools.build:gradle:4.2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/scripts/gha/integration_testing/gameloop_android/gradle/wrapper/gradle-wrapper.properties b/scripts/gha/integration_testing/gameloop_android/gradle/wrapper/gradle-wrapper.properties
index fe719902ff..82458a4184 100644
--- a/scripts/gha/integration_testing/gameloop_android/gradle/wrapper/gradle-wrapper.properties
+++ b/scripts/gha/integration_testing/gameloop_android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https://services.gradle.org/distributions/gradle-6.7.1-all.zip
diff --git a/scripts/gha/ui_testing/uitest_android/app/build.gradle b/scripts/gha/ui_testing/uitest_android/app/build.gradle
index 151eb81761..60c7f8aeba 100644
--- a/scripts/gha/ui_testing/uitest_android/app/build.gradle
+++ b/scripts/gha/ui_testing/uitest_android/app/build.gradle
@@ -15,8 +15,9 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.3"
+    compileSdkVersion 33
+    ndkPath System.getenv('ANDROID_NDK_HOME')
+    buildToolsVersion '30.0.2'
 
     defaultConfig {
         applicationId "com.google.firebase.uitest"
diff --git a/scripts/gha/ui_testing/uitest_android/build.gradle b/scripts/gha/ui_testing/uitest_android/build.gradle
index d58b145dbf..2bd3427703 100644
--- a/scripts/gha/ui_testing/uitest_android/build.gradle
+++ b/scripts/gha/ui_testing/uitest_android/build.gradle
@@ -18,7 +18,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'com.android.tools.build:gradle:4.2.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/scripts/gha/ui_testing/uitest_android/gradle/wrapper/gradle-wrapper.properties b/scripts/gha/ui_testing/uitest_android/gradle/wrapper/gradle-wrapper.properties
index 8ff3f2767e..a802084a46 100644
--- a/scripts/gha/ui_testing/uitest_android/gradle/wrapper/gradle-wrapper.properties
+++ b/scripts/gha/ui_testing/uitest_android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
diff --git a/storage/build.gradle b/storage/build.gradle
index 095ddfd526..6beac37d90 100644
--- a/storage/build.gradle
+++ b/storage/build.gradle
@@ -18,7 +18,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.3.3'
+    classpath 'com.android.tools.build:gradle:4.2.1'
   }
 }
 allprojects {
@@ -31,8 +31,9 @@ allprojects {
 apply plugin: 'com.android.library'
 
 android {
-  compileSdkVersion 28
-  buildToolsVersion '28.0.3'
+  compileSdkVersion 33
+  ndkPath System.getenv('ANDROID_NDK_HOME')
+  buildToolsVersion '30.0.2'
 
   sourceSets {
     main {
diff --git a/storage/integration_test/AndroidManifest.xml b/storage/integration_test/AndroidManifest.xml
index b4dfc3bc92..4082136794 100644
--- a/storage/integration_test/AndroidManifest.xml
+++ b/storage/integration_test/AndroidManifest.xml
@@ -22,7 +22,6 @@
   <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
   <uses-permission android:name="android.permission.WAKE_LOCK" />
-  <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="28" />
   <application android:label="@string/app_name">
     <activity android:name="android.app.NativeActivity"
               android:screenOrientation="portrait"
diff --git a/storage/integration_test/build.gradle b/storage/integration_test/build.gradle
index 0a167df6c3..ca5a4887d3 100644
--- a/storage/integration_test/build.gradle
+++ b/storage/integration_test/build.gradle
@@ -20,7 +20,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.3.3'
+    classpath 'com.android.tools.build:gradle:4.2.1'
     classpath 'com.google.gms:google-services:4.0.1'
   }
 }
@@ -40,8 +40,9 @@ android {
     sourceCompatibility 1.8
     targetCompatibility 1.8
   }
-  compileSdkVersion 28
-  buildToolsVersion '28.0.3'
+  compileSdkVersion 33
+  ndkPath System.getenv('ANDROID_NDK_HOME')
+  buildToolsVersion '30.0.2'
 
   sourceSets {
     main {
@@ -61,6 +62,7 @@ android {
     externalNativeBuild.cmake {
       arguments "-DFIREBASE_CPP_SDK_DIR=$gradle.firebase_cpp_sdk_dir"
     }
+    multiDexEnabled true
   }
   externalNativeBuild.cmake {
     path 'CMakeLists.txt'
diff --git a/storage/integration_test/gradle.properties b/storage/integration_test/gradle.properties
new file mode 100644
index 0000000000..ac891ac594
--- /dev/null
+++ b/storage/integration_test/gradle.properties
@@ -0,0 +1,2 @@
+android.useAndroidX = true
+org.gradle.jvmargs=-Xmx2560m
diff --git a/storage/integration_test/gradle/wrapper/gradle-wrapper.properties b/storage/integration_test/gradle/wrapper/gradle-wrapper.properties
index 9e09cdb6ad..65340c1b59 100644
--- a/storage/integration_test/gradle/wrapper/gradle-wrapper.properties
+++ b/storage/integration_test/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https://services.gradle.org/distributions/gradle-6.7.1-all.zip
diff --git a/storage/integration_test/settings.gradle b/storage/integration_test/settings.gradle
index 2270c51ca4..8b600af5be 100644
--- a/storage/integration_test/settings.gradle
+++ b/storage/integration_test/settings.gradle
@@ -36,4 +36,6 @@ if (!(new File(firebase_cpp_sdk_dir)).exists()) {
             firebase_cpp_sdk_dir))
 }
 gradle.ext.firebase_cpp_sdk_dir = "$firebase_cpp_sdk_dir"
-includeBuild "$firebase_cpp_sdk_dir"
\ No newline at end of file
+includeBuild("$firebase_cpp_sdk_dir") {
+  name = "firebase_cpp_sdk"
+}
diff --git a/storage/storage_resources/build.gradle b/storage/storage_resources/build.gradle
index dccf04d517..c3ecf3957a 100644
--- a/storage/storage_resources/build.gradle
+++ b/storage/storage_resources/build.gradle
@@ -18,7 +18,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.3.3'
+    classpath 'com.android.tools.build:gradle:4.2.1'
     classpath 'com.google.gms:google-services:4.2.0'
   }
 }
@@ -36,7 +36,7 @@ android {
     sourceCompatibility 1.8
     targetCompatibility 1.8
   }
-  compileSdkVersion 28
+  compileSdkVersion 33
 
   sourceSets {
     main {
@@ -49,7 +49,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:32.3.1')
+  implementation platform('com.google.firebase:firebase-bom:32.7.0')
   implementation 'com.google.firebase:firebase-analytics'
   implementation 'com.google.firebase:firebase-storage'
 }
diff --git a/testing/build.gradle b/testing/build.gradle
index e753c21dd7..21dba4ad7c 100644
--- a/testing/build.gradle
+++ b/testing/build.gradle
@@ -18,7 +18,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.3.3'
+    classpath 'com.android.tools.build:gradle:4.2.1'
     classpath 'com.google.gms:google-services:4.2.0'
     classpath 'com.google.flatbuffers:flatbuffers-java:1.12.0'
   }
@@ -34,8 +34,9 @@ allprojects {
 apply plugin: 'com.android.library'
 
 android {
-  compileSdkVersion 28
-  buildToolsVersion '28.0.3'
+  compileSdkVersion 33
+  ndkPath System.getenv('ANDROID_NDK_HOME')
+  buildToolsVersion '30.0.2'
 
   sourceSets {
     main {