Reduce Android minSdkVersion back to 23 (#1659)

a-maurice · web-flow · commit 24378181b781 · 2024-10-10T11:01:51.000-07:00
* Try reducing the minSdkVersion to 23

* Specify a different r8 tools version

* Update firestore internal test

* Update readme
diff --git 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
@@ -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'
   }
 }
@@ -55,7 +58,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
@@ -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
@@ -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
@@ -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
@@ -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'
   }
 }
@@ -55,7 +58,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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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'
   }
 }
@@ -55,7 +58,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
@@ -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
@@ -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
@@ -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'
   }
 }
@@ -55,7 +58,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
@@ -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
@@ -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
@@ -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'
   }
 }
@@ -55,7 +58,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
@@ -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
@@ -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'
   }
 }
@@ -55,7 +58,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
@@ -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
@@ -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
@@ -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'
   }
 }
@@ -55,7 +58,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
@@ -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'
   }
 }
@@ -63,7 +66,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
@@ -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
@@ -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'
   }
 }
@@ -55,7 +58,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
@@ -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
@@ -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
@@ -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'
   }
 }
@@ -55,7 +58,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
@@ -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
@@ -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'
   }
 }
@@ -55,7 +58,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
@@ -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
diff --git a/messaging/messaging_java/build.gradle b/messaging/messaging_java/build.gradle
diff --git a/release_build_files/readme.md b/release_build_files/readme.md
diff --git a/remote_config/build.gradle b/remote_config/build.gradle
diff --git a/remote_config/integration_test/build.gradle b/remote_config/integration_test/build.gradle
diff --git a/remote_config/remote_config_resources/build.gradle b/remote_config/remote_config_resources/build.gradle
diff --git a/scripts/gha/ui_testing/uitest_android/app/build.gradle b/scripts/gha/ui_testing/uitest_android/app/build.gradle
diff --git a/storage/build.gradle b/storage/build.gradle
diff --git a/storage/integration_test/build.gradle b/storage/integration_test/build.gradle
diff --git a/storage/storage_resources/build.gradle b/storage/storage_resources/build.gradle
diff --git a/testing/build.gradle b/testing/build.gradle

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ android {`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`defaultConfig {`
`51`		`- minSdkVersion 24`
	`51`	`+ minSdkVersion 23`
`52`	`52`	`targetSdkVersion 34`
`53`	`53`	`versionCode 1`
`54`	`54`	`versionName "1.0"`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,9 @@ buildscript {`
`21`	`21`	`}`
`22`	`22`	`dependencies {`
`23`	`23`	`classpath 'com.android.tools.build:gradle:7.4.2'`
	`24`	`+ // r8 on this version of the Android tools has a bug,`
	`25`	`+ // so specify a different version to use.`
	`26`	`+ classpath 'com.android.tools:r8:8.3.37'`
`24`	`27`	`classpath 'com.google.gms:google-services:4.4.1'`
`25`	`28`	`}`
`26`	`29`	`}`
`@@ -55,7 +58,7 @@ android {`
`55`	`58`
`56`	`59`	`defaultConfig {`
`57`	`60`	`applicationId 'com.google.android.analytics.testapp'`
`58`		`- minSdkVersion 24`
	`61`	`+ minSdkVersion 23`
`59`	`62`	`targetSdkVersion 34`
`60`	`63`	`versionCode 1`
`61`	`64`	`versionName '1.0'`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ android {`
`40`	`40`	`buildToolsVersion '32.0.0'`
`41`	`41`
`42`	`42`	`defaultConfig {`
`43`		`- minSdkVersion 24`
	`43`	`+ minSdkVersion 23`
`44`	`44`	`targetSdkVersion 34`
`45`	`45`	`}`
`46`	`46`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ android {`
`36`	`36`	`buildToolsVersion '32.0.0'`
`37`	`37`
`38`	`38`	`defaultConfig {`
`39`		`- minSdkVersion 24`
	`39`	`+ minSdkVersion 23`
`40`	`40`	`targetSdkVersion 34`
`41`	`41`	`}`
`42`	`42`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ android {`
`41`	`41`	`buildToolsVersion '32.0.0'`
`42`	`42`
`43`	`43`	`defaultConfig {`
`44`		`- minSdkVersion 24`
	`44`	`+ minSdkVersion 23`
`45`	`45`	`targetSdkVersion 34`
`46`	`46`	`}`
`47`	`47`