diff options
Diffstat (limited to 'third_party')
3 files changed, 7 insertions, 9 deletions
diff --git a/third_party/sl4a/build.gradle b/third_party/sl4a/build.gradle index d5d4518..ce65002 100644 --- a/third_party/sl4a/build.gradle +++ b/third_party/sl4a/build.gradle @@ -20,12 +20,11 @@ apply plugin: 'com.jfrog.bintray' android { - compileSdkVersion 26 + compileSdkVersion 28 defaultConfig { minSdkVersion 15 targetSdkVersion 22 - // testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" versionCode VERSION_CODE.toInteger() versionName VERSION_NAME @@ -62,7 +61,7 @@ dependencies { // implementation fileTree(include: ['*.jar'], dir: 'libs') // implementation 'com.android.support:appcompat-v7:26.1.0' implementation 'junit:junit:4.12' - implementation 'com.android.support.test:runner:1.0.2' + implementation 'androidx.test:runner:1.1.1' } googleJavaFormat { diff --git a/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/SnippetRunner.java b/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/SnippetRunner.java index ea1d71f..ed83469 100644 --- a/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/SnippetRunner.java +++ b/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/SnippetRunner.java @@ -21,7 +21,7 @@ import android.app.NotificationManager; import android.content.Context; import android.os.Bundle; import android.os.Process; -import android.support.test.runner.AndroidJUnitRunner; +import androidx.test.runner.AndroidJUnitRunner; import com.google.android.mobly.snippet.rpc.AndroidProxy; import com.google.android.mobly.snippet.util.EmptyTestClass; import com.google.android.mobly.snippet.util.Log; @@ -34,10 +34,9 @@ import java.util.Locale; * A launcher that starts the snippet server as an instrumentation so that it has access to the * target app's context. * - * <p>We have to extend some subclass of {@link android.test.InstrumentationTestRunner} because - * snippets are launched with 'am instrument'. We're specifically extending {@link - * AndroidJUnitRunner} because Espresso requires being called through it, since it sets up {@link - * android.support.test.InstrumentationRegistry} which Espresso requires. + * <p>We have to extend some subclass of {@link androidx.test.runner.AndroidJUnitRunner} because + * snippets are launched with 'am instrument', and snippet APKs need to access {@link + * androidx.test.platform.app.InstrumentationRegistry}. * * <p>The launch and communication protocol between snippet and client is versionated and reported * as follows: diff --git a/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/event/EventSnippet.java b/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/event/EventSnippet.java index 05e044c..4cebb74 100644 --- a/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/event/EventSnippet.java +++ b/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/event/EventSnippet.java @@ -16,7 +16,7 @@ package com.google.android.mobly.snippet.event; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.google.android.mobly.snippet.Snippet; import com.google.android.mobly.snippet.rpc.Rpc; import java.util.ArrayList; |