diff options
| author | Eric Gribkoff <ericgribkoff@google.com> | 2018-07-03 08:52:23 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-03 08:52:23 -0700 |
| commit | b61968c61a11311cdbad48bb34198c568c77ea9f (patch) | |
| tree | 9df0a6a4ffe2942c9dcf891a4bdf0e471ea37142 /android-interop-testing | |
| parent | 6dad0471266719a3b6aee5e978b3c5c5738e4ddc (diff) | |
| download | grpc-grpc-java-b61968c61a11311cdbad48bb34198c568c77ea9f.tar.gz | |
android-interop-testing: migrate to androidx test libs (#4611)
Diffstat (limited to 'android-interop-testing')
3 files changed, 7 insertions, 7 deletions
diff --git a/android-interop-testing/app/build.gradle b/android-interop-testing/app/build.gradle index f20ab5d72..0b0a6611d 100644 --- a/android-interop-testing/app/build.gradle +++ b/android-interop-testing/app/build.gradle @@ -25,7 +25,7 @@ android { targetSdkVersion 26 versionCode 1 versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" multiDexEnabled true } buildTypes { @@ -80,8 +80,8 @@ dependencies { // workaround for https://github.com/google/protobuf/issues/1889 protobuf 'com.google.protobuf:protobuf-java:3.0.2' - androidTestImplementation 'com.android.support.test:rules:1.0.1' - androidTestImplementation 'com.android.support.test:runner:1.0.1' + androidTestImplementation 'androidx.test:rules:1.1.0-alpha1' + androidTestImplementation 'androidx.test:runner:1.1.0-alpha1' } gradle.projectsEvaluated { diff --git a/android-interop-testing/app/src/androidTest/AndroidManifest.xml b/android-interop-testing/app/src/androidTest/AndroidManifest.xml index 98447551f..340300c4c 100644 --- a/android-interop-testing/app/src/androidTest/AndroidManifest.xml +++ b/android-interop-testing/app/src/androidTest/AndroidManifest.xml @@ -8,7 +8,7 @@ android:targetSdkVersion="22"/> <instrumentation - android:name="android.support.test.runner.AndroidJUnitRunner" + android:name="androidx.test.runner.AndroidJUnitRunner" android:targetPackage="io.grpc.android.integrationtest" /> <application android:debuggable="true" > 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 f156025da..28a637c5b 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 @@ -18,10 +18,10 @@ package io.grpc.android.integrationtest; 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 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.GooglePlayServicesRepairableException; import com.google.android.gms.security.ProviderInstaller; |