diff --git a/android-interop-testing/app/build.gradle b/android-interop-testing/app/build.gradle index ca5eebc78d..a4006cc9ae 100644 --- a/android-interop-testing/app/build.gradle +++ b/android-interop-testing/app/build.gradle @@ -2,14 +2,13 @@ apply plugin: 'com.android.application' apply plugin: 'com.google.protobuf' android { - compileSdkVersion 22 - buildToolsVersion '25.0.2' + compileSdkVersion 26 defaultConfig { applicationId "io.grpc.android.integrationtest" // API level 14+ is required for TLS since Google Play Services v10.2 minSdkVersion 14 - targetSdkVersion 22 + targetSdkVersion 26 versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -58,9 +57,9 @@ protobuf { } dependencies { - compile 'com.android.support:appcompat-v7:22.2.1' - compile 'com.android.support:support-annotations:23.1.1' - compile 'com.google.android.gms:play-services-base:7.3.0' + compile 'com.android.support:appcompat-v7:26.1.0' + compile 'com.android.support:support-annotations:27.1.1' + compile 'com.google.android.gms:play-services-base:12.0.1' // You need to build grpc-java to obtain the grpc libraries below. compile 'io.grpc:grpc-protobuf-nano:1.13.0-SNAPSHOT' // CURRENT_GRPC_VERSION compile 'io.grpc:grpc-okhttp:1.13.0-SNAPSHOT' // CURRENT_GRPC_VERSION @@ -69,8 +68,8 @@ dependencies { compile 'javax.annotation:javax.annotation-api:1.2' compile 'junit:junit:4.12' - androidTestCompile 'com.android.support.test:rules:0.5' - androidTestCompile 'com.android.support.test:runner:0.5' + androidTestCompile 'com.android.support.test:rules:1.0.1' + androidTestCompile 'com.android.support.test:runner:1.0.1' } gradle.projectsEvaluated { diff --git a/android-interop-testing/app/src/main/AndroidManifest.xml b/android-interop-testing/app/src/main/AndroidManifest.xml index 193d8e01bd..241b527918 100644 --- a/android-interop-testing/app/src/main/AndroidManifest.xml +++ b/android-interop-testing/app/src/main/AndroidManifest.xml @@ -2,11 +2,6 @@ - - -