diff options
Diffstat (limited to 'examples/ex2_espresso')
5 files changed, 25 insertions, 25 deletions
diff --git a/examples/ex2_espresso/build.gradle b/examples/ex2_espresso/build.gradle index 47063e6..64dcdc6 100644 --- a/examples/ex2_espresso/build.gradle +++ b/examples/ex2_espresso/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 26 + compileSdkVersion 28 flavorDimensions "examples" defaultConfig { @@ -10,7 +10,7 @@ android { targetSdkVersion 26 versionCode 1 versionName "0.0.1" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } productFlavors { @@ -31,15 +31,15 @@ android { } dependencies { - implementation 'com.android.support:appcompat-v7:26.1.0' - implementation 'com.android.support.test:runner:1.0.2' + implementation 'androidx.appcompat:appcompat:1.1.0-alpha01' + implementation 'androidx.test:runner:1.1.1' // The androidTest package is not for snippet support; it shows an example // of an instrumentation test coexisting with a snippet in the same // codebase. - androidTestImplementation 'com.android.support:support-annotations:27.1.1' - androidTestImplementation 'com.android.support.test:runner:1.0.2' - androidTestImplementation('com.android.support.test.espresso:espresso-core:3.0.1', { + androidTestImplementation 'androidx.annotation:annotation:1.0.1' + androidTestImplementation 'androidx.test:runner:1.1.1' + androidTestImplementation('androidx.test.espresso:espresso-core:3.1.1', { exclude group: 'com.android.support', module: 'support-annotations' }) @@ -49,7 +49,7 @@ dependencies { //snippetCompile 'com.google.android.mobly:mobly-snippet-lib:1.3.0' snippetImplementation project(':mobly-snippet-lib') - snippetImplementation 'com.android.support:support-annotations:27.1.1' - snippetImplementation 'com.android.support.test:rules:1.0.2' - snippetImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' + snippetImplementation 'androidx.annotation:annotation:1.0.1' + snippetImplementation 'androidx.test:rules:1.1.1' + snippetImplementation 'androidx.test.espresso:espresso-core:3.1.1' } diff --git a/examples/ex2_espresso/src/androidTest/AndroidManifest.xml b/examples/ex2_espresso/src/androidTest/AndroidManifest.xml index eaedb4d..0dc87bc 100644 --- a/examples/ex2_espresso/src/androidTest/AndroidManifest.xml +++ b/examples/ex2_espresso/src/androidTest/AndroidManifest.xml @@ -6,6 +6,6 @@ </application> <instrumentation - android:name="android.support.test.runner.AndroidJUnitRunner" + android:name="androidx.test.runner.AndroidJUnitRunner" android:targetPackage="com.google.android.mobly.snippet.example2" /> </manifest> diff --git a/examples/ex2_espresso/src/androidTest/java/com/google/android/mobly/snippet/example2/EspressoTest.java b/examples/ex2_espresso/src/androidTest/java/com/google/android/mobly/snippet/example2/EspressoTest.java index 770823e..f41374e 100644 --- a/examples/ex2_espresso/src/androidTest/java/com/google/android/mobly/snippet/example2/EspressoTest.java +++ b/examples/ex2_espresso/src/androidTest/java/com/google/android/mobly/snippet/example2/EspressoTest.java @@ -16,18 +16,18 @@ package com.google.android.mobly.snippet.example2; -import android.support.test.espresso.action.ViewActions; -import android.support.test.rule.ActivityTestRule; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.espresso.action.ViewActions; +import androidx.test.rule.ActivityTestRule; +import androidx.test.runner.AndroidJUnit4; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.assertion.ViewAssertions.matches; -import static android.support.test.espresso.matcher.ViewMatchers.withId; -import static android.support.test.espresso.matcher.ViewMatchers.withText; +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.assertion.ViewAssertions.matches; +import static androidx.test.espresso.matcher.ViewMatchers.withId; +import static androidx.test.espresso.matcher.ViewMatchers.withText; /** * This test is not part of the snippet code. It's a regular espresso instrumentation test which diff --git a/examples/ex2_espresso/src/main/java/com/google/android/mobly/snippet/example2/MainActivity.java b/examples/ex2_espresso/src/main/java/com/google/android/mobly/snippet/example2/MainActivity.java index 940418a..0cc0b54 100644 --- a/examples/ex2_espresso/src/main/java/com/google/android/mobly/snippet/example2/MainActivity.java +++ b/examples/ex2_espresso/src/main/java/com/google/android/mobly/snippet/example2/MainActivity.java @@ -17,7 +17,7 @@ package com.google.android.mobly.snippet.example2; import java.util.Locale; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; import android.view.View; import android.widget.Button; diff --git a/examples/ex2_espresso/src/snippet/java/com/google/android/mobly/snippet/example2/EspressoSnippet.java b/examples/ex2_espresso/src/snippet/java/com/google/android/mobly/snippet/example2/EspressoSnippet.java index b76a892..8ea7c21 100644 --- a/examples/ex2_espresso/src/snippet/java/com/google/android/mobly/snippet/example2/EspressoSnippet.java +++ b/examples/ex2_espresso/src/snippet/java/com/google/android/mobly/snippet/example2/EspressoSnippet.java @@ -16,13 +16,13 @@ package com.google.android.mobly.snippet.example2; -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.assertion.ViewAssertions.matches; -import static android.support.test.espresso.matcher.ViewMatchers.withId; -import static android.support.test.espresso.matcher.ViewMatchers.withText; +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.assertion.ViewAssertions.matches; +import static androidx.test.espresso.matcher.ViewMatchers.withId; +import static androidx.test.espresso.matcher.ViewMatchers.withText; -import android.support.test.espresso.action.ViewActions; -import android.support.test.rule.ActivityTestRule; +import androidx.test.espresso.action.ViewActions; +import androidx.test.rule.ActivityTestRule; import com.google.android.mobly.snippet.Snippet; import com.google.android.mobly.snippet.rpc.Rpc; import org.junit.Rule; |