Merge "Update to androidx.test stable versions."
diff --git a/common/androidx-test/Android.bp b/common/androidx-test/Android.bp
index 46705e0..ea0fbbb 100644
--- a/common/androidx-test/Android.bp
+++ b/common/androidx-test/Android.bp
@@ -1,22 +1,9 @@
// Automatically generated with:
-// 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.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 .
-
-// TODO: manually added, remove after all clients migrate to proper rules
-android_library {
- name: "androidx-test",
- sdk_version: "current",
- min_sdk_version: "14",
- manifest: "manifests/androidx.test.runner/AndroidManifest.xml",
- static_libs: [
- "androidx.test.runner",
- "androidx.test.rules",
- ],
- java_version: "1.7",
-}
+// 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.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.0.0-beta02/core-1.0.0-beta02.aar"],
+ aars: ["androidx/test/core/1.0.0/core-1.0.0.aar"],
sdk_version: "current",
min_sdk_version: "14",
static_libs: [
@@ -40,7 +27,7 @@
android_library_import {
name: "androidx.test.espresso.contrib-nodeps",
- aars: ["androidx/test/espresso/espresso-contrib/3.1.0-beta02/espresso-contrib-3.1.0-beta02.aar"],
+ aars: ["androidx/test/espresso/espresso-contrib/3.1.0/espresso-contrib-3.1.0.aar"],
sdk_version: "current",
min_sdk_version: "14",
static_libs: [
@@ -69,7 +56,7 @@
android_library_import {
name: "androidx.test.espresso.core-nodeps",
- aars: ["androidx/test/espresso/espresso-core/3.1.0-beta02/espresso-core-3.1.0-beta02.aar"],
+ aars: ["androidx/test/espresso/espresso-core/3.1.0/espresso-core-3.1.0.aar"],
sdk_version: "current",
min_sdk_version: "14",
static_libs: [
@@ -98,7 +85,7 @@
android_library_import {
name: "androidx.test.espresso.idling-resource-nodeps",
- aars: ["androidx/test/espresso/espresso-idling-resource/3.1.0-beta02/espresso-idling-resource-3.1.0-beta02.aar"],
+ aars: ["androidx/test/espresso/espresso-idling-resource/3.1.0/espresso-idling-resource-3.1.0.aar"],
sdk_version: "current",
min_sdk_version: "14",
static_libs: [
@@ -118,7 +105,7 @@
android_library_import {
name: "androidx.test.espresso.intents-nodeps",
- aars: ["androidx/test/espresso/espresso-intents/3.1.0-beta02/espresso-intents-3.1.0-beta02.aar"],
+ aars: ["androidx/test/espresso/espresso-intents/3.1.0/espresso-intents-3.1.0.aar"],
sdk_version: "current",
min_sdk_version: "14",
static_libs: [
@@ -142,7 +129,7 @@
android_library_import {
name: "androidx.test.espresso.web-nodeps",
- aars: ["androidx/test/espresso/espresso-web/3.1.0-beta02/espresso-web-3.1.0-beta02.aar"],
+ aars: ["androidx/test/espresso/espresso-web/3.1.0/espresso-web-3.1.0.aar"],
sdk_version: "current",
min_sdk_version: "14",
static_libs: [
@@ -166,7 +153,7 @@
android_library_import {
name: "androidx.test.ext.junit-nodeps",
- aars: ["androidx/test/ext/junit/1.0.0-beta02/junit-1.0.0-beta02.aar"],
+ aars: ["androidx/test/ext/junit/1.0.0/junit-1.0.0.aar"],
sdk_version: "current",
min_sdk_version: "14",
static_libs: [
@@ -187,7 +174,7 @@
android_library_import {
name: "androidx.test.ext.truth-nodeps",
- aars: ["androidx/test/ext/truth/1.0.0-beta02/truth-1.0.0-beta02.aar"],
+ aars: ["androidx/test/ext/truth/1.0.0/truth-1.0.0.aar"],
sdk_version: "current",
min_sdk_version: "14",
static_libs: [
@@ -212,7 +199,7 @@
android_library_import {
name: "androidx.test.monitor-nodeps",
- aars: ["androidx/test/monitor/1.1.0-beta02/monitor-1.1.0-beta02.aar"],
+ aars: ["androidx/test/monitor/1.1.0/monitor-1.1.0.aar"],
sdk_version: "current",
min_sdk_version: "14",
static_libs: [
@@ -233,7 +220,7 @@
android_library_import {
name: "androidx.test.rules-nodeps",
- aars: ["androidx/test/rules/1.1.0-beta02/rules-1.1.0-beta02.aar"],
+ aars: ["androidx/test/rules/1.1.0/rules-1.1.0.aar"],
sdk_version: "current",
min_sdk_version: "14",
static_libs: [
@@ -255,7 +242,7 @@
android_library_import {
name: "androidx.test.runner-nodeps",
- aars: ["androidx/test/runner/1.1.0-beta02/runner-1.1.0-beta02.aar"],
+ aars: ["androidx/test/runner/1.1.0/runner-1.1.0.aar"],
sdk_version: "current",
min_sdk_version: "14",
static_libs: [
diff --git a/common/androidx-test/androidx/test/core/1.0.0-beta02/core-1.0.0-beta02.aar b/common/androidx-test/androidx/test/core/1.0.0-beta02/core-1.0.0-beta02.aar
deleted file mode 100644
index 3862e65..0000000
--- a/common/androidx-test/androidx/test/core/1.0.0-beta02/core-1.0.0-beta02.aar
+++ /dev/null
Binary files differ
diff --git a/common/androidx-test/androidx/test/core/1.0.0/core-1.0.0.aar b/common/androidx-test/androidx/test/core/1.0.0/core-1.0.0.aar
new file mode 100644
index 0000000..4212e45
--- /dev/null
+++ b/common/androidx-test/androidx/test/core/1.0.0/core-1.0.0.aar
Binary files differ
diff --git a/common/androidx-test/androidx/test/core/1.0.0-beta02/core-1.0.0-beta02.pom b/common/androidx-test/androidx/test/core/1.0.0/core-1.0.0.pom
similarity index 94%
rename from common/androidx-test/androidx/test/core/1.0.0-beta02/core-1.0.0-beta02.pom
rename to common/androidx-test/androidx/test/core/1.0.0/core-1.0.0.pom
index f218bf4..a1f217d 100644
--- a/common/androidx-test/androidx/test/core/1.0.0-beta02/core-1.0.0-beta02.pom
+++ b/common/androidx-test/androidx/test/core/1.0.0/core-1.0.0.pom
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>androidx.test</groupId>
<artifactId>core</artifactId>
- <version>1.0.0-beta02</version>
+ <version>1.0.0</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.0-beta02</version>
+ <version>1.1.0</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/common/androidx-test/androidx/test/espresso/espresso-contrib/3.1.0-beta02/espresso-contrib-3.1.0-beta02.aar b/common/androidx-test/androidx/test/espresso/espresso-contrib/3.1.0/espresso-contrib-3.1.0.aar
similarity index 67%
rename from common/androidx-test/androidx/test/espresso/espresso-contrib/3.1.0-beta02/espresso-contrib-3.1.0-beta02.aar
rename to common/androidx-test/androidx/test/espresso/espresso-contrib/3.1.0/espresso-contrib-3.1.0.aar
index 7dbe6f5..7631599 100644
--- a/common/androidx-test/androidx/test/espresso/espresso-contrib/3.1.0-beta02/espresso-contrib-3.1.0-beta02.aar
+++ b/common/androidx-test/androidx/test/espresso/espresso-contrib/3.1.0/espresso-contrib-3.1.0.aar
Binary files differ
diff --git a/common/androidx-test/androidx/test/espresso/espresso-contrib/3.1.0-beta02/espresso-contrib-3.1.0-beta02.pom b/common/androidx-test/androidx/test/espresso/espresso-contrib/3.1.0/espresso-contrib-3.1.0.pom
similarity index 94%
rename from common/androidx-test/androidx/test/espresso/espresso-contrib/3.1.0-beta02/espresso-contrib-3.1.0-beta02.pom
rename to common/androidx-test/androidx/test/espresso/espresso-contrib/3.1.0/espresso-contrib-3.1.0.pom
index 3fb2eb9..698d1a9 100644
--- a/common/androidx-test/androidx/test/espresso/espresso-contrib/3.1.0-beta02/espresso-contrib-3.1.0-beta02.pom
+++ b/common/androidx-test/androidx/test/espresso/espresso-contrib/3.1.0/espresso-contrib-3.1.0.pom
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>androidx.test.espresso</groupId>
<artifactId>espresso-contrib</artifactId>
- <version>3.1.0-beta02</version>
+ <version>3.1.0</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.0-beta02</version>
+ <version>3.1.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>androidx.test.espresso</groupId>
<artifactId>espresso-idling-resource</artifactId>
- <version>3.1.0-beta02</version>
+ <version>3.1.0</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/common/androidx-test/androidx/test/espresso/espresso-core/3.1.0-beta02/espresso-core-3.1.0-beta02.aar b/common/androidx-test/androidx/test/espresso/espresso-core/3.1.0-beta02/espresso-core-3.1.0-beta02.aar
deleted file mode 100644
index 3f60cfa..0000000
--- a/common/androidx-test/androidx/test/espresso/espresso-core/3.1.0-beta02/espresso-core-3.1.0-beta02.aar
+++ /dev/null
Binary files differ
diff --git a/common/androidx-test/androidx/test/espresso/espresso-core/3.1.0/espresso-core-3.1.0.aar b/common/androidx-test/androidx/test/espresso/espresso-core/3.1.0/espresso-core-3.1.0.aar
new file mode 100644
index 0000000..8ca9d06
--- /dev/null
+++ b/common/androidx-test/androidx/test/espresso/espresso-core/3.1.0/espresso-core-3.1.0.aar
Binary files differ
diff --git a/common/androidx-test/androidx/test/espresso/espresso-core/3.1.0-beta02/espresso-core-3.1.0-beta02.pom b/common/androidx-test/androidx/test/espresso/espresso-core/3.1.0/espresso-core-3.1.0.pom
similarity index 94%
rename from common/androidx-test/androidx/test/espresso/espresso-core/3.1.0-beta02/espresso-core-3.1.0-beta02.pom
rename to common/androidx-test/androidx/test/espresso/espresso-core/3.1.0/espresso-core-3.1.0.pom
index 8fdfa82..b818917 100644
--- a/common/androidx-test/androidx/test/espresso/espresso-core/3.1.0-beta02/espresso-core-3.1.0-beta02.pom
+++ b/common/androidx-test/androidx/test/espresso/espresso-core/3.1.0/espresso-core-3.1.0.pom
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>androidx.test.espresso</groupId>
<artifactId>espresso-core</artifactId>
- <version>3.1.0-beta02</version>
+ <version>3.1.0</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.0-beta02</version>
+ <version>1.1.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>androidx.test.espresso</groupId>
<artifactId>espresso-idling-resource</artifactId>
- <version>3.1.0-beta02</version>
+ <version>3.1.0</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.1.0-beta02/espresso-idling-resource-3.1.0-beta02.aar b/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.1.0-beta02/espresso-idling-resource-3.1.0-beta02.aar
deleted file mode 100644
index fc609e2..0000000
--- a/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.1.0-beta02/espresso-idling-resource-3.1.0-beta02.aar
+++ /dev/null
Binary files differ
diff --git a/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.1.0/espresso-idling-resource-3.1.0.aar b/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.1.0/espresso-idling-resource-3.1.0.aar
new file mode 100644
index 0000000..8fd7247
--- /dev/null
+++ b/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.1.0/espresso-idling-resource-3.1.0.aar
Binary files differ
diff --git a/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.1.0-beta02/espresso-idling-resource-3.1.0-beta02.pom b/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.1.0/espresso-idling-resource-3.1.0.pom
similarity index 96%
rename from common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.1.0-beta02/espresso-idling-resource-3.1.0-beta02.pom
rename to common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.1.0/espresso-idling-resource-3.1.0.pom
index a685e10..f5cd629 100644
--- a/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.1.0-beta02/espresso-idling-resource-3.1.0-beta02.pom
+++ b/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.1.0/espresso-idling-resource-3.1.0.pom
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>androidx.test.espresso</groupId>
<artifactId>espresso-idling-resource</artifactId>
- <version>3.1.0-beta02</version>
+ <version>3.1.0</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.0-beta02/espresso-intents-3.1.0-beta02.aar b/common/androidx-test/androidx/test/espresso/espresso-intents/3.1.0-beta02/espresso-intents-3.1.0-beta02.aar
deleted file mode 100644
index 71dc1a7..0000000
--- a/common/androidx-test/androidx/test/espresso/espresso-intents/3.1.0-beta02/espresso-intents-3.1.0-beta02.aar
+++ /dev/null
Binary files differ
diff --git a/common/androidx-test/androidx/test/espresso/espresso-intents/3.1.0/espresso-intents-3.1.0.aar b/common/androidx-test/androidx/test/espresso/espresso-intents/3.1.0/espresso-intents-3.1.0.aar
new file mode 100644
index 0000000..a674f10
--- /dev/null
+++ b/common/androidx-test/androidx/test/espresso/espresso-intents/3.1.0/espresso-intents-3.1.0.aar
Binary files differ
diff --git a/common/androidx-test/androidx/test/espresso/espresso-intents/3.1.0-beta02/espresso-intents-3.1.0-beta02.pom b/common/androidx-test/androidx/test/espresso/espresso-intents/3.1.0/espresso-intents-3.1.0.pom
similarity index 91%
rename from common/androidx-test/androidx/test/espresso/espresso-intents/3.1.0-beta02/espresso-intents-3.1.0-beta02.pom
rename to common/androidx-test/androidx/test/espresso/espresso-intents/3.1.0/espresso-intents-3.1.0.pom
index 04770b4..2b37ee6 100644
--- a/common/androidx-test/androidx/test/espresso/espresso-intents/3.1.0-beta02/espresso-intents-3.1.0-beta02.pom
+++ b/common/androidx-test/androidx/test/espresso/espresso-intents/3.1.0/espresso-intents-3.1.0.pom
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>androidx.test.espresso</groupId>
<artifactId>espresso-intents</artifactId>
- <version>3.1.0-beta02</version>
+ <version>3.1.0</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.0-beta02</version>
+ <version>3.1.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>androidx.test</groupId>
<artifactId>rules</artifactId>
- <version>1.1.0-beta02</version>
+ <version>1.1.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
diff --git a/common/androidx-test/androidx/test/espresso/espresso-web/3.1.0-beta02/espresso-web-3.1.0-beta02.aar b/common/androidx-test/androidx/test/espresso/espresso-web/3.1.0-beta02/espresso-web-3.1.0-beta02.aar
deleted file mode 100644
index ab36c4d..0000000
--- a/common/androidx-test/androidx/test/espresso/espresso-web/3.1.0-beta02/espresso-web-3.1.0-beta02.aar
+++ /dev/null
Binary files differ
diff --git a/common/androidx-test/androidx/test/espresso/espresso-web/3.1.0/espresso-web-3.1.0.aar b/common/androidx-test/androidx/test/espresso/espresso-web/3.1.0/espresso-web-3.1.0.aar
new file mode 100644
index 0000000..e3b5e3e
--- /dev/null
+++ b/common/androidx-test/androidx/test/espresso/espresso-web/3.1.0/espresso-web-3.1.0.aar
Binary files differ
diff --git a/common/androidx-test/androidx/test/espresso/espresso-web/3.1.0-beta02/espresso-web-3.1.0-beta02.pom b/common/androidx-test/androidx/test/espresso/espresso-web/3.1.0/espresso-web-3.1.0.pom
similarity index 94%
rename from common/androidx-test/androidx/test/espresso/espresso-web/3.1.0-beta02/espresso-web-3.1.0-beta02.pom
rename to common/androidx-test/androidx/test/espresso/espresso-web/3.1.0/espresso-web-3.1.0.pom
index 4d2a467..7a373f1 100644
--- a/common/androidx-test/androidx/test/espresso/espresso-web/3.1.0-beta02/espresso-web-3.1.0-beta02.pom
+++ b/common/androidx-test/androidx/test/espresso/espresso-web/3.1.0/espresso-web-3.1.0.pom
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>androidx.test.espresso</groupId>
<artifactId>espresso-web</artifactId>
- <version>3.1.0-beta02</version>
+ <version>3.1.0</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.0-beta02</version>
+ <version>3.1.0</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/common/androidx-test/androidx/test/ext/junit/1.0.0-beta02/junit-1.0.0-beta02.aar b/common/androidx-test/androidx/test/ext/junit/1.0.0-beta02/junit-1.0.0-beta02.aar
deleted file mode 100644
index 7d2a570..0000000
--- a/common/androidx-test/androidx/test/ext/junit/1.0.0-beta02/junit-1.0.0-beta02.aar
+++ /dev/null
Binary files differ
diff --git a/common/androidx-test/androidx/test/ext/junit/1.0.0/junit-1.0.0.aar b/common/androidx-test/androidx/test/ext/junit/1.0.0/junit-1.0.0.aar
new file mode 100644
index 0000000..06417c5
--- /dev/null
+++ b/common/androidx-test/androidx/test/ext/junit/1.0.0/junit-1.0.0.aar
Binary files differ
diff --git a/common/androidx-test/androidx/test/ext/junit/1.0.0-beta02/junit-1.0.0-beta02.pom b/common/androidx-test/androidx/test/ext/junit/1.0.0/junit-1.0.0.pom
similarity index 96%
rename from common/androidx-test/androidx/test/ext/junit/1.0.0-beta02/junit-1.0.0-beta02.pom
rename to common/androidx-test/androidx/test/ext/junit/1.0.0/junit-1.0.0.pom
index 3e11a99..e7d52f4 100644
--- a/common/androidx-test/androidx/test/ext/junit/1.0.0-beta02/junit-1.0.0-beta02.pom
+++ b/common/androidx-test/androidx/test/ext/junit/1.0.0/junit-1.0.0.pom
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>androidx.test.ext</groupId>
<artifactId>junit</artifactId>
- <version>1.0.0-beta02</version>
+ <version>1.0.0</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/ext/truth/1.0.0-beta02/truth-1.0.0-beta02.aar b/common/androidx-test/androidx/test/ext/truth/1.0.0/truth-1.0.0.aar
similarity index 98%
rename from common/androidx-test/androidx/test/ext/truth/1.0.0-beta02/truth-1.0.0-beta02.aar
rename to common/androidx-test/androidx/test/ext/truth/1.0.0/truth-1.0.0.aar
index f552f87..4f9746b 100644
--- a/common/androidx-test/androidx/test/ext/truth/1.0.0-beta02/truth-1.0.0-beta02.aar
+++ b/common/androidx-test/androidx/test/ext/truth/1.0.0/truth-1.0.0.aar
Binary files differ
diff --git a/common/androidx-test/androidx/test/ext/truth/1.0.0-beta02/truth-1.0.0-beta02.pom b/common/androidx-test/androidx/test/ext/truth/1.0.0/truth-1.0.0.pom
similarity index 95%
rename from common/androidx-test/androidx/test/ext/truth/1.0.0-beta02/truth-1.0.0-beta02.pom
rename to common/androidx-test/androidx/test/ext/truth/1.0.0/truth-1.0.0.pom
index b03dd3a..d5ec214 100644
--- a/common/androidx-test/androidx/test/ext/truth/1.0.0-beta02/truth-1.0.0-beta02.pom
+++ b/common/androidx-test/androidx/test/ext/truth/1.0.0/truth-1.0.0.pom
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>androidx.test.ext</groupId>
<artifactId>truth</artifactId>
- <version>1.0.0-beta02</version>
+ <version>1.0.0</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.0.0-beta02</version>
+ <version>1.0.0</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/common/androidx-test/androidx/test/monitor/1.1.0-beta02/monitor-1.1.0-beta02.aar b/common/androidx-test/androidx/test/monitor/1.1.0-beta02/monitor-1.1.0-beta02.aar
deleted file mode 100644
index 78b0426..0000000
--- a/common/androidx-test/androidx/test/monitor/1.1.0-beta02/monitor-1.1.0-beta02.aar
+++ /dev/null
Binary files differ
diff --git a/common/androidx-test/androidx/test/monitor/1.1.0/monitor-1.1.0.aar b/common/androidx-test/androidx/test/monitor/1.1.0/monitor-1.1.0.aar
new file mode 100644
index 0000000..30585bb
--- /dev/null
+++ b/common/androidx-test/androidx/test/monitor/1.1.0/monitor-1.1.0.aar
Binary files differ
diff --git a/common/androidx-test/androidx/test/monitor/1.1.0-beta02/monitor-1.1.0-beta02.pom b/common/androidx-test/androidx/test/monitor/1.1.0/monitor-1.1.0.pom
similarity index 96%
rename from common/androidx-test/androidx/test/monitor/1.1.0-beta02/monitor-1.1.0-beta02.pom
rename to common/androidx-test/androidx/test/monitor/1.1.0/monitor-1.1.0.pom
index 88adbf7..631a4ac 100644
--- a/common/androidx-test/androidx/test/monitor/1.1.0-beta02/monitor-1.1.0-beta02.pom
+++ b/common/androidx-test/androidx/test/monitor/1.1.0/monitor-1.1.0.pom
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>androidx.test</groupId>
<artifactId>monitor</artifactId>
- <version>1.1.0-beta02</version>
+ <version>1.1.0</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.0-beta02/rules-1.1.0-beta02.aar b/common/androidx-test/androidx/test/rules/1.1.0-beta02/rules-1.1.0-beta02.aar
deleted file mode 100644
index 1f95d03..0000000
--- a/common/androidx-test/androidx/test/rules/1.1.0-beta02/rules-1.1.0-beta02.aar
+++ /dev/null
Binary files differ
diff --git a/common/androidx-test/androidx/test/rules/1.1.0/rules-1.1.0.aar b/common/androidx-test/androidx/test/rules/1.1.0/rules-1.1.0.aar
new file mode 100644
index 0000000..96d4f13
--- /dev/null
+++ b/common/androidx-test/androidx/test/rules/1.1.0/rules-1.1.0.aar
Binary files differ
diff --git a/common/androidx-test/androidx/test/rules/1.1.0-beta02/rules-1.1.0-beta02.pom b/common/androidx-test/androidx/test/rules/1.1.0/rules-1.1.0.pom
similarity index 93%
rename from common/androidx-test/androidx/test/rules/1.1.0-beta02/rules-1.1.0-beta02.pom
rename to common/androidx-test/androidx/test/rules/1.1.0/rules-1.1.0.pom
index 46fb504..e958883 100644
--- a/common/androidx-test/androidx/test/rules/1.1.0-beta02/rules-1.1.0-beta02.pom
+++ b/common/androidx-test/androidx/test/rules/1.1.0/rules-1.1.0.pom
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>androidx.test</groupId>
<artifactId>rules</artifactId>
- <version>1.1.0-beta02</version>
+ <version>1.1.0</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.0-beta02</version>
+ <version>1.1.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
diff --git a/common/androidx-test/androidx/test/runner/1.1.0-beta02/runner-1.1.0-beta02.aar b/common/androidx-test/androidx/test/runner/1.1.0-beta02/runner-1.1.0-beta02.aar
deleted file mode 100644
index eaaa7e2..0000000
--- a/common/androidx-test/androidx/test/runner/1.1.0-beta02/runner-1.1.0-beta02.aar
+++ /dev/null
Binary files differ
diff --git a/common/androidx-test/androidx/test/runner/1.1.0/runner-1.1.0.aar b/common/androidx-test/androidx/test/runner/1.1.0/runner-1.1.0.aar
new file mode 100644
index 0000000..a0ff763
--- /dev/null
+++ b/common/androidx-test/androidx/test/runner/1.1.0/runner-1.1.0.aar
Binary files differ
diff --git a/common/androidx-test/androidx/test/runner/1.1.0-beta02/runner-1.1.0-beta02.pom b/common/androidx-test/androidx/test/runner/1.1.0/runner-1.1.0.pom
similarity index 95%
rename from common/androidx-test/androidx/test/runner/1.1.0-beta02/runner-1.1.0-beta02.pom
rename to common/androidx-test/androidx/test/runner/1.1.0/runner-1.1.0.pom
index efd4641..b5f418d 100644
--- a/common/androidx-test/androidx/test/runner/1.1.0-beta02/runner-1.1.0-beta02.pom
+++ b/common/androidx-test/androidx/test/runner/1.1.0/runner-1.1.0.pom
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>androidx.test</groupId>
<artifactId>runner</artifactId>
- <version>1.1.0-beta02</version>
+ <version>1.1.0</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.0-beta02</version>
+ <version>1.1.0</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/common/androidx-test/update-from-gmaven.py b/common/androidx-test/update-from-gmaven.py
index 6621669..bc66629 100755
--- a/common/androidx-test/update-from-gmaven.py
+++ b/common/androidx-test/update-from-gmaven.py
@@ -18,12 +18,12 @@
import subprocess
import sys
-runnerVersion="1.1.0-beta02"
-rulesVersion="1.1.0-beta02"
-espressoVersion="3.1.0-beta02"
-coreVersion="1.0.0-beta02"
-extJUnitVersion="1.0.0-beta02"
-extTruthVersion="1.0.0-beta02"
+runnerVersion="1.1.0"
+rulesVersion="1.1.0"
+espressoVersion="3.1.0"
+coreVersion="1.0.0"
+extJUnitVersion="1.0.0"
+extTruthVersion="1.0.0"
mavenToBpPatternMap = {
"androidx.test:" : "androidx.test.",
@@ -79,7 +79,7 @@
manifestPath = manifestPath.replace(searchPattern, mavenToBpPatternMap[searchPattern])
return "manifests/%s" % manifestPath
-prebuiltDir = os.path.join(getAndroidRoot(), "prebuilts/misc/androidx-test")
+prebuiltDir = os.path.join(getAndroidRoot(), "prebuilts/misc/common/androidx-test")
chdir(prebuiltDir)
cmd("rm -rf androidx/test")
