Skip to content

examples: Android examples to use AGP 7.4.0 #10497

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 17, 2023
Merged

examples: Android examples to use AGP 7.4.0 #10497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0feac93
examples: Android examples to use AGP 7.4.0
temawi Aug 16, 2023
82048d9
examples: Android examples to use androidx appcompat
temawi Aug 17, 2023
68538a9
buildscripts: Use GRADLE_FLAGS when building android examples
temawi Aug 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions buildscripts/kokoro/android.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion examples/android/clientcache/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .../clientcache/app/src/main/java/io/grpc/clientcacheexample/ClientCacheExampleActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion examples/android/clientcache/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/android/helloworld/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...es/android/helloworld/app/src/main/java/io/grpc/helloworldexample/HelloworldActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion examples/android/helloworld/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/android/routeguide/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...es/android/routeguide/app/src/main/java/io/grpc/routeguideexample/RouteGuideActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion examples/android/routeguide/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/android/strictmode/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...e/app/src/main/java/io/grpc/strictmodehelloworldexample/StrictModeHelloworldActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion examples/android/strictmode/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down