examples: Android examples to use AGP 7.4.0 (grpc#10497)

temawi · larry-safran · commit 23bc111b697a · 2023-08-29T10:21:35.000-07:00
- Upgrades AGP version to 7.4.0
- Upgrades appcomat to use AndroidX
- Updates the `android.sh` build script to set the `android.useAndroidX` flag
diff --git a/buildscripts/kokoro/android.sh b/buildscripts/kokoro/android.sh
@@ -53,13 +53,13 @@ fi
 # Build examples
 
 cd ./examples/android/clientcache
-../../gradlew build
+../../gradlew build $GRADLE_FLAGS
 cd ../routeguide
-../../gradlew build
+../../gradlew build $GRADLE_FLAGS
 cd ../helloworld
-../../gradlew build
+../../gradlew build $GRADLE_FLAGS
 cd ../strictmode
-../../gradlew build
+../../gradlew build $GRADLE_FLAGS
 
 # Skip APK size and dex count comparisons for non-PR builds
 
diff --git a/examples/android/clientcache/app/build.gradle b/examples/android/clientcache/app/build.gradle
@@ -51,7 +51,7 @@ protobuf {
 }
 
 dependencies {
-    implementation 'com.android.support:appcompat-v7:27.0.2'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
 
     // You need to build grpc-java to obtain these libraries below.
     implementation 'io.grpc:grpc-okhttp:1.58.0-SNAPSHOT' // CURRENT_GRPC_VERSION
diff --git a/examples/android/clientcache/app/src/main/java/io/grpc/clientcacheexample/ClientCacheExampleActivity.java b/examples/android/clientcache/app/src/main/java/io/grpc/clientcacheexample/ClientCacheExampleActivity.java
@@ -20,7 +20,7 @@
 import android.content.Context;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.text.TextUtils;
 import android.text.method.ScrollingMovementMethod;
 import android.util.Log;
diff --git a/examples/android/clientcache/build.gradle b/examples/android/clientcache/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.0'
+        classpath 'com.android.tools.build:gradle:7.4.0'
         classpath "com.google.protobuf:protobuf-gradle-plugin:0.9.4"
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/examples/android/helloworld/app/build.gradle b/examples/android/helloworld/app/build.gradle
@@ -49,7 +49,7 @@ protobuf {
 }
 
 dependencies {
-    implementation 'com.android.support:appcompat-v7:27.0.2'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
 
     // You need to build grpc-java to obtain these libraries below.
     implementation 'io.grpc:grpc-okhttp:1.58.0-SNAPSHOT' // CURRENT_GRPC_VERSION
diff --git a/examples/android/helloworld/app/src/main/java/io/grpc/helloworldexample/HelloworldActivity.java b/examples/android/helloworld/app/src/main/java/io/grpc/helloworldexample/HelloworldActivity.java
@@ -20,7 +20,7 @@
 import android.content.Context;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.text.TextUtils;
 import android.text.method.ScrollingMovementMethod;
 import android.view.View;
diff --git a/examples/android/helloworld/build.gradle b/examples/android/helloworld/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.0'
+        classpath 'com.android.tools.build:gradle:7.4.0'
         classpath "com.google.protobuf:protobuf-gradle-plugin:0.9.4"
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/examples/android/routeguide/app/build.gradle b/examples/android/routeguide/app/build.gradle
@@ -49,7 +49,7 @@ protobuf {
 }
 
 dependencies {
-    implementation 'com.android.support:appcompat-v7:27.0.2'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
 
     // You need to build grpc-java to obtain these libraries below.
     implementation 'io.grpc:grpc-okhttp:1.58.0-SNAPSHOT' // CURRENT_GRPC_VERSION
diff --git a/examples/android/routeguide/app/src/main/java/io/grpc/routeguideexample/RouteGuideActivity.java b/examples/android/routeguide/app/src/main/java/io/grpc/routeguideexample/RouteGuideActivity.java
@@ -19,7 +19,7 @@
 import android.content.Context;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.text.TextUtils;
 import android.text.method.ScrollingMovementMethod;
 import android.view.View;
diff --git a/examples/android/routeguide/build.gradle b/examples/android/routeguide/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.0'
+        classpath 'com.android.tools.build:gradle:7.4.0'
         classpath "com.google.protobuf:protobuf-gradle-plugin:0.9.4"
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/examples/android/strictmode/app/build.gradle b/examples/android/strictmode/app/build.gradle
@@ -50,7 +50,7 @@ protobuf {
 }
 
 dependencies {
-    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
 
     // You need to build grpc-java to obtain these libraries below.
     implementation 'io.grpc:grpc-okhttp:1.58.0-SNAPSHOT' // CURRENT_GRPC_VERSION
diff --git a/examples/android/strictmode/app/src/main/java/io/grpc/strictmodehelloworldexample/StrictModeHelloworldActivity.java b/examples/android/strictmode/app/src/main/java/io/grpc/strictmodehelloworldexample/StrictModeHelloworldActivity.java
@@ -26,7 +26,7 @@
 import android.os.StrictMode.OnVmViolationListener;
 import android.os.StrictMode.VmPolicy;
 import android.os.strictmode.Violation;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.text.TextUtils;
 import android.text.method.ScrollingMovementMethod;
 import android.view.View;
diff --git a/examples/android/strictmode/build.gradle b/examples/android/strictmode/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.0'
+        classpath 'com.android.tools.build:gradle:7.4.0'
         classpath "com.google.protobuf:protobuf-gradle-plugin:0.9.4"
 
         // NOTE: Do not place your application dependencies here; they belong

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ protobuf {`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`dependencies {`
`54`		`- implementation 'com.android.support:appcompat-v7:27.0.2'`
	`54`	`+ implementation 'androidx.appcompat:appcompat:1.0.0'`
`55`	`55`
`56`	`56`	`// You need to build grpc-java to obtain these libraries below.`
`57`	`57`	`implementation 'io.grpc:grpc-okhttp:1.58.0-SNAPSHOT' // CURRENT_GRPC_VERSION`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ buildscript {`
`6`	`6`	`mavenCentral()`
`7`	`7`	`}`
`8`	`8`	`dependencies {`
`9`		`- classpath 'com.android.tools.build:gradle:4.2.0'`
	`9`	`+ classpath 'com.android.tools.build:gradle:7.4.0'`
`10`	`10`	`classpath "com.google.protobuf:protobuf-gradle-plugin:0.9.4"`
`11`	`11`
`12`	`12`	`// NOTE: Do not place your application dependencies here; they belong`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ protobuf {`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`dependencies {`
`52`		`- implementation 'com.android.support:appcompat-v7:27.0.2'`
	`52`	`+ implementation 'androidx.appcompat:appcompat:1.0.0'`
`53`	`53`
`54`	`54`	`// You need to build grpc-java to obtain these libraries below.`
`55`	`55`	`implementation 'io.grpc:grpc-okhttp:1.58.0-SNAPSHOT' // CURRENT_GRPC_VERSION`