diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2021-01-13 23:59:13 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-01-13 23:59:13 +0000 |
| commit | 7e0e0c30cfa46eeb5793ba46f1a273a8081b2100 (patch) | |
| tree | 71cca5090003ca0b46a97cbc43b52e94103376bd /android-interop-testing | |
| parent | 9b4f1a6db99b7cb7d46320e25e32317853b500dc (diff) | |
| parent | 599cbd6b784405f6a751b91d3bcc9536e4776e69 (diff) | |
| download | grpc-grpc-java-7e0e0c30cfa46eeb5793ba46f1a273a8081b2100.tar.gz | |
Snap for 7080740 from 599cbd6b784405f6a751b91d3bcc9536e4776e69 to mainline-tethering-releaseandroid-mainline-11.0.0_r43android-mainline-11.0.0_r24android11-mainline-tethering-release
Change-Id: Ifa5b02fa99dd9e1d614f8e97c85c132d3b81d948
Diffstat (limited to 'android-interop-testing')
3 files changed, 9 insertions, 9 deletions
diff --git a/android-interop-testing/app/build.gradle b/android-interop-testing/app/build.gradle index 37238baed..e704dfe07 100644 --- a/android-interop-testing/app/build.gradle +++ b/android-interop-testing/app/build.gradle @@ -42,7 +42,7 @@ protobuf { protoc { artifact = 'com.google.protobuf:protoc:3.5.1-1' } plugins { javalite { artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0" } - grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.16.0-SNAPSHOT' // CURRENT_GRPC_VERSION + grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.16.1' // CURRENT_GRPC_VERSION } } generateProtoTasks { @@ -71,11 +71,11 @@ dependencies { implementation 'junit:junit:4.12' // You need to build grpc-java to obtain the grpc libraries below. - implementation 'io.grpc:grpc-auth:1.16.0-SNAPSHOT' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-okhttp:1.16.0-SNAPSHOT' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-protobuf-lite:1.16.0-SNAPSHOT' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-stub:1.16.0-SNAPSHOT' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-testing:1.16.0-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-auth:1.16.1' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-okhttp:1.16.1' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-protobuf-lite:1.16.1' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-stub:1.16.1' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-testing:1.16.1' // CURRENT_GRPC_VERSION // workaround for https://github.com/google/protobuf/issues/1889 protobuf 'com.google.protobuf:protobuf-java:3.0.2' diff --git a/android-interop-testing/app/src/androidTest/java/io/grpc/android/integrationtest/InteropInstrumentationTest.java b/android-interop-testing/app/src/androidTest/java/io/grpc/android/integrationtest/InteropInstrumentationTest.java index 0d88341b2..47f6fc72d 100644 --- a/android-interop-testing/app/src/androidTest/java/io/grpc/android/integrationtest/InteropInstrumentationTest.java +++ b/android-interop-testing/app/src/androidTest/java/io/grpc/android/integrationtest/InteropInstrumentationTest.java @@ -127,7 +127,7 @@ public class InteropInstrumentationTest { new InteropTask( listener, TesterOkHttpChannelBuilder.build(host, port, serverHostOverride, useTls, testCa), - new ArrayList<>(), + new ArrayList<ClientInterceptor>(), testCase) .execute(); String result = resultFuture.get(TIMEOUT_SECONDS, TimeUnit.SECONDS); diff --git a/android-interop-testing/build.gradle b/android-interop-testing/build.gradle index 929c7a6a3..d4fce1431 100644 --- a/android-interop-testing/build.gradle +++ b/android-interop-testing/build.gradle @@ -2,8 +2,8 @@ buildscript { repositories { - jcenter() google() + jcenter() } dependencies { classpath 'com.android.tools.build:gradle:3.1.2' @@ -16,9 +16,9 @@ buildscript { allprojects { repositories { + google() mavenLocal() jcenter() - google() } } |