From 06bdfd3dcc4db543359f592abbcb092b5de6fabe Mon Sep 17 00:00:00 2001
From: a-maurice <amaurice@google.com>
Date: Tue, 8 Oct 2024 10:26:19 -0700
Subject: [PATCH 1/4] Try reducing the minSdkVersion to 23

---
 analytics/build.gradle                                 | 2 +-
 analytics/integration_test/build.gradle                | 2 +-
 app/app_resources/build.gradle                         | 2 +-
 app/build.gradle                                       | 2 +-
 app/google_api_resources/build.gradle                  | 2 +-
 app/integration_test/build.gradle                      | 2 +-
 app/invites_resources/build.gradle                     | 2 +-
 app/test_resources/build.gradle                        | 2 +-
 app_check/app_check_resources/build.gradle             | 2 +-
 app_check/build.gradle                                 | 2 +-
 app_check/integration_test/build.gradle                | 2 +-
 auth/auth_resources/build.gradle                       | 2 +-
 auth/build.gradle                                      | 2 +-
 auth/integration_test/build.gradle                     | 2 +-
 database/build.gradle                                  | 2 +-
 database/database_resources/build.gradle               | 2 +-
 database/integration_test/build.gradle                 | 2 +-
 dynamic_links/build.gradle                             | 2 +-
 dynamic_links/integration_test/build.gradle            | 2 +-
 firestore/build.gradle                                 | 2 +-
 firestore/firestore_resources/build.gradle             | 2 +-
 firestore/integration_test/build.gradle                | 2 +-
 firestore/integration_test_internal/build.gradle       | 2 +-
 functions/build.gradle                                 | 2 +-
 functions/integration_test/build.gradle                | 2 +-
 gma/build.gradle                                       | 2 +-
 gma/gma_resources/build.gradle                         | 2 +-
 gma/integration_test/build.gradle                      | 2 +-
 installations/build.gradle                             | 2 +-
 installations/integration_test/build.gradle            | 2 +-
 messaging/build.gradle                                 | 2 +-
 messaging/integration_test/build.gradle                | 2 +-
 messaging/messaging_java/build.gradle                  | 2 +-
 remote_config/build.gradle                             | 2 +-
 remote_config/integration_test/build.gradle            | 2 +-
 remote_config/remote_config_resources/build.gradle     | 2 +-
 scripts/gha/ui_testing/uitest_android/app/build.gradle | 2 +-
 storage/build.gradle                                   | 2 +-
 storage/integration_test/build.gradle                  | 2 +-
 storage/storage_resources/build.gradle                 | 2 +-
 testing/build.gradle                                   | 2 +-
 41 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/analytics/build.gradle b/analytics/build.gradle
