Update all Wear sample templates for conversion to new devrel repo. am: d872b51977
am: fc47744747
Change-Id: I023e3f75ca52ae81c7db62341ed5acd6cbc3be1a
diff --git a/prebuilts/gradle/AutofillFramework/afservice/build.gradle b/prebuilts/gradle/AutofillFramework/afservice/build.gradle
index 0d8bd19..213cefb 100644
--- a/prebuilts/gradle/AutofillFramework/afservice/build.gradle
+++ b/prebuilts/gradle/AutofillFramework/afservice/build.gradle
@@ -9,7 +9,7 @@
versionCode 1
versionName "1.0"
- testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+ testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
diff --git a/prebuilts/gradle/CardView/kotlinApp/Application/build.gradle b/prebuilts/gradle/CardView/kotlinApp/Application/build.gradle
index f9ba008..f4fd1d3 100644
--- a/prebuilts/gradle/CardView/kotlinApp/Application/build.gradle
+++ b/prebuilts/gradle/CardView/kotlinApp/Application/build.gradle
@@ -8,7 +8,7 @@
applicationId "com.example.android.cardview"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
- testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+ testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
versionCode 1
versionName "1.0"
}
@@ -32,5 +32,5 @@
dependencies {
implementation'com.android.support:cardview-v7:27.0.2'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$rootProject.ext.kotlinVersion"
- androidTestImplementation "com.android.support.test.espresso:espresso-core:$rootProject.ext.espressoVersion"
+ androidTestImplementation "com.androidx.test.espresso:espresso-core:$rootProject.ext.espressoVersion"
}
diff --git a/prebuilts/gradle/CardView/kotlinApp/Application/tests/src/com/example/android/cardview/SampleTests.kt b/prebuilts/gradle/CardView/kotlinApp/Application/tests/src/com/example/android/cardview/SampleTests.kt
index df46390..6155e48 100644
--- a/prebuilts/gradle/CardView/kotlinApp/Application/tests/src/com/example/android/cardview/SampleTests.kt
+++ b/prebuilts/gradle/CardView/kotlinApp/Application/tests/src/com/example/android/cardview/SampleTests.kt
@@ -16,9 +16,9 @@
package com.example.android.cardview
-import android.support.test.InstrumentationRegistry
-import android.support.test.rule.ActivityTestRule
-import android.support.test.runner.AndroidJUnit4
+import androidx.test.InstrumentationRegistry
+import androidx.test.rule.ActivityTestRule
+import androidx.test.runner.AndroidJUnit4
import org.junit.Assert.assertEquals
import org.junit.Assert.assertNotNull
import org.junit.Before
diff --git a/prebuilts/gradle/CommitContentSampleApp/app/build.gradle b/prebuilts/gradle/CommitContentSampleApp/app/build.gradle
index 294f02f..06175b6 100644
--- a/prebuilts/gradle/CommitContentSampleApp/app/build.gradle
+++ b/prebuilts/gradle/CommitContentSampleApp/app/build.gradle
@@ -9,7 +9,7 @@
targetSdkVersion 25
versionCode 1
versionName "1.0"
- testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+ testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
buildTypes {
release {
@@ -21,7 +21,7 @@
dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
- androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+ androidTestCompile('com.androidx.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
compile 'com.android.support:appcompat-v7:25.0.0'
diff --git a/prebuilts/gradle/CommitContentSampleIME/app/build.gradle b/prebuilts/gradle/CommitContentSampleIME/app/build.gradle
index c753aa1..20bbe1b 100644
--- a/prebuilts/gradle/CommitContentSampleIME/app/build.gradle
+++ b/prebuilts/gradle/CommitContentSampleIME/app/build.gradle
@@ -9,7 +9,7 @@
targetSdkVersion 25
versionCode 1
versionName "1.0"
- testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+ testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
buildTypes {
release {
@@ -21,7 +21,7 @@
dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
- androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+ androidTestCompile('com.androidx.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
compile 'com.android.support:appcompat-v7:25.0.0'
diff --git a/prebuilts/gradle/ContentProviderPaging/kotlinApp/resources/build.gradle b/prebuilts/gradle/ContentProviderPaging/kotlinApp/resources/build.gradle
index dec7b24..81197a8 100644
--- a/prebuilts/gradle/ContentProviderPaging/kotlinApp/resources/build.gradle
+++ b/prebuilts/gradle/ContentProviderPaging/kotlinApp/resources/build.gradle
@@ -10,7 +10,7 @@
versionCode 1
versionName "1.0"
- testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+ testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
buildTypes {
diff --git a/prebuilts/gradle/ContentProviderPaging/resources/build.gradle b/prebuilts/gradle/ContentProviderPaging/resources/build.gradle
index dec7b24..81197a8 100644
--- a/prebuilts/gradle/ContentProviderPaging/resources/build.gradle
+++ b/prebuilts/gradle/ContentProviderPaging/resources/build.gradle
@@ -10,7 +10,7 @@
versionCode 1
versionName "1.0"
- testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+ testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
buildTypes {
diff --git a/prebuilts/gradle/EmojiCompat/README.md b/prebuilts/gradle/EmojiCompat/README.md
index b6e5a1b..45d0a0a 100644
--- a/prebuilts/gradle/EmojiCompat/README.md
+++ b/prebuilts/gradle/EmojiCompat/README.md
@@ -54,6 +54,15 @@
});)
```
+##### Preloading the font during application install
+You can add the following meta-data to your AndroidManifest.xml in order to download the font when
+your application is installed from Play Store. This way the font will be downloaded and ready when
+your application starts for the first time.
+
+```xml
+ <meta-data android:name="fontProviderRequests" android:value="Noto Color Emoji Compat"/>
+```
+
#### Use bundled font
In order the use the bundled font, call init() method of [EmojiCompat][2] with an instance of
diff --git a/prebuilts/gradle/EmojiCompat/app/build.gradle b/prebuilts/gradle/EmojiCompat/app/build.gradle
index 4867afc..6acc012 100644
--- a/prebuilts/gradle/EmojiCompat/app/build.gradle
+++ b/prebuilts/gradle/EmojiCompat/app/build.gradle
@@ -29,7 +29,7 @@
targetSdkVersion 26
versionCode 1
versionName "1.0"
- testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+ testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
buildTypes {
release {
@@ -51,5 +51,5 @@
// Test
testCompile 'junit:junit:4.12'
- androidTestCompile 'com.android.support.test.espresso:espresso-core:3.0.0'
+ androidTestCompile 'com.androidx.test.espresso:espresso-core:3.0.0'
}
diff --git a/prebuilts/gradle/EmojiCompat/app/src/androidTest/java/com/example/android/emojicompat/MainActivityTest.java b/prebuilts/gradle/EmojiCompat/app/src/androidTest/java/com/example/android/emojicompat/MainActivityTest.java
index d936b30..b492ab4 100644
--- a/prebuilts/gradle/EmojiCompat/app/src/androidTest/java/com/example/android/emojicompat/MainActivityTest.java
+++ b/prebuilts/gradle/EmojiCompat/app/src/androidTest/java/com/example/android/emojicompat/MainActivityTest.java
@@ -16,21 +16,21 @@
package com.example.android.emojicompat;
-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.isDisplayed;
-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.isDisplayed;
+import static androidx.test.espresso.matcher.ViewMatchers.withText;
import android.support.annotation.StringRes;
-import android.support.test.filters.MediumTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
+
+import androidx.test.filters.MediumTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
-
@RunWith(AndroidJUnit4.class)
public class MainActivityTest {
diff --git a/prebuilts/gradle/EmojiCompat/kotlinApp/app/build.gradle b/prebuilts/gradle/EmojiCompat/kotlinApp/app/build.gradle
index de2074b..07db653 100644
--- a/prebuilts/gradle/EmojiCompat/kotlinApp/app/build.gradle
+++ b/prebuilts/gradle/EmojiCompat/kotlinApp/app/build.gradle
@@ -42,7 +42,7 @@
targetSdkVersion 26
versionCode 1
versionName "1.0"
- testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+ testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
buildTypes {
release {
@@ -64,7 +64,7 @@
// Test
testCompile 'junit:junit:4.12'
- androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'
+ androidTestCompile 'com.androidx.test.espresso:espresso-core:2.2.2'
compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
}
diff --git a/prebuilts/gradle/EmojiCompat/kotlinApp/app/src/androidTest/java/com/example/android/emojicompat/MainActivityTest.kt b/prebuilts/gradle/EmojiCompat/kotlinApp/app/src/androidTest/java/com/example/android/emojicompat/MainActivityTest.kt
index e4f93d5..6277148 100644
--- a/prebuilts/gradle/EmojiCompat/kotlinApp/app/src/androidTest/java/com/example/android/emojicompat/MainActivityTest.kt
+++ b/prebuilts/gradle/EmojiCompat/kotlinApp/app/src/androidTest/java/com/example/android/emojicompat/MainActivityTest.kt
@@ -16,13 +16,13 @@
package com.example.android.emojicompat
-import android.support.test.espresso.Espresso.onView
-import android.support.test.espresso.assertion.ViewAssertions.matches
-import android.support.test.espresso.matcher.ViewMatchers.isDisplayed
-import android.support.test.espresso.matcher.ViewMatchers.withText
-import android.support.test.filters.MediumTest
-import android.support.test.rule.ActivityTestRule
-import android.support.test.runner.AndroidJUnit4
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import androidx.test.filters.MediumTest
+import androidx.test.rule.ActivityTestRule
+import androidx.test.runner.AndroidJUnit4
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/prebuilts/gradle/MultiWindowPlayground/Application/build.gradle b/prebuilts/gradle/MultiWindowPlayground/Application/build.gradle
index f197d17..f83c2eb 100644
--- a/prebuilts/gradle/MultiWindowPlayground/Application/build.gradle
+++ b/prebuilts/gradle/MultiWindowPlayground/Application/build.gradle
@@ -42,7 +42,7 @@
targetSdkVersion 24
versionCode 1
versionName "1.0"
- testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+ testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
buildTypes {
@@ -62,5 +62,5 @@
testCompile 'junit:junit:4.12'
compile 'com.android.support:appcompat-v7:24.0.0-beta1'
androidTestCompile 'com.android.support:support-annotations:24.0.0-beta1'
- androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.1'
+ androidTestCompile 'com.androidx.test.espresso:espresso-core:2.2.1'
}
diff --git a/prebuilts/gradle/PdfRendererBasic/kotlinApp/Application/build.gradle b/prebuilts/gradle/PdfRendererBasic/kotlinApp/Application/build.gradle
index 19b947f..72613ab 100644
--- a/prebuilts/gradle/PdfRendererBasic/kotlinApp/Application/build.gradle
+++ b/prebuilts/gradle/PdfRendererBasic/kotlinApp/Application/build.gradle
@@ -8,7 +8,7 @@
applicationId "com.example.android.pdfrendererbasic"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
- testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+ testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
versionCode 1
versionName "1.0"
}
@@ -26,8 +26,8 @@
implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$rootProject.ext.kotlinVersion"
// Testing dependencies
- androidTestImplementation "com.android.support.test.espresso:espresso-contrib:$rootProject.ext.espressoVersion"
- androidTestImplementation "com.android.support.test.espresso:espresso-core:$rootProject.ext.espressoVersion"
+ androidTestImplementation "com.androidx.test.espresso:espresso-contrib:$rootProject.ext.espressoVersion"
+ androidTestImplementation "com.androidx.test.espresso:espresso-core:$rootProject.ext.espressoVersion"
androidTestCompile "com.android.support:support-annotations:$rootProject.ext.supportLibVersion"
androidTestCompile "com.android.support.test:runner:$rootProject.ext.supportTestVersion"
androidTestCompile "com.android.support.test:rules:$rootProject.ext.supportTestVersion"
diff --git a/prebuilts/gradle/PdfRendererBasic/kotlinApp/Application/src/androidTest/java/com/example/android/pdfrendererbasic/PdfRendererBasicFragmentTests.kt b/prebuilts/gradle/PdfRendererBasic/kotlinApp/Application/src/androidTest/java/com/example/android/pdfrendererbasic/PdfRendererBasicFragmentTests.kt
index b2abc69..1ce9e0b 100644
--- a/prebuilts/gradle/PdfRendererBasic/kotlinApp/Application/src/androidTest/java/com/example/android/pdfrendererbasic/PdfRendererBasicFragmentTests.kt
+++ b/prebuilts/gradle/PdfRendererBasic/kotlinApp/Application/src/androidTest/java/com/example/android/pdfrendererbasic/PdfRendererBasicFragmentTests.kt
@@ -18,11 +18,11 @@
import android.content.pm.ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
import android.content.pm.ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
-import android.support.test.espresso.Espresso.onView
-import android.support.test.espresso.action.ViewActions.click
-import android.support.test.espresso.matcher.ViewMatchers.withId
-import android.support.test.rule.ActivityTestRule
-import android.support.test.runner.AndroidJUnit4
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.rule.ActivityTestRule
+import androidx.test.runner.AndroidJUnit4
import android.widget.Button
import org.junit.Assert.assertEquals
import org.junit.Assert.assertFalse
diff --git a/prebuilts/gradle/PictureInPicture/app/build.gradle b/prebuilts/gradle/PictureInPicture/app/build.gradle
index 4ec0007..6503d9b 100644
--- a/prebuilts/gradle/PictureInPicture/app/build.gradle
+++ b/prebuilts/gradle/PictureInPicture/app/build.gradle
@@ -8,7 +8,7 @@
targetSdkVersion 27
versionCode 1
versionName "1.0"
- testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+ testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
buildTypes {
release {
@@ -20,7 +20,7 @@
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
- androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+ androidTestCompile('com.androidx.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
compile 'com.android.support:appcompat-v7:27.0.0'
diff --git a/prebuilts/gradle/PictureInPicture/app/src/androidTest/java/com/example/android/pictureinpicture/MainActivityTest.java b/prebuilts/gradle/PictureInPicture/app/src/androidTest/java/com/example/android/pictureinpicture/MainActivityTest.java
index 03033c5..2e89ee5 100644
--- a/prebuilts/gradle/PictureInPicture/app/src/androidTest/java/com/example/android/pictureinpicture/MainActivityTest.java
+++ b/prebuilts/gradle/PictureInPicture/app/src/androidTest/java/com/example/android/pictureinpicture/MainActivityTest.java
@@ -16,12 +16,12 @@
package com.example.android.pictureinpicture;
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.action.ViewActions.click;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.matcher.ViewMatchers.isAssignableFrom;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.action.ViewActions.click;
+import static androidx.test.espresso.assertion.ViewAssertions.matches;
+import static androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom;
+import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
import static org.hamcrest.Matchers.not;
import static org.hamcrest.core.AllOf.allOf;
@@ -30,13 +30,14 @@
import static org.junit.Assert.assertTrue;
import android.content.pm.ActivityInfo;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.espresso.UiController;
-import android.support.test.espresso.ViewAction;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.view.View;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.espresso.UiController;
+import androidx.test.espresso.ViewAction;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
+
import com.example.android.pictureinpicture.widget.MovieView;
import org.hamcrest.Description;
@@ -46,7 +47,6 @@
import org.junit.Test;
import org.junit.runner.RunWith;
-
@RunWith(AndroidJUnit4.class)
public class MainActivityTest {
diff --git a/prebuilts/gradle/PictureInPicture/app/src/androidTest/java/com/example/android/pictureinpicture/MediaSessionPlaybackActivityTest.java b/prebuilts/gradle/PictureInPicture/app/src/androidTest/java/com/example/android/pictureinpicture/MediaSessionPlaybackActivityTest.java
index 349f963..be3a1e7 100644
--- a/prebuilts/gradle/PictureInPicture/app/src/androidTest/java/com/example/android/pictureinpicture/MediaSessionPlaybackActivityTest.java
+++ b/prebuilts/gradle/PictureInPicture/app/src/androidTest/java/com/example/android/pictureinpicture/MediaSessionPlaybackActivityTest.java
@@ -16,16 +16,32 @@
package com.example.android.pictureinpicture;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.action.ViewActions.click;
+import static androidx.test.espresso.assertion.ViewAssertions.matches;
+import static androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom;
+import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
+
+import static org.hamcrest.Matchers.not;
+import static org.hamcrest.core.AllOf.allOf;
+import static org.hamcrest.core.Is.is;
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
import android.content.pm.ActivityInfo;
import android.media.session.PlaybackState;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.espresso.UiController;
-import android.support.test.espresso.ViewAction;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.support.v4.media.session.PlaybackStateCompat;
import android.view.View;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.espresso.UiController;
+import androidx.test.espresso.ViewAction;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
+
import com.example.android.pictureinpicture.widget.MovieView;
import org.hamcrest.Description;
@@ -35,21 +51,6 @@
import org.junit.Test;
import org.junit.runner.RunWith;
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.action.ViewActions.click;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.matcher.ViewMatchers.isAssignableFrom;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-import static org.hamcrest.Matchers.not;
-import static org.hamcrest.core.AllOf.allOf;
-import static org.hamcrest.core.Is.is;
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-
-
@RunWith(AndroidJUnit4.class)
public class MediaSessionPlaybackActivityTest {
diff --git a/prebuilts/gradle/PictureInPicture/kotlinApp/app/build.gradle b/prebuilts/gradle/PictureInPicture/kotlinApp/app/build.gradle
index 3a8a654..b727b6d 100644
--- a/prebuilts/gradle/PictureInPicture/kotlinApp/app/build.gradle
+++ b/prebuilts/gradle/PictureInPicture/kotlinApp/app/build.gradle
@@ -20,7 +20,7 @@
targetSdkVersion 27
versionCode 1
versionName "1.0"
- testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+ testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
buildTypes {
release {
@@ -32,7 +32,7 @@
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
- androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+ androidTestCompile('com.androidx.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
compile 'com.android.support:appcompat-v7:27.0.0'
diff --git a/prebuilts/gradle/PictureInPicture/kotlinApp/app/src/androidTest/java/com/example/android/pictureinpicture/MainActivityTest.kt b/prebuilts/gradle/PictureInPicture/kotlinApp/app/src/androidTest/java/com/example/android/pictureinpicture/MainActivityTest.kt
index 282fa69..63793d6 100644
--- a/prebuilts/gradle/PictureInPicture/kotlinApp/app/src/androidTest/java/com/example/android/pictureinpicture/MainActivityTest.kt
+++ b/prebuilts/gradle/PictureInPicture/kotlinApp/app/src/androidTest/java/com/example/android/pictureinpicture/MainActivityTest.kt
@@ -17,17 +17,17 @@
package com.example.android.pictureinpicture
import android.content.pm.ActivityInfo
-import android.support.test.InstrumentationRegistry
-import android.support.test.espresso.Espresso.onView
-import android.support.test.espresso.UiController
-import android.support.test.espresso.ViewAction
-import android.support.test.espresso.action.ViewActions.click
-import android.support.test.espresso.assertion.ViewAssertions.matches
-import android.support.test.espresso.matcher.ViewMatchers.isAssignableFrom
-import android.support.test.espresso.matcher.ViewMatchers.isDisplayed
-import android.support.test.espresso.matcher.ViewMatchers.withId
-import android.support.test.rule.ActivityTestRule
-import android.support.test.runner.AndroidJUnit4
+import androidx.test.InstrumentationRegistry
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.UiController
+import androidx.test.espresso.ViewAction
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.rule.ActivityTestRule
+import androidx.test.runner.AndroidJUnit4
import android.view.View
import com.example.android.pictureinpicture.widget.MovieView
import org.hamcrest.Description
diff --git a/prebuilts/gradle/PictureInPicture/kotlinApp/app/src/androidTest/java/com/example/android/pictureinpicture/MediaSessionPlaybackActivityTest.kt b/prebuilts/gradle/PictureInPicture/kotlinApp/app/src/androidTest/java/com/example/android/pictureinpicture/MediaSessionPlaybackActivityTest.kt
index 88fb301..5a8d36e 100644
--- a/prebuilts/gradle/PictureInPicture/kotlinApp/app/src/androidTest/java/com/example/android/pictureinpicture/MediaSessionPlaybackActivityTest.kt
+++ b/prebuilts/gradle/PictureInPicture/kotlinApp/app/src/androidTest/java/com/example/android/pictureinpicture/MediaSessionPlaybackActivityTest.kt
@@ -17,17 +17,17 @@
package com.example.android.pictureinpicture
import android.content.pm.ActivityInfo
-import android.support.test.InstrumentationRegistry
-import android.support.test.espresso.Espresso.onView
-import android.support.test.espresso.UiController
-import android.support.test.espresso.ViewAction
-import android.support.test.espresso.action.ViewActions.click
-import android.support.test.espresso.assertion.ViewAssertions.matches
-import android.support.test.espresso.matcher.ViewMatchers.isAssignableFrom
-import android.support.test.espresso.matcher.ViewMatchers.isDisplayed
-import android.support.test.espresso.matcher.ViewMatchers.withId
-import android.support.test.rule.ActivityTestRule
-import android.support.test.runner.AndroidJUnit4
+import androidx.test.InstrumentationRegistry
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.UiController
+import androidx.test.espresso.ViewAction
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.rule.ActivityTestRule
+import androidx.test.runner.AndroidJUnit4
import android.support.v4.media.session.PlaybackStateCompat
import android.view.View
import com.example.android.pictureinpicture.widget.MovieView
diff --git a/prebuilts/gradle/RecyclerView/kotlinApp/app/build.gradle b/prebuilts/gradle/RecyclerView/kotlinApp/app/build.gradle
index fd409cf..49cabea 100644
--- a/prebuilts/gradle/RecyclerView/kotlinApp/app/build.gradle
+++ b/prebuilts/gradle/RecyclerView/kotlinApp/app/build.gradle
@@ -12,7 +12,7 @@
targetSdkVersion 27
versionCode 1
versionName "1.0"
- testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+ testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
buildTypes {
release {
diff --git a/prebuilts/gradle/RuntimePermissions/kotlinApp/app/build.gradle b/prebuilts/gradle/RuntimePermissions/kotlinApp/app/build.gradle
index d9fa949..911fad1 100644
--- a/prebuilts/gradle/RuntimePermissions/kotlinApp/app/build.gradle
+++ b/prebuilts/gradle/RuntimePermissions/kotlinApp/app/build.gradle
@@ -11,7 +11,7 @@
targetSdkVersion 26
versionCode 1
versionName "1.0"
- testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+ testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
buildTypes {
release {
@@ -23,7 +23,7 @@
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
- androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+ androidTestCompile('com.androidx.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
compile "com.android.support:support-v13:26.0.0"
