From 2b4f649b0ab4dbbe6e03dcc19b4f607a942de450 Mon Sep 17 00:00:00 2001
From: Terry Wilson <tmwilson@google.com>
Date: Tue, 22 Aug 2023 10:47:31 -0700
Subject: [PATCH] android: Min SDK level to 21 (#10505)

Google Play has dropped support for SDK levels 19 and 20 and so can we.
---
 README.md                                            | 2 +-
 android-interop-testing/build.gradle                 | 5 ++++-
 android-interop-testing/src/main/AndroidManifest.xml | 4 +++-
 android/build.gradle                                 | 2 +-
 binder/build.gradle                                  | 2 +-
 cronet/build.gradle                                  | 2 +-
 examples/android/clientcache/app/build.gradle        | 2 +-
 examples/android/helloworld/app/build.gradle         | 2 +-
 examples/android/routeguide/app/build.gradle         | 2 +-
 9 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 82dce35755..c1f0eae012 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ gRPC-Java - An RPC library and framework
 Supported Platforms
 -------------------
 
-gRPC-Java supports Java 8 and later. Android minSdkVersion 19 (KitKat) and
+gRPC-Java supports Java 8 and later. Android minSdkVersion 21 (Lollipop) and
 later are supported with [Java 8 language desugaring][android-java-8].
 
 TLS usage on Android typically requires Play Services Dynamic Security Provider.
diff --git a/android-interop-testing/build.gradle b/android-interop-testing/build.gradle
index 69f5a62bfa..440254f403 100644
--- a/android-interop-testing/build.gradle
+++ b/android-interop-testing/build.gradle
@@ -34,7 +34,10 @@ android {
 
     defaultConfig {
         applicationId "io.grpc.android.integrationtest"
-        minSdkVersion 19
+        // Held back to 20 as Gradle fails to build at the 21 level. This is
+        // presumably a Gradle bug that can be revisited later.
+        // Maybe this issue: https://github.com/gradle/gradle/issues/20778
+        minSdkVersion 20
         targetSdkVersion 33
         versionCode 1
         versionName "1.0"
diff --git a/android-interop-testing/src/main/AndroidManifest.xml b/android-interop-testing/src/main/AndroidManifest.xml
index 250deb087e..35f3ee33a2 100644
--- a/android-interop-testing/src/main/AndroidManifest.xml
+++ b/android-interop-testing/src/main/AndroidManifest.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" >
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <!-- For UDS -->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-sdk tools:overrideLibrary="io.grpc.android"/>
 
     <application
         android:allowBackup="true"
diff --git a/android/build.gradle b/android/build.gradle
index ad100b3a3e..79cd2030dc 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -15,7 +15,7 @@ android {
     compileSdkVersion 33
     defaultConfig {
         consumerProguardFiles "proguard-rules.txt"
-        minSdkVersion 19
+        minSdkVersion 21
         targetSdkVersion 33
         versionCode 1
         versionName "1.0"
diff --git a/binder/build.gradle b/binder/build.gradle
index a55106aee4..0d1c5a0339 100644
--- a/binder/build.gradle
+++ b/binder/build.gradle
@@ -13,7 +13,7 @@ android {
         targetCompatibility 1.8
     }
     defaultConfig {
-        minSdkVersion 19
+        minSdkVersion 21
         targetSdkVersion 33
         versionCode 1
         versionName "1.0"
diff --git a/cronet/build.gradle b/cronet/build.gradle
index edb709d1a0..d842c52940 100644
--- a/cronet/build.gradle
+++ b/cronet/build.gradle
@@ -15,7 +15,7 @@ android {
     namespace 'io.grpc.cronet'
     compileSdkVersion 33
     defaultConfig {
-        minSdkVersion 19
+        minSdkVersion 21
         targetSdkVersion 33
         versionCode 1
         versionName "1.0"
diff --git a/examples/android/clientcache/app/build.gradle b/examples/android/clientcache/app/build.gradle
index f7d6926940..f930a58d5b 100644
--- a/examples/android/clientcache/app/build.gradle
+++ b/examples/android/clientcache/app/build.gradle
@@ -10,7 +10,7 @@ android {
 
     defaultConfig {
         applicationId "io.grpc.clientcacheexample"
-        minSdkVersion 19
+        minSdkVersion 21
         targetSdkVersion 33
         multiDexEnabled true
         versionCode 1
diff --git a/examples/android/helloworld/app/build.gradle b/examples/android/helloworld/app/build.gradle
index 949972cecc..d22ad2d882 100644
--- a/examples/android/helloworld/app/build.gradle
+++ b/examples/android/helloworld/app/build.gradle
@@ -10,7 +10,7 @@ android {
 
     defaultConfig {
         applicationId "io.grpc.helloworldexample"
-        minSdkVersion 19
+        minSdkVersion 21
         targetSdkVersion 33
         versionCode 1
         versionName "1.0"
diff --git a/examples/android/routeguide/app/build.gradle b/examples/android/routeguide/app/build.gradle
index 4575b113c7..d54312910d 100644
--- a/examples/android/routeguide/app/build.gradle
+++ b/examples/android/routeguide/app/build.gradle
@@ -10,7 +10,7 @@ android {
 
     defaultConfig {
         applicationId "io.grpc.routeguideexample"
-        minSdkVersion 19
+        minSdkVersion 21
         targetSdkVersion 33
         versionCode 1
         versionName "1.0"