index f08ac090fb..4a5d6149ff 100644
--- a/analytics/build.gradle
+++ b/analytics/build.gradle
@@ -48,7 +48,7 @@ android {
   }
 
   defaultConfig {
-    minSdkVersion 24
+    minSdkVersion 23
     targetSdkVersion 34
     versionCode 1
     versionName "1.0"
diff --git a/analytics/integration_test/build.gradle b/analytics/integration_test/build.gradle
index d4185f86fd..866f695db1 100644
--- a/analytics/integration_test/build.gradle
+++ b/analytics/integration_test/build.gradle
@@ -55,7 +55,7 @@ android {
 
   defaultConfig {
     applicationId 'com.google.android.analytics.testapp'
-    minSdkVersion 24
+    minSdkVersion 23
     targetSdkVersion 34
     versionCode 1
     versionName '1.0'
diff --git a/app/app_resources/build.gradle b/app/app_resources/build.gradle
index 6c6974b10c..ab5ea24209 100644
--- a/app/app_resources/build.gradle
+++ b/app/app_resources/build.gradle
@@ -40,7 +40,7 @@ android {
   buildToolsVersion '32.0.0'
 
   defaultConfig {
-    minSdkVersion 24
+    minSdkVersion 23
     targetSdkVersion 34
   }
 
diff --git a/app/build.gradle b/app/build.gradle
index 4ceb729572..38dac86f0a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -48,7 +48,7 @@ android {
   }
 
   defaultConfig {
-    minSdkVersion 24
+    minSdkVersion 23
     targetSdkVersion 34
     versionCode 1
     versionName "1.0"
diff --git a/app/google_api_resources/build.gradle b/app/google_api_resources/build.gradle
index beef8ad2bb..301fed6dc2 100644
--- a/app/google_api_resources/build.gradle
+++ b/app/google_api_resources/build.gradle
@@ -40,7 +40,7 @@ android {
   buildToolsVersion '32.0.0'
 
   defaultConfig {
-    minSdkVersion 24
+    minSdkVersion 23
     targetSdkVersion 34
   }
 
diff --git a/app/integration_test/build.gradle b/app/integration_test/build.gradle
index 50bf9496d3..8367bf6181 100644
--- a/app/integration_test/build.gradle
+++ b/app/integration_test/build.gradle
@@ -55,7 +55,7 @@ android {
 
   defaultConfig {
     applicationId 'com.google.android.analytics.testapp'
-    minSdkVersion 24
+    minSdkVersion 23
     targetSdkVersion 34
     versionCode 1
     versionName '1.0'
diff --git a/app/invites_resources/build.gradle b/app/invites_resources/build.gradle
index 60ecdbd22d..52384d3543 100644
--- a/app/invites_resources/build.gradle
+++ b/app/invites_resources/build.gradle
@@ -40,7 +40,7 @@ android {
   buildToolsVersion '32.0.0'
 
   defaultConfig {
-    minSdkVersion 24
+    minSdkVersion 23
     targetSdkVersion 34
   }
 
diff --git a/app/test_resources/build.gradle b/app/test_resources/build.gradle
index 9d3f52d552..04aebe642b 100644
--- a/app/test_resources/build.gradle
+++ b/app/test_resources/build.gradle
@@ -36,7 +36,7 @@ android {
   buildToolsVersion '32.0.0'
 
   defaultConfig {
-    minSdkVersion 24
+    minSdkVersion 23
     targetSdkVersion 34
   }
 
diff --git a/app_check/app_check_resources/build.gradle b/app_check/app_check_resources/build.gradle
index a0fb6a651a..2568ddd578 100644
--- a/app_check/app_check_resources/build.gradle
+++ b/app_check/app_check_resources/build.gradle
@@ -40,7 +40,7 @@ android {
   buildToolsVersion '32.0.0'
 
   defaultConfig {
-    minSdkVersion 24
+    minSdkVersion 23
     targetSdkVersion 34
   }
 
diff --git a/app_check/build.gradle b/app_check/build.gradle
index 164c33f38f..eb0148237d 100644
--- a/app_check/build.gradle
+++ b/app_check/build.gradle
@@ -48,7 +48,7 @@ android {
   }
 
   defaultConfig {
-    minSdkVersion 24
+    minSdkVersion 23
     targetSdkVersion 34
     versionCode 1
     versionName "1.0"
diff --git a/app_check/integration_test/build.gradle b/app_check/integration_test/build.gradle
index 417732be4b..d1c371b4ca 100644
--- a/app_check/integration_test/build.gradle
+++ b/app_check/integration_test/build.gradle
@@ -55,7 +55,7 @@ android {
 
   defaultConfig {
     applicationId 'com.google.firebase.cpp.appcheck.testapp'
-    minSdkVersion 24
+    minSdkVersion 23
     targetSdkVersion 34
     versionCode 1
     versionName '1.0'
diff --git a/auth/auth_resources/build.gradle b/auth/auth_resources/build.gradle
index 0127217992..1277d80cc3 100644
--- a/auth/auth_resources/build.gradle
+++ b/auth/auth_resources/build.gradle
@@ -40,7 +40,7 @@ android {
   buildToolsVersion '32.0.0'
 
   defaultConfig {
-    minSdkVersion 24
+    minSdkVersion 23
     targetSdkVersion 34
   }
 
diff --git a/auth/build.gradle b/auth/build.gradle
index 83106d0567..2e4764a7d1 100644
--- a/auth/build.gradle
+++ b/auth/build.gradle
@@ -48,7 +48,7 @@ android {
   }
 
   defaultConfig {
-    minSdkVersion 24
+    minSdkVersion 23
     targetSdkVersion 34
     versionCode 1
     versionName "1.0"
diff --git a/auth/integration_test/build.gradle b/auth/integration_test/build.gradle
index 4f745af43b..98e3dd17dc 100644
--- a/auth/integration_test/build.gradle
+++ b/auth/integration_test/build.gradle
@@ -55,7 +55,7 @@ android {
 
   defaultConfig {
     applicationId 'com.google.android.auth.testapp'
-    minSdkVersion 24
+    minSdkVersion 23
     targetSdkVersion 34
     versionCode 1
     versionName '1.0'
diff --git a/database/build.gradle b/database/build.gradle
index f7281608cc..79cc5eca33 100644
--- a/database/build.gradle
+++ b/database/build.gradle
@@ -48,7 +48,7 @@ android {
   }
 
   defaultConfig {
-    minSdkVersion 24
+    minSdkVersion 23
     targetSdkVersion 34
     versionCode 1
     versionName "1.0"
diff --git a/database/database_resources/build.gradle b/database/database_resources/build.gradle
index 909a613227..7cb0980a89 100644
--- a/database/database_resources/build.gradle
+++ b/database/database_resources/build.gradle
@@ -36,7 +36,7 @@ android {
   buildToolsVersion '32.0.0'
 
   defaultConfig {
-    minSdkVersion 24
+    minSdkVersion 23
     targetSdkVersion 34
   }
 
diff --git a/database/integration_test/build.gradle b/database/integration_test/build.gradle
index 4401b08894..36ec8d72aa 100644
--- a/database/integration_test/build.gradle
+++ b/database/integration_test/build.gradle
@@ -55,7 +55,7 @@ android {
 
   defaultConfig {
     applicationId 'com.google.firebase.cpp.database.testapp'
-    minSdkVersion 24
+    minSdkVersion 23
     targetSdkVersion 34
     versionCode 1
     versionName '1.0'
diff --git a/dynamic_links/build.gradle b/dynamic_links/build.gradle
index b675bf7575..ecf9231331 100644
--- a/dynamic_links/build.gradle
+++ b/dynamic_links/build.gradle
@@ -48,7 +48,7 @@ android {
   }
 
   defaultConfig {
-    minSdkVersion 24
+    minSdkVersion 23
     targetSdkVersion 34
     versionCode 1
     versionName "1.0"
diff --git a/dynamic_links/integration_test/build.gradle b/dynamic_links/integration_test/build.gradle
index e523684703..a544f1ab5d 100644
--- a/dynamic_links/integration_test/build.gradle
+++ b/dynamic_links/integration_test/build.gradle
@@ -55,7 +55,7 @@ android {
 
   defaultConfig {
     applicationId 'com.google.android.dynamiclinks.testapp'
-    minSdkVersion 24
+    minSdkVersion 23
     targetSdkVersion 34
     versionCode 1
     versionName '1.0'
diff --git a/firestore/build.gradle b/firestore/build.gradle
index 582389d37a..c09891e92e 100644
--- a/firestore/build.gradle
+++ b/firestore/build.gradle
@@ -49,7 +49,7 @@ android {
 
   defaultConfig {
     // Jelly Bean is the minimum supported version needed by Firebase.
-    minSdkVersion 24
+    minSdkVersion 23
     targetSdkVersion 34
     versionCode 1
     versionName "1.0"
diff --git a/firestore/firestore_resources/build.gradle b/firestore/firestore_resources/build.gradle
index f2f7a8cc9e..eab7035ee5 100644
--- a/firestore/firestore_resources/build.gradle
+++ b/firestore/firestore_resources/build.gradle
@@ -40,7 +40,7 @@ android {
   buildToolsVersion '32.0.0'
 
   defaultConfig {
-    minSdkVersion 24
+    minSdkVersion 23
     targetSdkVersion 34
   }
 
diff --git a/firestore/integration_test/build.gradle b/firestore/integration_test/build.gradle
index 64f64b5b8b..c9214bd199 100644
--- a/firestore/integration_test/build.gradle
+++ b/firestore/integration_test/build.gradle
@@ -55,7 +55,7 @@ android {
 
   defaultConfig {
     applicationId 'com.google.firebase.cpp.firestore.testapp'
-    minSdkVersion 24
+    minSdkVersion 23
     targetSdkVersion 34
     versionCode 1
     versionName '1.0'
diff --git a/firestore/integration_test_internal/build.gradle b/firestore/integration_test_internal/build.gradle
index da56c2940b..f6ce2fff16 100644
--- a/firestore/integration_test_internal/build.gradle
+++ b/firestore/integration_test_internal/build.gradle
@@ -63,7 +63,7 @@ android {
 
   defaultConfig {
     applicationId 'com.google.firebase.cpp.firestore.testapp'
-    minSdkVersion 24
+    minSdkVersion 23
     targetSdkVersion 34
     versionCode 1
     versionName '1.0'
diff --git a/functions/build.gradle b/functions/build.gradle
index b2c12f845c..67722579a7 100644
--- a/functions/build.gradle
+++ b/functions/build.gradle
@@ -48,7 +48,7 @@ android {
   }
 
   defaultConfig {
-    minSdkVersion 24
+    minSdkVersion 23
     targetSdkVersion 34
     versionCode 1
     versionName "1.0"
diff --git a/functions/integration_test/build.gradle b/functions/integration_test/build.gradle
index a78ddfbb4c..4c6e172956 100644
--- a/functions/integration_test/build.gradle
+++ b/functions/integration_test/build.gradle
@@ -55,7 +55,7 @@ android {
 
   defaultConfig {
     applicationId 'com.google.firebase.cpp.functions.testapp'
-    minSdkVersion 24
+    minSdkVersion 23
     targetSdkVersion 34
     versionCode 1
     versionName '1.0'
diff --git a/gma/build.gradle b/gma/build.gradle
index e793294f8c..45421c7fe0 100644
--- a/gma/build.gradle
+++ b/gma/build.gradle
@@ -48,7 +48,7 @@ android {
   }
 
   defaultConfig {
-    minSdkVersion 24
+    minSdkVersion 23
     targetSdkVersion 34
     versionCode 1
     versionName "1.0"
diff --git a/gma/gma_resources/build.gradle b/gma/gma_resources/build.gradle
index 97caa4fd38..f50bfb3e35 100644
--- a/gma/gma_resources/build.gradle
+++ b/gma/gma_resources/build.gradle
@@ -41,7 +41,7 @@ android {
   buildToolsVersion '32.0.0'
 
   defaultConfig {
-    minSdkVersion 24
+    minSdkVersion 23
     targetSdkVersion 34
   }
 
diff --git a/gma/integration_test/build.gradle b/gma/integration_test/build.gradle
index 0e78ade8b9..e0d09cad06 100644
--- a/gma/integration_test/build.gradle
+++ b/gma/integration_test/build.gradle
@@ -55,7 +55,7 @@ android {
 
   defaultConfig {
     applicationId 'com.google.android.admob.testapp'
-    minSdkVersion 24
+    minSdkVersion 23
     targetSdkVersion 34
     versionCode 1
     versionName '1.0'
diff --git a/installations/build.gradle b/installations/build.gradle
index e5eb114a92..dd60ba8050 100644
--- a/installations/build.gradle
+++ b/installations/build.gradle
@@ -48,7 +48,7 @@ android {
   }
 
   defaultConfig {
-    minSdkVersion 24
+    minSdkVersion 23
     targetSdkVersion 34
     versionCode 1
     versionName "1.0"
diff --git a/installations/integration_test/build.gradle b/installations/integration_test/build.gradle
index daad7ca6e1..035f105787 100644
--- a/installations/integration_test/build.gradle
+++ b/installations/integration_test/build.gradle
@@ -55,7 +55,7 @@ android {
 
   defaultConfig {
     applicationId 'com.google.firebase.fis.testapp'
-    minSdkVersion 24
+    minSdkVersion 23
     targetSdkVersion 34
     versionCode 1
     versionName '1.0'
diff --git a/messaging/build.gradle b/messaging/build.gradle
index 0b8f2f1e71..3bf197d932 100644
--- a/messaging/build.gradle
+++ b/messaging/build.gradle
@@ -48,7 +48,7 @@ android {
   }
 
   defaultConfig {
-    minSdkVersion 24
+    minSdkVersion 23
     targetSdkVersion 34
     versionCode 1
     versionName "1.0"
diff --git a/messaging/integration_test/build.gradle b/messaging/integration_test/build.gradle
index 7f274e868b..fd5b9c964b 100644
--- a/messaging/integration_test/build.gradle
+++ b/messaging/integration_test/build.gradle
@@ -55,7 +55,7 @@ android {
 
   defaultConfig {
     applicationId 'com.google.firebase.cpp.messaging.testapp'
-    minSdkVersion 24
+    minSdkVersion 23
     targetSdkVersion 34
     versionCode 1
     versionName '1.0'
diff --git a/messaging/messaging_java/build.gradle b/messaging/messaging_java/build.gradle
index ec3edf1027..0424780e35 100644
--- a/messaging/messaging_java/build.gradle
+++ b/messaging/messaging_java/build.gradle
@@ -46,7 +46,7 @@ android {
 
   defaultConfig {
     targetSdkVersion 34
-    minSdkVersion 24
+    minSdkVersion 23
   }
 
   sourceSets {
diff --git a/remote_config/build.gradle b/remote_config/build.gradle
index 79abec6dba..2b00fbdaae 100644
--- a/remote_config/build.gradle
+++ b/remote_config/build.gradle
@@ -48,7 +48,7 @@ android {
   }
 
   defaultConfig {
-    minSdkVersion 24
+    minSdkVersion 23
     targetSdkVersion 34
     versionCode 1
     versionName "1.0"
diff --git a/remote_config/integration_test/build.gradle b/remote_config/integration_test/build.gradle
index 66e0a3e1e9..0d9938360f 100644
--- a/remote_config/integration_test/build.gradle
+++ b/remote_config/integration_test/build.gradle
@@ -55,7 +55,7 @@ android {
 
   defaultConfig {
     applicationId 'com.google.android.remoteconfig.testapp'
-    minSdkVersion 24
+    minSdkVersion 23
     targetSdkVersion 34
     versionCode 1
     versionName '1.0'
diff --git a/remote_config/remote_config_resources/build.gradle b/remote_config/remote_config_resources/build.gradle
index 47d8bbe43a..88fb5850e9 100644
--- a/remote_config/remote_config_resources/build.gradle
+++ b/remote_config/remote_config_resources/build.gradle
@@ -40,7 +40,7 @@ android {
   buildToolsVersion '32.0.0'
 
   defaultConfig {
-    minSdkVersion 24
+    minSdkVersion 23
     targetSdkVersion 34
   }
 
diff --git a/scripts/gha/ui_testing/uitest_android/app/build.gradle b/scripts/gha/ui_testing/uitest_android/app/build.gradle
index f9a4ee5282..09cb0601ce 100644
--- a/scripts/gha/ui_testing/uitest_android/app/build.gradle
+++ b/scripts/gha/ui_testing/uitest_android/app/build.gradle
@@ -21,7 +21,7 @@ android {
 
     defaultConfig {
         applicationId "com.google.firebase.uitest"
-        minSdkVersion 24
+        minSdkVersion 23
         targetSdkVersion 34
         versionCode 1
         versionName "1.0"
diff --git a/storage/build.gradle b/storage/build.gradle
index 6efb3b7169..00444f11d1 100644
--- a/storage/build.gradle
+++ b/storage/build.gradle
@@ -48,7 +48,7 @@ android {
   }
 
   defaultConfig {
-    minSdkVersion 24
+    minSdkVersion 23
     targetSdkVersion 34
     versionCode 1
     versionName "1.0"
diff --git a/storage/integration_test/build.gradle b/storage/integration_test/build.gradle
index 2e3e458316..a502e19d96 100644
--- a/storage/integration_test/build.gradle
+++ b/storage/integration_test/build.gradle
@@ -55,7 +55,7 @@ android {
 
   defaultConfig {
     applicationId 'com.google.firebase.cpp.storage.testapp'
-    minSdkVersion 24
+    minSdkVersion 23
     targetSdkVersion 34
     versionCode 1
     versionName '1.0'
diff --git a/storage/storage_resources/build.gradle b/storage/storage_resources/build.gradle
index 6ba44d4c85..d631343b46 100644
--- a/storage/storage_resources/build.gradle
+++ b/storage/storage_resources/build.gradle
@@ -40,7 +40,7 @@ android {
   buildToolsVersion '32.0.0'
 
   defaultConfig {
-    minSdkVersion 24
+    minSdkVersion 23
     targetSdkVersion 34
   }
   sourceSets {
diff --git a/testing/build.gradle b/testing/build.gradle
index 06d5e0b58b..eddf7b4eae 100644
--- a/testing/build.gradle
+++ b/testing/build.gradle
@@ -49,7 +49,7 @@ android {
   }
 
   defaultConfig {
-    minSdkVersion 24
+    minSdkVersion 23
     targetSdkVersion 34
     versionCode 1
     versionName "1.0"

From 7eb5b87e083a4f65898949d8dac629422a69f6da Mon Sep 17 00:00:00 2001
From: a-maurice <amaurice@google.com>
Date: Tue, 8 Oct 2024 15:10:34 -0700
Subject: [PATCH 2/4] Specify a different r8 tools version

---
 analytics/integration_test/build.gradle     | 3 +++
 app/integration_test/build.gradle           | 3 +++
 app_check/integration_test/build.gradle     | 3 +++
 auth/integration_test/build.gradle          | 3 +++
 database/integration_test/build.gradle      | 3 +++
 dynamic_links/integration_test/build.gradle | 3 +++
 firestore/integration_test/build.gradle     | 3 +++
 functions/integration_test/build.gradle     | 3 +++
 gma/integration_test/build.gradle           | 3 +++
 installations/integration_test/build.gradle | 3 +++
 messaging/integration_test/build.gradle     | 3 +++
 remote_config/integration_test/build.gradle | 3 +++
 storage/integration_test/build.gradle       | 3 +++
 13 files changed, 39 insertions(+)

diff --git a/analytics/integration_test/build.gradle b/analytics/integration_test/build.gradle
index 866f695db1..02743d45df 100644
--- a/analytics/integration_test/build.gradle
+++ b/analytics/integration_test/build.gradle
@@ -21,6 +21,9 @@ buildscript {
   }
   dependencies {
     classpath 'com.android.tools.build:gradle:7.4.2'
+    // r8 on this version of the Android tools has a bug,
+    // so specify a different version to use.
+    classpath 'com.android.tools:r8:8.3.37'
     classpath 'com.google.gms:google-services:4.4.1'
   }
 }
diff --git a/app/integration_test/build.gradle b/app/integration_test/build.gradle
index 8367bf6181..b764da6189 100644
--- a/app/integration_test/build.gradle
+++ b/app/integration_test/build.gradle
@@ -21,6 +21,9 @@ buildscript {
   }
   dependencies {
     classpath 'com.android.tools.build:gradle:7.4.2'
+    // r8 on this version of the Android tools has a bug,
+    // so specify a different version to use.
+    classpath 'com.android.tools:r8:8.3.37'
     classpath 'com.google.gms:google-services:4.4.1'
   }
 }
diff --git a/app_check/integration_test/build.gradle b/app_check/integration_test/build.gradle
index d1c371b4ca..9a0e96b2fd 100644
--- a/app_check/integration_test/build.gradle
+++ b/app_check/integration_test/build.gradle
@@ -21,6 +21,9 @@ buildscript {
   }
   dependencies {
     classpath 'com.android.tools.build:gradle:7.4.2'
+    // r8 on this version of the Android tools has a bug,
+    // so specify a different version to use.
+    classpath 'com.android.tools:r8:8.3.37'
     classpath 'com.google.gms:google-services:4.4.1'
   }
 }
diff --git a/auth/integration_test/build.gradle b/auth/integration_test/build.gradle
index 98e3dd17dc..e65135b02a 100644
--- a/auth/integration_test/build.gradle
+++ b/auth/integration_test/build.gradle
@@ -21,6 +21,9 @@ buildscript {
   }
   dependencies {
     classpath 'com.android.tools.build:gradle:7.4.2'
+    // r8 on this version of the Android tools has a bug,
+    // so specify a different version to use.
+    classpath 'com.android.tools:r8:8.3.37'
     classpath 'com.google.gms:google-services:4.4.1'
   }
 }
diff --git a/database/integration_test/build.gradle b/database/integration_test/build.gradle
index 36ec8d72aa..9f3937a0a9 100644
--- a/database/integration_test/build.gradle
+++ b/database/integration_test/build.gradle
@@ -21,6 +21,9 @@ buildscript {
   }
   dependencies {
     classpath 'com.android.tools.build:gradle:7.4.2'
+    // r8 on this version of the Android tools has a bug,
+    // so specify a different version to use.
+    classpath 'com.android.tools:r8:8.3.37'
     classpath 'com.google.gms:google-services:4.4.1'
   }
 }
diff --git a/dynamic_links/integration_test/build.gradle b/dynamic_links/integration_test/build.gradle
index a544f1ab5d..5c5be7e10c 100644
--- a/dynamic_links/integration_test/build.gradle
+++ b/dynamic_links/integration_test/build.gradle
@@ -21,6 +21,9 @@ buildscript {
   }
   dependencies {
     classpath 'com.android.tools.build:gradle:7.4.2'
+    // r8 on this version of the Android tools has a bug,
+    // so specify a different version to use.
+    classpath 'com.android.tools:r8:8.3.37'
     classpath 'com.google.gms:google-services:4.4.1'
   }
 }
diff --git a/firestore/integration_test/build.gradle b/firestore/integration_test/build.gradle
index c9214bd199..2a08e24b6e 100644
--- a/firestore/integration_test/build.gradle
+++ b/firestore/integration_test/build.gradle
@@ -21,6 +21,9 @@ buildscript {
   }
   dependencies {
     classpath 'com.android.tools.build:gradle:7.4.2'
+    // r8 on this version of the Android tools has a bug,
+    // so specify a different version to use.
+    classpath 'com.android.tools:r8:8.3.37'
     classpath 'com.google.gms:google-services:4.4.1'
   }
 }
diff --git a/functions/integration_test/build.gradle b/functions/integration_test/build.gradle
index 4c6e172956..48f346165f 100644
--- a/functions/integration_test/build.gradle
+++ b/functions/integration_test/build.gradle
@@ -21,6 +21,9 @@ buildscript {
   }
   dependencies {
     classpath 'com.android.tools.build:gradle:7.4.2'
+    // r8 on this version of the Android tools has a bug,
+    // so specify a different version to use.
+    classpath 'com.android.tools:r8:8.3.37'
     classpath 'com.google.gms:google-services:4.4.1'
   }
 }
diff --git a/gma/integration_test/build.gradle b/gma/integration_test/build.gradle
index e0d09cad06..41d156e8eb 100644
--- a/gma/integration_test/build.gradle
+++ b/gma/integration_test/build.gradle
@@ -21,6 +21,9 @@ buildscript {
   }
   dependencies {
     classpath 'com.android.tools.build:gradle:7.4.2'
+    // r8 on this version of the Android tools has a bug,
+    // so specify a different version to use.
+    classpath 'com.android.tools:r8:8.3.37'
     classpath 'com.google.gms:google-services:4.4.1'
   }
 }
diff --git a/installations/integration_test/build.gradle b/installations/integration_test/build.gradle
index 035f105787..cc000277c8 100644
--- a/installations/integration_test/build.gradle
+++ b/installations/integration_test/build.gradle
@@ -21,6 +21,9 @@ buildscript {
   }
   dependencies {
     classpath 'com.android.tools.build:gradle:7.4.2'
+    // r8 on this version of the Android tools has a bug,
+    // so specify a different version to use.
+    classpath 'com.android.tools:r8:8.3.37'
     classpath 'com.google.gms:google-services:4.4.1'
   }
 }
diff --git a/messaging/integration_test/build.gradle b/messaging/integration_test/build.gradle
index fd5b9c964b..67f39bf793 100644
--- a/messaging/integration_test/build.gradle
+++ b/messaging/integration_test/build.gradle
@@ -21,6 +21,9 @@ buildscript {
   }
   dependencies {
     classpath 'com.android.tools.build:gradle:7.4.2'
+    // r8 on this version of the Android tools has a bug,
+    // so specify a different version to use.
+    classpath 'com.android.tools:r8:8.3.37'
     classpath 'com.google.gms:google-services:4.4.1'
   }
 }
diff --git a/remote_config/integration_test/build.gradle b/remote_config/integration_test/build.gradle
index 0d9938360f..389718f1e6 100644
--- a/remote_config/integration_test/build.gradle
+++ b/remote_config/integration_test/build.gradle
@@ -21,6 +21,9 @@ buildscript {
   }
   dependencies {
     classpath 'com.android.tools.build:gradle:7.4.2'
+    // r8 on this version of the Android tools has a bug,
+    // so specify a different version to use.
+    classpath 'com.android.tools:r8:8.3.37'
     classpath 'com.google.gms:google-services:4.4.1'
   }
 }
diff --git a/storage/integration_test/build.gradle b/storage/integration_test/build.gradle
index a502e19d96..ed536d709f 100644
--- a/storage/integration_test/build.gradle
+++ b/storage/integration_test/build.gradle
@@ -21,6 +21,9 @@ buildscript {
   }
   dependencies {
     classpath 'com.android.tools.build:gradle:7.4.2'
+    // r8 on this version of the Android tools has a bug,
+    // so specify a different version to use.
+    classpath 'com.android.tools:r8:8.3.37'
     classpath 'com.google.gms:google-services:4.4.1'
   }
 }

From c6f6c38b93c46ebb061770bf114976684351540e Mon Sep 17 00:00:00 2001
From: a-maurice <amaurice@google.com>
Date: Tue, 8 Oct 2024 16:46:04 -0700
Subject: [PATCH 3/4] Update firestore internal test

---
 firestore/integration_test_internal/build.gradle | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/firestore/integration_test_internal/build.gradle b/firestore/integration_test_internal/build.gradle
index f6ce2fff16..d7c578e467 100644
--- a/firestore/integration_test_internal/build.gradle
+++ b/firestore/integration_test_internal/build.gradle
@@ -21,6 +21,9 @@ buildscript {
   }
   dependencies {
     classpath 'com.android.tools.build:gradle:7.4.2'
+    // r8 on this version of the Android tools has a bug,
+    // so specify a different version to use.
+    classpath 'com.android.tools:r8:8.3.37'
     classpath 'com.google.gms:google-services:4.4.1'
   }
 }

From b63591686c8ea1064cf66d50e7cf31df38726484 Mon Sep 17 00:00:00 2001
From: a-maurice <amaurice@google.com>
Date: Wed, 9 Oct 2024 13:30:19 -0700
Subject: [PATCH 4/4] Update readme

---
 release_build_files/readme.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/release_build_files/readme.md b/release_build_files/readme.md
index 9ddcdec602..61ad3b5abc 100644
--- a/release_build_files/readme.md
+++ b/release_build_files/readme.md
@@ -633,6 +633,7 @@ code.
 ## Release Notes
 ### Upcoming Release
 -   Changes
+    - General (Android): Reduced minSdkVersion back to 23.
     - Auth (Android): Setting photo_url to empty string with UpdateUserProfile
       clears the field, making it consistent with the other platforms.