diff options
author | Brett Chabot <brettchabot@google.com> | 2018-12-13 19:06:29 -0800 |
---|---|---|
committer | Brett Chabot <brettchabot@google.com> | 2018-12-13 19:06:29 -0800 |
commit | b0838843e019a232f9a439f895a658f58a369bd0 (patch) | |
tree | 35950b15531836715da1980005502ab50e5222b8 | |
parent | ef618d981947f6d8242755516269a0026c07126c (diff) | |
download | droiddriver-b0838843e019a232f9a439f895a658f58a369bd0.tar.gz |
Migrate external/droiddriver to androidx.testandroid-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-release
See go/jetpack-test-android-migration
Test: make checkbuild
Change-Id: I0ca9ab89a27c867ee7a50606a239de3de7f54605
-rw-r--r-- | manualtest/AndroidManifest.xml | 2 | ||||
-rw-r--r-- | manualtest/build.gradle | 2 | ||||
-rw-r--r-- | src/io/appium/droiddriver/runner/MinSdkVersion.java | 2 | ||||
-rw-r--r-- | src/io/appium/droiddriver/runner/UseUiAutomation.java | 2 | ||||
-rw-r--r-- | src/io/appium/droiddriver/util/ActivityUtils.java | 6 | ||||
-rw-r--r-- | src/io/appium/droiddriver/util/InstrumentationUtils.java | 9 |
6 files changed, 14 insertions, 9 deletions
diff --git a/manualtest/AndroidManifest.xml b/manualtest/AndroidManifest.xml index da5117a..8e874ed 100644 --- a/manualtest/AndroidManifest.xml +++ b/manualtest/AndroidManifest.xml @@ -4,7 +4,7 @@ package="io.appium.droiddriver.manualtest"> <instrumentation - android:name="android.support.test.runner.AndroidJUnitRunner" + android:name="androidx.test.runner.AndroidJUnitRunner" android:targetPackage="io.appium.droiddriver.manualtest" /> <!-- Needed for Android.mk --> diff --git a/manualtest/build.gradle b/manualtest/build.gradle index 22731e4..9eea2d0 100644 --- a/manualtest/build.gradle +++ b/manualtest/build.gradle @@ -16,7 +16,7 @@ android { defaultConfig { minSdkVersion 8 targetSdkVersion 23 - testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner' + testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' } sourceSets { main { diff --git a/src/io/appium/droiddriver/runner/MinSdkVersion.java b/src/io/appium/droiddriver/runner/MinSdkVersion.java index f560ad8..5a25f8b 100644 --- a/src/io/appium/droiddriver/runner/MinSdkVersion.java +++ b/src/io/appium/droiddriver/runner/MinSdkVersion.java @@ -29,7 +29,7 @@ import java.lang.annotation.Target; * * <p>As any annotations, it is useful only if it is processed by tools. * - * @deprecated Use android.support.test.filters.SdkSuppress instead. + * @deprecated Use androidx.test.filters.SdkSuppress instead. */ @Inherited @Target({TYPE, METHOD}) diff --git a/src/io/appium/droiddriver/runner/UseUiAutomation.java b/src/io/appium/droiddriver/runner/UseUiAutomation.java index e710238..52b48cc 100644 --- a/src/io/appium/droiddriver/runner/UseUiAutomation.java +++ b/src/io/appium/droiddriver/runner/UseUiAutomation.java @@ -31,7 +31,7 @@ import java.lang.annotation.Target; * * <p>As any annotations, it is useful only if it is processed by tools. * - * @deprecated Use android.support.test.filters.SdkSuppress instead. + * @deprecated Use androidx.test.filters.SdkSuppress instead. */ @Inherited @Target({TYPE, METHOD}) diff --git a/src/io/appium/droiddriver/util/ActivityUtils.java b/src/io/appium/droiddriver/util/ActivityUtils.java index ff06ab5..7d7ca7d 100644 --- a/src/io/appium/droiddriver/util/ActivityUtils.java +++ b/src/io/appium/droiddriver/util/ActivityUtils.java @@ -18,9 +18,11 @@ package io.appium.droiddriver.util; import android.app.Activity; import android.os.Looper; -import android.support.test.runner.lifecycle.ActivityLifecycleMonitorRegistry; -import android.support.test.runner.lifecycle.Stage; import android.util.Log; + +import androidx.test.runner.lifecycle.ActivityLifecycleMonitorRegistry; +import androidx.test.runner.lifecycle.Stage; + import java.util.Iterator; import java.util.concurrent.Callable; diff --git a/src/io/appium/droiddriver/util/InstrumentationUtils.java b/src/io/appium/droiddriver/util/InstrumentationUtils.java index 06ac5ab..c6f087e 100644 --- a/src/io/appium/droiddriver/util/InstrumentationUtils.java +++ b/src/io/appium/droiddriver/util/InstrumentationUtils.java @@ -20,10 +20,13 @@ import android.app.Instrumentation; import android.content.Context; import android.os.Bundle; import android.os.Looper; -import android.support.test.InstrumentationRegistry; import android.util.Log; + +import androidx.test.InstrumentationRegistry; + import io.appium.droiddriver.exceptions.DroidDriverException; import io.appium.droiddriver.exceptions.TimeoutException; + import java.util.concurrent.Callable; import java.util.concurrent.Executor; import java.util.concurrent.Executors; @@ -43,7 +46,7 @@ public class InstrumentationUtils { private static long runOnMainSyncTimeoutMillis; /** - * Initializes this class. If you don't use android.support.test.runner.AndroidJUnitRunner or a + * Initializes this class. If you don't use androidx.test.runner.AndroidJUnitRunner or a * runner that supports {link InstrumentationRegistry}, you need to call this method * appropriately. */ @@ -60,7 +63,7 @@ public class InstrumentationUtils { private static synchronized void checkInitialized() { if (instrumentation == null) { - // Assume android.support.test.runner.InstrumentationRegistry is valid + // Assume androidx.test.runner.InstrumentationRegistry is valid init(InstrumentationRegistry.getInstrumentation(), InstrumentationRegistry.getArguments()); } } |