Skip to content

Commit

Permalink
android, cronet, android-interop-testing, example/drop support for an…
Browse files Browse the repository at this point in the history
…droid SDK versions older than 16 (#7253)
  • Loading branch information
voidzcy committed Jul 28, 2020
1 parent 784e804 commit f444b7b
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 8 deletions.
3 changes: 1 addition & 2 deletions android-interop-testing/build.gradle
Expand Up @@ -29,8 +29,7 @@ android {

defaultConfig {
applicationId "io.grpc.android.integrationtest"
// API level 14+ is required for TLS since Google Play Services v10.2
minSdkVersion 14
minSdkVersion 16
targetSdkVersion 26
versionCode 1
versionName "1.0"
Expand Down
7 changes: 5 additions & 2 deletions android/build.gradle
Expand Up @@ -11,7 +11,7 @@ android {
compileSdkVersion 28
defaultConfig {
consumerProguardFiles "proguard-rules.txt"
minSdkVersion 14
minSdkVersion 16
targetSdkVersion 28
versionCode 1
versionName "1.0"
Expand All @@ -31,7 +31,10 @@ dependencies {
testImplementation project('::grpc-okhttp')
testImplementation libraries.androidx_test
testImplementation libraries.junit
testImplementation libraries.robolectric
testImplementation (libraries.robolectric) {
// Unreleased change: https://github.com/robolectric/robolectric/pull/5432
exclude group: 'com.google.auto.service', module: 'auto-service'
}
testImplementation libraries.truth
}

Expand Down
5 changes: 4 additions & 1 deletion cronet/build.gradle
Expand Up @@ -42,7 +42,10 @@ dependencies {

testImplementation libraries.junit
testImplementation libraries.mockito
testImplementation libraries.robolectric
testImplementation (libraries.robolectric) {
// Unreleased change: https://github.com/robolectric/robolectric/pull/5432
exclude group: 'com.google.auto.service', module: 'auto-service'
}
}

task javadocs(type: Javadoc) {
Expand Down
3 changes: 1 addition & 2 deletions examples/android/helloworld/app/build.gradle
Expand Up @@ -6,8 +6,7 @@ android {

defaultConfig {
applicationId "io.grpc.helloworldexample"
// API level 14+ is required for TLS since Google Play Services v10.2
minSdkVersion 14
minSdkVersion 16
targetSdkVersion 27
versionCode 1
versionName "1.0"
Expand Down
2 changes: 1 addition & 1 deletion examples/android/routeguide/app/build.gradle
Expand Up @@ -6,7 +6,7 @@ android {

defaultConfig {
applicationId "io.grpc.routeguideexample"
minSdkVersion 14
minSdkVersion 16
targetSdkVersion 27
versionCode 1
versionName "1.0"
Expand Down

0 comments on commit f444b7b

Please sign in to comment.