grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

android-interop-testing: migrate to androidx test libs (#4611)

This commit is contained in:
Eric Gribkoff 2018-07-03 08:52:23 -07:00 committed by GitHub
parent 6dad047126
commit b61968c61a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
android-interop-testing/app/build.gradle
View File

@ -25,7 +25,7 @@ android {
targetSdkVersion 26 targetSdkVersion 26
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
multiDexEnabled true multiDexEnabled true
} }
buildTypes { buildTypes {
@ -80,8 +80,8 @@ dependencies {
// workaround for https://github.com/google/protobuf/issues/1889 // workaround for https://github.com/google/protobuf/issues/1889
protobuf 'com.google.protobuf:protobuf-java:3.0.2' protobuf 'com.google.protobuf:protobuf-java:3.0.2'
androidTestImplementation 'com.android.support.test:rules:1.0.1' androidTestImplementation 'androidx.test:rules:1.1.0-alpha1'
androidTestImplementation 'com.android.support.test:runner:1.0.1' androidTestImplementation 'androidx.test:runner:1.1.0-alpha1'
} }
gradle.projectsEvaluated { gradle.projectsEvaluated {

2
android-interop-testing/app/src/androidTest/AndroidManifest.xml
View File

@ -8,7 +8,7 @@
android:targetSdkVersion="22"/> android:targetSdkVersion="22"/>
<instrumentation <instrumentation
android:name="android.support.test.runner.AndroidJUnitRunner" android:name="androidx.test.runner.AndroidJUnitRunner"
android:targetPackage="io.grpc.android.integrationtest" /> android:targetPackage="io.grpc.android.integrationtest" />
<application android:debuggable="true" > <application android:debuggable="true" >

6
android-interop-testing/app/src/androidTest/java/io/grpc/android/integrationtest/InteropInstrumentationTest.java
View File

@ -18,10 +18,10 @@ package io.grpc.android.integrationtest;
import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertEquals;
import android.support.test.InstrumentationRegistry;
import android.support.test.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4;
import android.util.Log; import android.util.Log;
import androidx.test.InstrumentationRegistry;
import androidx.test.rule.ActivityTestRule;
import androidx.test.runner.AndroidJUnit4;
import com.google.android.gms.common.GooglePlayServicesNotAvailableException; import com.google.android.gms.common.GooglePlayServicesNotAvailableException;
import com.google.android.gms.common.GooglePlayServicesRepairableException; import com.google.android.gms.common.GooglePlayServicesRepairableException;
import com.google.android.gms.security.ProviderInstaller; import com.google.android.gms.security.ProviderInstaller;