summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2019-01-31 04:04:26 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2019-01-31 04:04:26 +0000
commit522fa3ff49eb4a5db438692a4a8d247ec653bf05 (patch)
treeeb6cd11c92e4121b68f93736df496fd16bbd7d1b
parent8dfa285e28dd177d7e24687782af2d18d1982192 (diff)
parent8ce355340845c43fc9898abf25cfe704673cf151 (diff)
downloadmisc-522fa3ff49eb4a5db438692a4a8d247ec653bf05.tar.gz
Merge "Update to AndroidX Test 1.1.1-alpha01"
-rw-r--r--common/androidx-test/Android.bp24
-rw-r--r--common/androidx-test/androidx/test/core/1.1.1-alpha01/core-1.1.1-alpha01.aar (renamed from common/androidx-test/androidx/test/core/1.1.0/core-1.1.0.aar)bin29853 -> 29310 bytes
-rw-r--r--common/androidx-test/androidx/test/core/1.1.1-alpha01/core-1.1.1-alpha01.pom (renamed from common/androidx-test/androidx/test/core/1.1.0/core-1.1.0.pom)4
-rw-r--r--common/androidx-test/androidx/test/espresso/espresso-contrib/3.1.2-alpha01/espresso-contrib-3.1.2-alpha01.aar (renamed from common/androidx-test/androidx/test/espresso/espresso-contrib/3.1.1/espresso-contrib-3.1.1.aar)bin58106 -> 58299 bytes
-rw-r--r--common/androidx-test/androidx/test/espresso/espresso-contrib/3.1.2-alpha01/espresso-contrib-3.1.2-alpha01.pom (renamed from common/androidx-test/androidx/test/espresso/espresso-contrib/3.1.1/espresso-contrib-3.1.1.pom)6
-rw-r--r--common/androidx-test/androidx/test/espresso/espresso-core/3.1.1/espresso-core-3.1.1.aarbin571017 -> 0 bytes
-rw-r--r--common/androidx-test/androidx/test/espresso/espresso-core/3.1.2-alpha01/espresso-core-3.1.2-alpha01.aarbin0 -> 569117 bytes
-rw-r--r--common/androidx-test/androidx/test/espresso/espresso-core/3.1.2-alpha01/espresso-core-3.1.2-alpha01.pom (renamed from common/androidx-test/androidx/test/espresso/espresso-core/3.1.1/espresso-core-3.1.1.pom)6
-rw-r--r--common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.1.1/espresso-idling-resource-3.1.1.aarbin4680 -> 0 bytes
-rw-r--r--common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.1.2-alpha01/espresso-idling-resource-3.1.2-alpha01.aarbin0 -> 4681 bytes
-rw-r--r--common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.1.2-alpha01/espresso-idling-resource-3.1.2-alpha01.pom (renamed from common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.1.1/espresso-idling-resource-3.1.1.pom)2
-rw-r--r--common/androidx-test/androidx/test/espresso/espresso-intents/3.1.1/espresso-intents-3.1.1.aarbin47010 -> 0 bytes
-rw-r--r--common/androidx-test/androidx/test/espresso/espresso-intents/3.1.2-alpha01/espresso-intents-3.1.2-alpha01.aarbin0 -> 47729 bytes
-rw-r--r--common/androidx-test/androidx/test/espresso/espresso-intents/3.1.2-alpha01/espresso-intents-3.1.2-alpha01.pom (renamed from common/androidx-test/androidx/test/espresso/espresso-intents/3.1.1/espresso-intents-3.1.1.pom)8
-rw-r--r--common/androidx-test/androidx/test/espresso/espresso-web/3.1.1/espresso-web-3.1.1.aarbin481521 -> 0 bytes
-rw-r--r--common/androidx-test/androidx/test/espresso/espresso-web/3.1.2-alpha01/espresso-web-3.1.2-alpha01.aarbin0 -> 481261 bytes
-rw-r--r--common/androidx-test/androidx/test/espresso/espresso-web/3.1.2-alpha01/espresso-web-3.1.2-alpha01.pom (renamed from common/androidx-test/androidx/test/espresso/espresso-web/3.1.1/espresso-web-3.1.1.pom)4
-rw-r--r--common/androidx-test/androidx/test/ext/junit/1.1.0/junit-1.1.0.aarbin5140 -> 0 bytes
-rw-r--r--common/androidx-test/androidx/test/ext/junit/1.1.1-alpha01/junit-1.1.1-alpha01.aarbin0 -> 5056 bytes
-rw-r--r--common/androidx-test/androidx/test/ext/junit/1.1.1-alpha01/junit-1.1.1-alpha01.pom (renamed from common/androidx-test/androidx/test/ext/junit/1.1.0/junit-1.1.0.pom)6
-rw-r--r--common/androidx-test/androidx/test/ext/truth/1.1.0/truth-1.1.0.aarbin22573 -> 0 bytes
-rw-r--r--common/androidx-test/androidx/test/ext/truth/1.1.1-alpha01/truth-1.1.1-alpha01.aarbin0 -> 22636 bytes
-rw-r--r--common/androidx-test/androidx/test/ext/truth/1.1.1-alpha01/truth-1.1.1-alpha01.pom (renamed from common/androidx-test/androidx/test/ext/truth/1.1.0/truth-1.1.0.pom)4
-rw-r--r--common/androidx-test/androidx/test/monitor/1.1.1/monitor-1.1.1.aarbin69921 -> 0 bytes
-rw-r--r--common/androidx-test/androidx/test/monitor/1.1.2-alpha01/monitor-1.1.2-alpha01.aarbin0 -> 69939 bytes
-rw-r--r--common/androidx-test/androidx/test/monitor/1.1.2-alpha01/monitor-1.1.2-alpha01.pom (renamed from common/androidx-test/androidx/test/monitor/1.1.1/monitor-1.1.1.pom)2
-rw-r--r--common/androidx-test/androidx/test/rules/1.1.2-alpha01/rules-1.1.2-alpha01.aar (renamed from common/androidx-test/androidx/test/rules/1.1.1/rules-1.1.1.aar)bin46803 -> 46803 bytes
-rw-r--r--common/androidx-test/androidx/test/rules/1.1.2-alpha01/rules-1.1.2-alpha01.pom (renamed from common/androidx-test/androidx/test/rules/1.1.1/rules-1.1.1.pom)4
-rw-r--r--common/androidx-test/androidx/test/runner/1.1.1/runner-1.1.1.aarbin165292 -> 0 bytes
-rw-r--r--common/androidx-test/androidx/test/runner/1.1.2-alpha01/runner-1.1.2-alpha01.aarbin0 -> 165371 bytes
-rw-r--r--common/androidx-test/androidx/test/runner/1.1.2-alpha01/runner-1.1.2-alpha01.pom (renamed from common/androidx-test/androidx/test/runner/1.1.1/runner-1.1.1.pom)4
-rw-r--r--common/androidx-test/manifests/androidx.test.core/AndroidManifest.xml6
-rwxr-xr-xcommon/androidx-test/update-from-gmaven.py12
33 files changed, 46 insertions, 46 deletions
diff --git a/common/androidx-test/Android.bp b/common/androidx-test/Android.bp
index a12c3499..9399cb3d 100644
--- a/common/androidx-test/Android.bp
+++ b/common/androidx-test/Android.bp
@@ -1,9 +1,9 @@
// Automatically generated with:
-// pom2bp -rewrite 'androidx.test.espresso:espresso-=androidx.test.espresso.' -rewrite 'androidx.test:=androidx.test.' -rewrite 'androidx.test.ext:=androidx.test.ext.' -rewrite 'com.google.truth:truth=truth-prebuilt' -rewrite 'net.sf.kxml:kxml2=kxml2-android' -rewrite 'androidx.lifecycle:lifecycle-common=androidx.lifecycle_lifecycle-common' -rewrite 'androidx.annotation:annotation=androidx.annotation_annotation' -rewrite 'org.hamcrest:hamcrest-integration=hamcrest' -rewrite 'javax.inject:javax.inject=jsr330' -rewrite 'com.google.android.material:material=com.google.android.material_material' -rewrite 'androidx.drawerlayout:drawerlayout=androidx.drawerlayout_drawerlayout' -rewrite 'androidx.viewpager:viewpager=androidx.viewpager_viewpager' -rewrite 'androidx.recyclerview:recyclerview=androidx.recyclerview_recyclerview' -rewrite 'androidx.core:core=androidx.core_core' -rewrite 'androidx.legacy:legacy-support-core-utils=androidx.legacy_legacy-support-core-utils' -sdk-version current .
+// pom2bp -rewrite 'androidx.test:=androidx.test.' -rewrite 'androidx.test.espresso:espresso-=androidx.test.espresso.' -rewrite 'androidx.test.ext:=androidx.test.ext.' -rewrite 'com.google.truth:truth=truth-prebuilt' -rewrite 'net.sf.kxml:kxml2=kxml2-android' -rewrite 'androidx.lifecycle:lifecycle-common=androidx.lifecycle_lifecycle-common' -rewrite 'androidx.annotation:annotation=androidx.annotation_annotation' -rewrite 'org.hamcrest:hamcrest-integration=hamcrest' -rewrite 'javax.inject:javax.inject=jsr330' -rewrite 'com.google.android.material:material=com.google.android.material_material' -rewrite 'androidx.drawerlayout:drawerlayout=androidx.drawerlayout_drawerlayout' -rewrite 'androidx.viewpager:viewpager=androidx.viewpager_viewpager' -rewrite 'androidx.recyclerview:recyclerview=androidx.recyclerview_recyclerview' -rewrite 'androidx.core:core=androidx.core_core' -rewrite 'androidx.legacy:legacy-support-core-utils=androidx.legacy_legacy-support-core-utils' -sdk-version current .
android_library_import {
name: "androidx.test.core-nodeps",
- aars: ["androidx/test/core/1.1.0/core-1.1.0.aar"],
+ aars: ["androidx/test/core/1.1.1-alpha01/core-1.1.1-alpha01.aar"],
sdk_version: "current",
min_sdk_version: "14",
static_libs: [
@@ -27,7 +27,7 @@ android_library {
android_library_import {
name: "androidx.test.espresso.contrib-nodeps",
- aars: ["androidx/test/espresso/espresso-contrib/3.1.1/espresso-contrib-3.1.1.aar"],
+ aars: ["androidx/test/espresso/espresso-contrib/3.1.2-alpha01/espresso-contrib-3.1.2-alpha01.aar"],
sdk_version: "current",
min_sdk_version: "14",
static_libs: [
@@ -58,7 +58,7 @@ android_library {
android_library_import {
name: "androidx.test.espresso.core-nodeps",
- aars: ["androidx/test/espresso/espresso-core/3.1.1/espresso-core-3.1.1.aar"],
+ aars: ["androidx/test/espresso/espresso-core/3.1.2-alpha01/espresso-core-3.1.2-alpha01.aar"],
sdk_version: "current",
min_sdk_version: "14",
static_libs: [
@@ -87,7 +87,7 @@ android_library {
android_library_import {
name: "androidx.test.espresso.idling-resource-nodeps",
- aars: ["androidx/test/espresso/espresso-idling-resource/3.1.1/espresso-idling-resource-3.1.1.aar"],
+ aars: ["androidx/test/espresso/espresso-idling-resource/3.1.2-alpha01/espresso-idling-resource-3.1.2-alpha01.aar"],
sdk_version: "current",
min_sdk_version: "14",
static_libs: [
@@ -107,7 +107,7 @@ android_library {
android_library_import {
name: "androidx.test.espresso.intents-nodeps",
- aars: ["androidx/test/espresso/espresso-intents/3.1.1/espresso-intents-3.1.1.aar"],
+ aars: ["androidx/test/espresso/espresso-intents/3.1.2-alpha01/espresso-intents-3.1.2-alpha01.aar"],
sdk_version: "current",
min_sdk_version: "14",
static_libs: [
@@ -133,7 +133,7 @@ android_library {
android_library_import {
name: "androidx.test.espresso.web-nodeps",
- aars: ["androidx/test/espresso/espresso-web/3.1.1/espresso-web-3.1.1.aar"],
+ aars: ["androidx/test/espresso/espresso-web/3.1.2-alpha01/espresso-web-3.1.2-alpha01.aar"],
sdk_version: "current",
min_sdk_version: "14",
static_libs: [
@@ -157,7 +157,7 @@ android_library {
android_library_import {
name: "androidx.test.ext.junit-nodeps",
- aars: ["androidx/test/ext/junit/1.1.0/junit-1.1.0.aar"],
+ aars: ["androidx/test/ext/junit/1.1.1-alpha01/junit-1.1.1-alpha01.aar"],
sdk_version: "current",
min_sdk_version: "14",
static_libs: [
@@ -183,7 +183,7 @@ android_library {
android_library_import {
name: "androidx.test.ext.truth-nodeps",
- aars: ["androidx/test/ext/truth/1.1.0/truth-1.1.0.aar"],
+ aars: ["androidx/test/ext/truth/1.1.1-alpha01/truth-1.1.1-alpha01.aar"],
sdk_version: "current",
min_sdk_version: "14",
static_libs: [
@@ -208,7 +208,7 @@ android_library {
android_library_import {
name: "androidx.test.monitor-nodeps",
- aars: ["androidx/test/monitor/1.1.1/monitor-1.1.1.aar"],
+ aars: ["androidx/test/monitor/1.1.2-alpha01/monitor-1.1.2-alpha01.aar"],
sdk_version: "current",
min_sdk_version: "14",
static_libs: [
@@ -229,7 +229,7 @@ android_library {
android_library_import {
name: "androidx.test.rules-nodeps",
- aars: ["androidx/test/rules/1.1.1/rules-1.1.1.aar"],
+ aars: ["androidx/test/rules/1.1.2-alpha01/rules-1.1.2-alpha01.aar"],
sdk_version: "current",
min_sdk_version: "14",
static_libs: [
@@ -251,7 +251,7 @@ android_library {
android_library_import {
name: "androidx.test.runner-nodeps",
- aars: ["androidx/test/runner/1.1.1/runner-1.1.1.aar"],
+ aars: ["androidx/test/runner/1.1.2-alpha01/runner-1.1.2-alpha01.aar"],
sdk_version: "current",
min_sdk_version: "14",
static_libs: [
diff --git a/common/androidx-test/androidx/test/core/1.1.0/core-1.1.0.aar b/common/androidx-test/androidx/test/core/1.1.1-alpha01/core-1.1.1-alpha01.aar
index ef59bb11..52b68ea1 100644
--- a/common/androidx-test/androidx/test/core/1.1.0/core-1.1.0.aar
+++ b/common/androidx-test/androidx/test/core/1.1.1-alpha01/core-1.1.1-alpha01.aar
Binary files differ
diff --git a/common/androidx-test/androidx/test/core/1.1.0/core-1.1.0.pom b/common/androidx-test/androidx/test/core/1.1.1-alpha01/core-1.1.1-alpha01.pom
index b727375f..b32190c1 100644
--- a/common/androidx-test/androidx/test/core/1.1.0/core-1.1.0.pom
+++ b/common/androidx-test/androidx/test/core/1.1.1-alpha01/core-1.1.1-alpha01.pom
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>androidx.test</groupId>
<artifactId>core</artifactId>
- <version>1.1.0</version>
+ <version>1.1.1-alpha01</version>
<packaging>aar</packaging>
<name>AndroidX Test Library</name>
<description>The AndroidX Test Library provides an extensive framework for testing Android apps</description>
@@ -33,7 +33,7 @@
<dependency>
<groupId>androidx.test</groupId>
<artifactId>monitor</artifactId>
- <version>1.1.1</version>
+ <version>1.1.2-alpha01</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/common/androidx-test/androidx/test/espresso/espresso-contrib/3.1.1/espresso-contrib-3.1.1.aar b/common/androidx-test/androidx/test/espresso/espresso-contrib/3.1.2-alpha01/espresso-contrib-3.1.2-alpha01.aar
index 26fba7c3..994e4931 100644
--- a/common/androidx-test/androidx/test/espresso/espresso-contrib/3.1.1/espresso-contrib-3.1.1.aar
+++ b/common/androidx-test/androidx/test/espresso/espresso-contrib/3.1.2-alpha01/espresso-contrib-3.1.2-alpha01.aar
Binary files differ
diff --git a/common/androidx-test/androidx/test/espresso/espresso-contrib/3.1.1/espresso-contrib-3.1.1.pom b/common/androidx-test/androidx/test/espresso/espresso-contrib/3.1.2-alpha01/espresso-contrib-3.1.2-alpha01.pom
index 15479543..5cd2293e 100644
--- a/common/androidx-test/androidx/test/espresso/espresso-contrib/3.1.1/espresso-contrib-3.1.1.pom
+++ b/common/androidx-test/androidx/test/espresso/espresso-contrib/3.1.2-alpha01/espresso-contrib-3.1.2-alpha01.pom
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>androidx.test.espresso</groupId>
<artifactId>espresso-contrib</artifactId>
- <version>3.1.1</version>
+ <version>3.1.2-alpha01</version>
<packaging>aar</packaging>
<name>AndroidX Test Library</name>
<description>The AndroidX Test Library provides an extensive framework for testing Android apps</description>
@@ -27,13 +27,13 @@
<dependency>
<groupId>androidx.test.espresso</groupId>
<artifactId>espresso-core</artifactId>
- <version>3.1.1</version>
+ <version>3.1.2-alpha01</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>androidx.test.espresso</groupId>
<artifactId>espresso-idling-resource</artifactId>
- <version>3.1.1</version>
+ <version>3.1.2-alpha01</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/common/androidx-test/androidx/test/espresso/espresso-core/3.1.1/espresso-core-3.1.1.aar b/common/androidx-test/androidx/test/espresso/espresso-core/3.1.1/espresso-core-3.1.1.aar
deleted file mode 100644
index 8b6c7d4c..00000000
--- a/common/androidx-test/androidx/test/espresso/espresso-core/3.1.1/espresso-core-3.1.1.aar
+++ /dev/null
Binary files differ
diff --git a/common/androidx-test/androidx/test/espresso/espresso-core/3.1.2-alpha01/espresso-core-3.1.2-alpha01.aar b/common/androidx-test/androidx/test/espresso/espresso-core/3.1.2-alpha01/espresso-core-3.1.2-alpha01.aar
new file mode 100644
index 00000000..6dc42ff5
--- /dev/null
+++ b/common/androidx-test/androidx/test/espresso/espresso-core/3.1.2-alpha01/espresso-core-3.1.2-alpha01.aar
Binary files differ
diff --git a/common/androidx-test/androidx/test/espresso/espresso-core/3.1.1/espresso-core-3.1.1.pom b/common/androidx-test/androidx/test/espresso/espresso-core/3.1.2-alpha01/espresso-core-3.1.2-alpha01.pom
index 6eeb82c5..e8a89850 100644
--- a/common/androidx-test/androidx/test/espresso/espresso-core/3.1.1/espresso-core-3.1.1.pom
+++ b/common/androidx-test/androidx/test/espresso/espresso-core/3.1.2-alpha01/espresso-core-3.1.2-alpha01.pom
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>androidx.test.espresso</groupId>
<artifactId>espresso-core</artifactId>
- <version>3.1.1</version>
+ <version>3.1.2-alpha01</version>
<packaging>aar</packaging>
<name>AndroidX Test Library</name>
<description>The AndroidX Test Library provides an extensive framework for testing Android apps</description>
@@ -27,13 +27,13 @@
<dependency>
<groupId>androidx.test</groupId>
<artifactId>runner</artifactId>
- <version>1.1.1</version>
+ <version>1.1.2-alpha01</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>androidx.test.espresso</groupId>
<artifactId>espresso-idling-resource</artifactId>
- <version>3.1.1</version>
+ <version>3.1.2-alpha01</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.1.1/espresso-idling-resource-3.1.1.aar b/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.1.1/espresso-idling-resource-3.1.1.aar
deleted file mode 100644
index df9c6ac7..00000000
--- a/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.1.1/espresso-idling-resource-3.1.1.aar
+++ /dev/null
Binary files differ
diff --git a/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.1.2-alpha01/espresso-idling-resource-3.1.2-alpha01.aar b/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.1.2-alpha01/espresso-idling-resource-3.1.2-alpha01.aar
new file mode 100644
index 00000000..ce397dc5
--- /dev/null
+++ b/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.1.2-alpha01/espresso-idling-resource-3.1.2-alpha01.aar
Binary files differ
diff --git a/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.1.1/espresso-idling-resource-3.1.1.pom b/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.1.2-alpha01/espresso-idling-resource-3.1.2-alpha01.pom
index ba25667d..0b6da0e8 100644
--- a/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.1.1/espresso-idling-resource-3.1.1.pom
+++ b/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.1.2-alpha01/espresso-idling-resource-3.1.2-alpha01.pom
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>androidx.test.espresso</groupId>
<artifactId>espresso-idling-resource</artifactId>
- <version>3.1.1</version>
+ <version>3.1.2-alpha01</version>
<packaging>aar</packaging>
<name>AndroidX Test Library</name>
<description>The AndroidX Test Library provides an extensive framework for testing Android apps</description>
diff --git a/common/androidx-test/androidx/test/espresso/espresso-intents/3.1.1/espresso-intents-3.1.1.aar b/common/androidx-test/androidx/test/espresso/espresso-intents/3.1.1/espresso-intents-3.1.1.aar
deleted file mode 100644
index 3a200d0f..00000000
--- a/common/androidx-test/androidx/test/espresso/espresso-intents/3.1.1/espresso-intents-3.1.1.aar
+++ /dev/null
Binary files differ
diff --git a/common/androidx-test/androidx/test/espresso/espresso-intents/3.1.2-alpha01/espresso-intents-3.1.2-alpha01.aar b/common/androidx-test/androidx/test/espresso/espresso-intents/3.1.2-alpha01/espresso-intents-3.1.2-alpha01.aar
new file mode 100644
index 00000000..8c111bab
--- /dev/null
+++ b/common/androidx-test/androidx/test/espresso/espresso-intents/3.1.2-alpha01/espresso-intents-3.1.2-alpha01.aar
Binary files differ
diff --git a/common/androidx-test/androidx/test/espresso/espresso-intents/3.1.1/espresso-intents-3.1.1.pom b/common/androidx-test/androidx/test/espresso/espresso-intents/3.1.2-alpha01/espresso-intents-3.1.2-alpha01.pom
index e486a4ba..d5191f3e 100644
--- a/common/androidx-test/androidx/test/espresso/espresso-intents/3.1.1/espresso-intents-3.1.1.pom
+++ b/common/androidx-test/androidx/test/espresso/espresso-intents/3.1.2-alpha01/espresso-intents-3.1.2-alpha01.pom
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>androidx.test.espresso</groupId>
<artifactId>espresso-intents</artifactId>
- <version>3.1.1</version>
+ <version>3.1.2-alpha01</version>
<packaging>aar</packaging>
<name>AndroidX Test Library</name>
<description>The AndroidX Test Library provides an extensive framework for testing Android apps</description>
@@ -27,19 +27,19 @@
<dependency>
<groupId>androidx.test.espresso</groupId>
<artifactId>espresso-core</artifactId>
- <version>3.1.1</version>
+ <version>3.1.2-alpha01</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>androidx.test</groupId>
<artifactId>core</artifactId>
- <version>1.1.0</version>
+ <version>1.1.1-alpha01</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>androidx.test</groupId>
<artifactId>rules</artifactId>
- <version>1.1.1</version>
+ <version>1.1.2-alpha01</version>
<scope>compile</scope>
</dependency>
</dependencies>
diff --git a/common/androidx-test/androidx/test/espresso/espresso-web/3.1.1/espresso-web-3.1.1.aar b/common/androidx-test/androidx/test/espresso/espresso-web/3.1.1/espresso-web-3.1.1.aar
deleted file mode 100644
index b20905ec..00000000
--- a/common/androidx-test/androidx/test/espresso/espresso-web/3.1.1/espresso-web-3.1.1.aar
+++ /dev/null
Binary files differ
diff --git a/common/androidx-test/androidx/test/espresso/espresso-web/3.1.2-alpha01/espresso-web-3.1.2-alpha01.aar b/common/androidx-test/androidx/test/espresso/espresso-web/3.1.2-alpha01/espresso-web-3.1.2-alpha01.aar
new file mode 100644
index 00000000..f59dc137
--- /dev/null
+++ b/common/androidx-test/androidx/test/espresso/espresso-web/3.1.2-alpha01/espresso-web-3.1.2-alpha01.aar
Binary files differ
diff --git a/common/androidx-test/androidx/test/espresso/espresso-web/3.1.1/espresso-web-3.1.1.pom b/common/androidx-test/androidx/test/espresso/espresso-web/3.1.2-alpha01/espresso-web-3.1.2-alpha01.pom
index 334f2d82..daabfa2b 100644
--- a/common/androidx-test/androidx/test/espresso/espresso-web/3.1.1/espresso-web-3.1.1.pom
+++ b/common/androidx-test/androidx/test/espresso/espresso-web/3.1.2-alpha01/espresso-web-3.1.2-alpha01.pom
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>androidx.test.espresso</groupId>
<artifactId>espresso-web</artifactId>
- <version>3.1.1</version>
+ <version>3.1.2-alpha01</version>
<packaging>aar</packaging>
<name>AndroidX Test Library</name>
<description>The AndroidX Test Library provides an extensive framework for testing Android apps</description>
@@ -27,7 +27,7 @@
<dependency>
<groupId>androidx.test.espresso</groupId>
<artifactId>espresso-core</artifactId>
- <version>3.1.1</version>
+ <version>3.1.2-alpha01</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/common/androidx-test/androidx/test/ext/junit/1.1.0/junit-1.1.0.aar b/common/androidx-test/androidx/test/ext/junit/1.1.0/junit-1.1.0.aar
deleted file mode 100644
index 2ac9ddf1..00000000
--- a/common/androidx-test/androidx/test/ext/junit/1.1.0/junit-1.1.0.aar
+++ /dev/null
Binary files differ
diff --git a/common/androidx-test/androidx/test/ext/junit/1.1.1-alpha01/junit-1.1.1-alpha01.aar b/common/androidx-test/androidx/test/ext/junit/1.1.1-alpha01/junit-1.1.1-alpha01.aar
new file mode 100644
index 00000000..c6744643
--- /dev/null
+++ b/common/androidx-test/androidx/test/ext/junit/1.1.1-alpha01/junit-1.1.1-alpha01.aar
Binary files differ
diff --git a/common/androidx-test/androidx/test/ext/junit/1.1.0/junit-1.1.0.pom b/common/androidx-test/androidx/test/ext/junit/1.1.1-alpha01/junit-1.1.1-alpha01.pom
index 795d31a2..cfacbe37 100644
--- a/common/androidx-test/androidx/test/ext/junit/1.1.0/junit-1.1.0.pom
+++ b/common/androidx-test/androidx/test/ext/junit/1.1.1-alpha01/junit-1.1.1-alpha01.pom
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>androidx.test.ext</groupId>
<artifactId>junit</artifactId>
- <version>1.1.0</version>
+ <version>1.1.1-alpha01</version>
<packaging>aar</packaging>
<name>AndroidX Test Library</name>
<description>The AndroidX Test Library provides an extensive framework for testing Android apps</description>
@@ -33,13 +33,13 @@
<dependency>
<groupId>androidx.test</groupId>
<artifactId>core</artifactId>
- <version>1.1.0</version>
+ <version>1.1.1-alpha01</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>androidx.test</groupId>
<artifactId>monitor</artifactId>
- <version>1.1.1</version>
+ <version>1.1.2-alpha01</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/common/androidx-test/androidx/test/ext/truth/1.1.0/truth-1.1.0.aar b/common/androidx-test/androidx/test/ext/truth/1.1.0/truth-1.1.0.aar
deleted file mode 100644
index bf92353f..00000000
--- a/common/androidx-test/androidx/test/ext/truth/1.1.0/truth-1.1.0.aar
+++ /dev/null
Binary files differ
diff --git a/common/androidx-test/androidx/test/ext/truth/1.1.1-alpha01/truth-1.1.1-alpha01.aar b/common/androidx-test/androidx/test/ext/truth/1.1.1-alpha01/truth-1.1.1-alpha01.aar
new file mode 100644
index 00000000..042ee6da
--- /dev/null
+++ b/common/androidx-test/androidx/test/ext/truth/1.1.1-alpha01/truth-1.1.1-alpha01.aar
Binary files differ
diff --git a/common/androidx-test/androidx/test/ext/truth/1.1.0/truth-1.1.0.pom b/common/androidx-test/androidx/test/ext/truth/1.1.1-alpha01/truth-1.1.1-alpha01.pom
index e14ff160..6fb4bd03 100644
--- a/common/androidx-test/androidx/test/ext/truth/1.1.0/truth-1.1.0.pom
+++ b/common/androidx-test/androidx/test/ext/truth/1.1.1-alpha01/truth-1.1.1-alpha01.pom
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>androidx.test.ext</groupId>
<artifactId>truth</artifactId>
- <version>1.1.0</version>
+ <version>1.1.1-alpha01</version>
<packaging>aar</packaging>
<name>AndroidX Test Library</name>
<description>The AndroidX Test Library provides an extensive framework for testing Android apps</description>
@@ -27,7 +27,7 @@
<dependency>
<groupId>androidx.test</groupId>
<artifactId>core</artifactId>
- <version>1.1.0</version>
+ <version>1.1.1-alpha01</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/common/androidx-test/androidx/test/monitor/1.1.1/monitor-1.1.1.aar b/common/androidx-test/androidx/test/monitor/1.1.1/monitor-1.1.1.aar
deleted file mode 100644
index 2fe14504..00000000
--- a/common/androidx-test/androidx/test/monitor/1.1.1/monitor-1.1.1.aar
+++ /dev/null
Binary files differ
diff --git a/common/androidx-test/androidx/test/monitor/1.1.2-alpha01/monitor-1.1.2-alpha01.aar b/common/androidx-test/androidx/test/monitor/1.1.2-alpha01/monitor-1.1.2-alpha01.aar
new file mode 100644
index 00000000..3bccf171
--- /dev/null
+++ b/common/androidx-test/androidx/test/monitor/1.1.2-alpha01/monitor-1.1.2-alpha01.aar
Binary files differ
diff --git a/common/androidx-test/androidx/test/monitor/1.1.1/monitor-1.1.1.pom b/common/androidx-test/androidx/test/monitor/1.1.2-alpha01/monitor-1.1.2-alpha01.pom
index 4f1037ed..9a602f0e 100644
--- a/common/androidx-test/androidx/test/monitor/1.1.1/monitor-1.1.1.pom
+++ b/common/androidx-test/androidx/test/monitor/1.1.2-alpha01/monitor-1.1.2-alpha01.pom
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>androidx.test</groupId>
<artifactId>monitor</artifactId>
- <version>1.1.1</version>
+ <version>1.1.2-alpha01</version>
<packaging>aar</packaging>
<name>AndroidX Test Library</name>
<description>The AndroidX Test Library provides an extensive framework for testing Android apps</description>
diff --git a/common/androidx-test/androidx/test/rules/1.1.1/rules-1.1.1.aar b/common/androidx-test/androidx/test/rules/1.1.2-alpha01/rules-1.1.2-alpha01.aar
index 33079b4f..a3ddf306 100644
--- a/common/androidx-test/androidx/test/rules/1.1.1/rules-1.1.1.aar
+++ b/common/androidx-test/androidx/test/rules/1.1.2-alpha01/rules-1.1.2-alpha01.aar
Binary files differ
diff --git a/common/androidx-test/androidx/test/rules/1.1.1/rules-1.1.1.pom b/common/androidx-test/androidx/test/rules/1.1.2-alpha01/rules-1.1.2-alpha01.pom
index c92edea8..535a67d4 100644
--- a/common/androidx-test/androidx/test/rules/1.1.1/rules-1.1.1.pom
+++ b/common/androidx-test/androidx/test/rules/1.1.2-alpha01/rules-1.1.2-alpha01.pom
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>androidx.test</groupId>
<artifactId>rules</artifactId>
- <version>1.1.1</version>
+ <version>1.1.2-alpha01</version>
<packaging>aar</packaging>
<name>AndroidX Test Library</name>
<description>The AndroidX Test Library provides an extensive framework for testing Android apps</description>
@@ -27,7 +27,7 @@
<dependency>
<groupId>androidx.test</groupId>
<artifactId>runner</artifactId>
- <version>1.1.1</version>
+ <version>1.1.2-alpha01</version>
<scope>compile</scope>
</dependency>
</dependencies>
diff --git a/common/androidx-test/androidx/test/runner/1.1.1/runner-1.1.1.aar b/common/androidx-test/androidx/test/runner/1.1.1/runner-1.1.1.aar
deleted file mode 100644
index 117353db..00000000
--- a/common/androidx-test/androidx/test/runner/1.1.1/runner-1.1.1.aar
+++ /dev/null
Binary files differ
diff --git a/common/androidx-test/androidx/test/runner/1.1.2-alpha01/runner-1.1.2-alpha01.aar b/common/androidx-test/androidx/test/runner/1.1.2-alpha01/runner-1.1.2-alpha01.aar
new file mode 100644
index 00000000..dc0e5edb
--- /dev/null
+++ b/common/androidx-test/androidx/test/runner/1.1.2-alpha01/runner-1.1.2-alpha01.aar
Binary files differ
diff --git a/common/androidx-test/androidx/test/runner/1.1.1/runner-1.1.1.pom b/common/androidx-test/androidx/test/runner/1.1.2-alpha01/runner-1.1.2-alpha01.pom
index 5a8f033b..ba1d5529 100644
--- a/common/androidx-test/androidx/test/runner/1.1.1/runner-1.1.1.pom
+++ b/common/androidx-test/androidx/test/runner/1.1.2-alpha01/runner-1.1.2-alpha01.pom
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>androidx.test</groupId>
<artifactId>runner</artifactId>
- <version>1.1.1</version>
+ <version>1.1.2-alpha01</version>
<packaging>aar</packaging>
<name>AndroidX Test Library</name>
<description>The AndroidX Test Library provides an extensive framework for testing Android apps</description>
@@ -33,7 +33,7 @@
<dependency>
<groupId>androidx.test</groupId>
<artifactId>monitor</artifactId>
- <version>1.1.1</version>
+ <version>1.1.2-alpha01</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/common/androidx-test/manifests/androidx.test.core/AndroidManifest.xml b/common/androidx-test/manifests/androidx.test.core/AndroidManifest.xml
index 87f598c9..72ccd591 100644
--- a/common/androidx-test/manifests/androidx.test.core/AndroidManifest.xml
+++ b/common/androidx-test/manifests/androidx.test.core/AndroidManifest.xml
@@ -26,21 +26,21 @@
<application>
<activity
android:name="androidx.test.core.app.InstrumentationActivityInvoker$BootstrapActivity"
- android:theme="@style/InstrumentationActivityInvokerBootstrapActivityTheme" >
+ android:theme="@android:style/Theme" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
</intent-filter>
</activity>
<activity
android:name="androidx.test.core.app.InstrumentationActivityInvoker$EmptyActivity"
- android:theme="@style/InstrumentationActivityInvokerEmptyActivityTheme" >
+ android:theme="@android:style/Theme" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
</intent-filter>
</activity>
<activity
android:name="androidx.test.core.app.InstrumentationActivityInvoker$EmptyFloatingActivity"
- android:theme="@style/InstrumentationActivityInvokerFloatingActivityTheme" >
+ android:theme="@android:style/Theme.Dialog" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
</intent-filter>
diff --git a/common/androidx-test/update-from-gmaven.py b/common/androidx-test/update-from-gmaven.py
index 0fb04cb0..849cb531 100755
--- a/common/androidx-test/update-from-gmaven.py
+++ b/common/androidx-test/update-from-gmaven.py
@@ -18,12 +18,12 @@ import os
import subprocess
import sys
-runnerVersion="1.1.1"
-rulesVersion="1.1.1"
-espressoVersion="3.1.1"
-coreVersion="1.1.0"
-extJUnitVersion="1.1.0"
-extTruthVersion="1.1.0"
+runnerVersion="1.1.2-alpha01"
+rulesVersion="1.1.2-alpha01"
+espressoVersion="3.1.2-alpha01"
+coreVersion="1.1.1-alpha01"
+extJUnitVersion="1.1.1-alpha01"
+extTruthVersion="1.1.1-alpha01"
mavenToBpPatternMap = {
"androidx.test:" : "androidx.test.",