Merge "Update libufdt prebuilt mkdtimg"
diff --git a/common/androidx-test/Android.bp b/common/androidx-test/Android.bp
index 93e369c..a12c349 100644
--- a/common/androidx-test/Android.bp
+++ b/common/androidx-test/Android.bp
@@ -1,9 +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.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.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 .
android_library_import {
name: "androidx.test.core-nodeps",
- aars: ["androidx/test/core/1.1.0-alpha01/core-1.1.0-alpha01.aar"],
+ aars: ["androidx/test/core/1.1.0/core-1.1.0.aar"],
sdk_version: "current",
min_sdk_version: "14",
static_libs: [
@@ -27,7 +27,7 @@
android_library_import {
name: "androidx.test.espresso.contrib-nodeps",
- aars: ["androidx/test/espresso/espresso-contrib/3.1.1-alpha01/espresso-contrib-3.1.1-alpha01.aar"],
+ aars: ["androidx/test/espresso/espresso-contrib/3.1.1/espresso-contrib-3.1.1.aar"],
sdk_version: "current",
min_sdk_version: "14",
static_libs: [
@@ -58,7 +58,7 @@
android_library_import {
name: "androidx.test.espresso.core-nodeps",
- aars: ["androidx/test/espresso/espresso-core/3.1.1-alpha01/espresso-core-3.1.1-alpha01.aar"],
+ aars: ["androidx/test/espresso/espresso-core/3.1.1/espresso-core-3.1.1.aar"],
sdk_version: "current",
min_sdk_version: "14",
static_libs: [
@@ -87,7 +87,7 @@
android_library_import {
name: "androidx.test.espresso.idling-resource-nodeps",
- aars: ["androidx/test/espresso/espresso-idling-resource/3.1.1-alpha01/espresso-idling-resource-3.1.1-alpha01.aar"],
+ aars: ["androidx/test/espresso/espresso-idling-resource/3.1.1/espresso-idling-resource-3.1.1.aar"],
sdk_version: "current",
min_sdk_version: "14",
static_libs: [
@@ -107,11 +107,12 @@
android_library_import {
name: "androidx.test.espresso.intents-nodeps",
- aars: ["androidx/test/espresso/espresso-intents/3.1.1-alpha01/espresso-intents-3.1.1-alpha01.aar"],
+ aars: ["androidx/test/espresso/espresso-intents/3.1.1/espresso-intents-3.1.1.aar"],
sdk_version: "current",
min_sdk_version: "14",
static_libs: [
"androidx.test.espresso.core",
+ "androidx.test.core",
"androidx.test.rules",
],
}
@@ -124,6 +125,7 @@
static_libs: [
"androidx.test.espresso.intents-nodeps",
"androidx.test.espresso.core",
+ "androidx.test.core",
"androidx.test.rules",
],
java_version: "1.7",
@@ -131,7 +133,7 @@
android_library_import {
name: "androidx.test.espresso.web-nodeps",
- aars: ["androidx/test/espresso/espresso-web/3.1.1-alpha01/espresso-web-3.1.1-alpha01.aar"],
+ aars: ["androidx/test/espresso/espresso-web/3.1.1/espresso-web-3.1.1.aar"],
sdk_version: "current",
min_sdk_version: "14",
static_libs: [
@@ -155,7 +157,7 @@
android_library_import {
name: "androidx.test.ext.junit-nodeps",
- aars: ["androidx/test/ext/junit/1.1.0-alpha01/junit-1.1.0-alpha01.aar"],
+ aars: ["androidx/test/ext/junit/1.1.0/junit-1.1.0.aar"],
sdk_version: "current",
min_sdk_version: "14",
static_libs: [
@@ -181,7 +183,7 @@
android_library_import {
name: "androidx.test.ext.truth-nodeps",
- aars: ["androidx/test/ext/truth/1.1.0-alpha01/truth-1.1.0-alpha01.aar"],
+ aars: ["androidx/test/ext/truth/1.1.0/truth-1.1.0.aar"],
sdk_version: "current",
min_sdk_version: "14",
static_libs: [
@@ -206,7 +208,7 @@
android_library_import {
name: "androidx.test.monitor-nodeps",
- aars: ["androidx/test/monitor/1.1.1-alpha01/monitor-1.1.1-alpha01.aar"],
+ aars: ["androidx/test/monitor/1.1.1/monitor-1.1.1.aar"],
sdk_version: "current",
min_sdk_version: "14",
static_libs: [
@@ -227,7 +229,7 @@
android_library_import {
name: "androidx.test.rules-nodeps",
- aars: ["androidx/test/rules/1.1.1-alpha01/rules-1.1.1-alpha01.aar"],
+ aars: ["androidx/test/rules/1.1.1/rules-1.1.1.aar"],
sdk_version: "current",
min_sdk_version: "14",
static_libs: [
@@ -249,7 +251,7 @@
android_library_import {
name: "androidx.test.runner-nodeps",
- aars: ["androidx/test/runner/1.1.1-alpha01/runner-1.1.1-alpha01.aar"],
+ aars: ["androidx/test/runner/1.1.1/runner-1.1.1.aar"],
sdk_version: "current",
min_sdk_version: "14",
static_libs: [
diff --git a/common/androidx-test/androidx/test/core/1.1.0-alpha01/core-1.1.0-alpha01.aar b/common/androidx-test/androidx/test/core/1.1.0-alpha01/core-1.1.0-alpha01.aar
deleted file mode 100644
index a6fd69c..0000000
--- a/common/androidx-test/androidx/test/core/1.1.0-alpha01/core-1.1.0-alpha01.aar
+++ /dev/null
Binary files differ
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.0/core-1.1.0.aar
new file mode 100644
index 0000000..ef59bb1
--- /dev/null
+++ b/common/androidx-test/androidx/test/core/1.1.0/core-1.1.0.aar
Binary files differ
diff --git a/common/androidx-test/androidx/test/core/1.1.0-alpha01/core-1.1.0-alpha01.pom b/common/androidx-test/androidx/test/core/1.1.0/core-1.1.0.pom
similarity index 94%
rename from common/androidx-test/androidx/test/core/1.1.0-alpha01/core-1.1.0-alpha01.pom
rename to common/androidx-test/androidx/test/core/1.1.0/core-1.1.0.pom
index 9934e54..b727375 100644
--- a/common/androidx-test/androidx/test/core/1.1.0-alpha01/core-1.1.0-alpha01.pom
+++ b/common/androidx-test/androidx/test/core/1.1.0/core-1.1.0.pom
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>androidx.test</groupId>
<artifactId>core</artifactId>
- <version>1.1.0-alpha01</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.1-alpha01</version>
+ <version>1.1.1</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/common/androidx-test/androidx/test/espresso/espresso-contrib/3.1.1-alpha01/espresso-contrib-3.1.1-alpha01.aar b/common/androidx-test/androidx/test/espresso/espresso-contrib/3.1.1/espresso-contrib-3.1.1.aar
similarity index 67%
rename from common/androidx-test/androidx/test/espresso/espresso-contrib/3.1.1-alpha01/espresso-contrib-3.1.1-alpha01.aar
rename to common/androidx-test/androidx/test/espresso/espresso-contrib/3.1.1/espresso-contrib-3.1.1.aar
index a0afb76..26fba7c 100644
--- a/common/androidx-test/androidx/test/espresso/espresso-contrib/3.1.1-alpha01/espresso-contrib-3.1.1-alpha01.aar
+++ b/common/androidx-test/androidx/test/espresso/espresso-contrib/3.1.1/espresso-contrib-3.1.1.aar
Binary files differ
diff --git a/common/androidx-test/androidx/test/espresso/espresso-contrib/3.1.1-alpha01/espresso-contrib-3.1.1-alpha01.pom b/common/androidx-test/androidx/test/espresso/espresso-contrib/3.1.1/espresso-contrib-3.1.1.pom
similarity index 95%
rename from common/androidx-test/androidx/test/espresso/espresso-contrib/3.1.1-alpha01/espresso-contrib-3.1.1-alpha01.pom
rename to common/androidx-test/androidx/test/espresso/espresso-contrib/3.1.1/espresso-contrib-3.1.1.pom
index b8a07bb..1547954 100644
--- a/common/androidx-test/androidx/test/espresso/espresso-contrib/3.1.1-alpha01/espresso-contrib-3.1.1-alpha01.pom
+++ b/common/androidx-test/androidx/test/espresso/espresso-contrib/3.1.1/espresso-contrib-3.1.1.pom
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>androidx.test.espresso</groupId>
<artifactId>espresso-contrib</artifactId>
- <version>3.1.1-alpha01</version>
+ <version>3.1.1</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-alpha01</version>
+ <version>3.1.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>androidx.test.espresso</groupId>
<artifactId>espresso-idling-resource</artifactId>
- <version>3.1.1-alpha01</version>
+ <version>3.1.1</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/common/androidx-test/androidx/test/espresso/espresso-core/3.1.1-alpha01/espresso-core-3.1.1-alpha01.aar b/common/androidx-test/androidx/test/espresso/espresso-core/3.1.1-alpha01/espresso-core-3.1.1-alpha01.aar
deleted file mode 100644
index 26439d1..0000000
--- a/common/androidx-test/androidx/test/espresso/espresso-core/3.1.1-alpha01/espresso-core-3.1.1-alpha01.aar
+++ /dev/null
Binary files differ
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
new file mode 100644
index 0000000..8b6c7d4
--- /dev/null
+++ b/common/androidx-test/androidx/test/espresso/espresso-core/3.1.1/espresso-core-3.1.1.aar
Binary files differ
diff --git a/common/androidx-test/androidx/test/espresso/espresso-core/3.1.1-alpha01/espresso-core-3.1.1-alpha01.pom b/common/androidx-test/androidx/test/espresso/espresso-core/3.1.1/espresso-core-3.1.1.pom
similarity index 94%
rename from common/androidx-test/androidx/test/espresso/espresso-core/3.1.1-alpha01/espresso-core-3.1.1-alpha01.pom
rename to common/androidx-test/androidx/test/espresso/espresso-core/3.1.1/espresso-core-3.1.1.pom
index 4d06e8f..6eeb82c 100644
--- a/common/androidx-test/androidx/test/espresso/espresso-core/3.1.1-alpha01/espresso-core-3.1.1-alpha01.pom
+++ b/common/androidx-test/androidx/test/espresso/espresso-core/3.1.1/espresso-core-3.1.1.pom
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>androidx.test.espresso</groupId>
<artifactId>espresso-core</artifactId>
- <version>3.1.1-alpha01</version>
+ <version>3.1.1</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-alpha01</version>
+ <version>1.1.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>androidx.test.espresso</groupId>
<artifactId>espresso-idling-resource</artifactId>
- <version>3.1.1-alpha01</version>
+ <version>3.1.1</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.1.1-alpha01/espresso-idling-resource-3.1.1-alpha01.aar b/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.1.1-alpha01/espresso-idling-resource-3.1.1-alpha01.aar
deleted file mode 100644
index 0802af8..0000000
--- a/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.1.1-alpha01/espresso-idling-resource-3.1.1-alpha01.aar
+++ /dev/null
Binary files differ
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
new file mode 100644
index 0000000..df9c6ac
--- /dev/null
+++ b/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.1.1/espresso-idling-resource-3.1.1.aar
Binary files differ
diff --git a/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.1.1-alpha01/espresso-idling-resource-3.1.1-alpha01.pom b/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.1.1/espresso-idling-resource-3.1.1.pom
similarity index 96%
rename from common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.1.1-alpha01/espresso-idling-resource-3.1.1-alpha01.pom
rename to common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.1.1/espresso-idling-resource-3.1.1.pom
index aeb29df..ba25667 100644
--- a/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.1.1-alpha01/espresso-idling-resource-3.1.1-alpha01.pom
+++ b/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.1.1/espresso-idling-resource-3.1.1.pom
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>androidx.test.espresso</groupId>
<artifactId>espresso-idling-resource</artifactId>
- <version>3.1.1-alpha01</version>
+ <version>3.1.1</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-alpha01/espresso-intents-3.1.1-alpha01.aar b/common/androidx-test/androidx/test/espresso/espresso-intents/3.1.1-alpha01/espresso-intents-3.1.1-alpha01.aar
deleted file mode 100644
index bb22db0..0000000
--- a/common/androidx-test/androidx/test/espresso/espresso-intents/3.1.1-alpha01/espresso-intents-3.1.1-alpha01.aar
+++ /dev/null
Binary files differ
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
new file mode 100644
index 0000000..3a200d0
--- /dev/null
+++ b/common/androidx-test/androidx/test/espresso/espresso-intents/3.1.1/espresso-intents-3.1.1.aar
Binary files differ
diff --git a/common/androidx-test/androidx/test/espresso/espresso-intents/3.1.1-alpha01/espresso-intents-3.1.1-alpha01.pom b/common/androidx-test/androidx/test/espresso/espresso-intents/3.1.1/espresso-intents-3.1.1.pom
similarity index 83%
rename from common/androidx-test/androidx/test/espresso/espresso-intents/3.1.1-alpha01/espresso-intents-3.1.1-alpha01.pom
rename to common/androidx-test/androidx/test/espresso/espresso-intents/3.1.1/espresso-intents-3.1.1.pom
index 396a30b..e486a4b 100644
--- a/common/androidx-test/androidx/test/espresso/espresso-intents/3.1.1-alpha01/espresso-intents-3.1.1-alpha01.pom
+++ b/common/androidx-test/androidx/test/espresso/espresso-intents/3.1.1/espresso-intents-3.1.1.pom
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>androidx.test.espresso</groupId>
<artifactId>espresso-intents</artifactId>
- <version>3.1.1-alpha01</version>
+ <version>3.1.1</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,19 @@
<dependency>
<groupId>androidx.test.espresso</groupId>
<artifactId>espresso-core</artifactId>
- <version>3.1.1-alpha01</version>
+ <version>3.1.1</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>androidx.test</groupId>
+ <artifactId>core</artifactId>
+ <version>1.1.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>androidx.test</groupId>
<artifactId>rules</artifactId>
- <version>1.1.1-alpha01</version>
+ <version>1.1.1</version>
<scope>compile</scope>
</dependency>
</dependencies>
diff --git a/common/androidx-test/androidx/test/espresso/espresso-web/3.1.1-alpha01/espresso-web-3.1.1-alpha01.aar b/common/androidx-test/androidx/test/espresso/espresso-web/3.1.1-alpha01/espresso-web-3.1.1-alpha01.aar
deleted file mode 100644
index 7d313a2..0000000
--- a/common/androidx-test/androidx/test/espresso/espresso-web/3.1.1-alpha01/espresso-web-3.1.1-alpha01.aar
+++ /dev/null
Binary files differ
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
new file mode 100644
index 0000000..b20905e
--- /dev/null
+++ b/common/androidx-test/androidx/test/espresso/espresso-web/3.1.1/espresso-web-3.1.1.aar
Binary files differ
diff --git a/common/androidx-test/androidx/test/espresso/espresso-web/3.1.1-alpha01/espresso-web-3.1.1-alpha01.pom b/common/androidx-test/androidx/test/espresso/espresso-web/3.1.1/espresso-web-3.1.1.pom
similarity index 94%
rename from common/androidx-test/androidx/test/espresso/espresso-web/3.1.1-alpha01/espresso-web-3.1.1-alpha01.pom
rename to common/androidx-test/androidx/test/espresso/espresso-web/3.1.1/espresso-web-3.1.1.pom
index cc9332d..334f2d8 100644
--- a/common/androidx-test/androidx/test/espresso/espresso-web/3.1.1-alpha01/espresso-web-3.1.1-alpha01.pom
+++ b/common/androidx-test/androidx/test/espresso/espresso-web/3.1.1/espresso-web-3.1.1.pom
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>androidx.test.espresso</groupId>
<artifactId>espresso-web</artifactId>
- <version>3.1.1-alpha01</version>
+ <version>3.1.1</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-alpha01</version>
+ <version>3.1.1</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/common/androidx-test/androidx/test/ext/junit/1.1.0-alpha01/junit-1.1.0-alpha01.aar b/common/androidx-test/androidx/test/ext/junit/1.1.0-alpha01/junit-1.1.0-alpha01.aar
deleted file mode 100644
index b77628e..0000000
--- a/common/androidx-test/androidx/test/ext/junit/1.1.0-alpha01/junit-1.1.0-alpha01.aar
+++ /dev/null
Binary files differ
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
new file mode 100644
index 0000000..2ac9ddf
--- /dev/null
+++ b/common/androidx-test/androidx/test/ext/junit/1.1.0/junit-1.1.0.aar
Binary files differ
diff --git a/common/androidx-test/androidx/test/ext/junit/1.1.0-alpha01/junit-1.1.0-alpha01.pom b/common/androidx-test/androidx/test/ext/junit/1.1.0/junit-1.1.0.pom
similarity index 92%
rename from common/androidx-test/androidx/test/ext/junit/1.1.0-alpha01/junit-1.1.0-alpha01.pom
rename to common/androidx-test/androidx/test/ext/junit/1.1.0/junit-1.1.0.pom
index bcc7995..795d31a 100644
--- a/common/androidx-test/androidx/test/ext/junit/1.1.0-alpha01/junit-1.1.0-alpha01.pom
+++ b/common/androidx-test/androidx/test/ext/junit/1.1.0/junit-1.1.0.pom
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>androidx.test.ext</groupId>
<artifactId>junit</artifactId>
- <version>1.1.0-alpha01</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,13 +33,13 @@
<dependency>
<groupId>androidx.test</groupId>
<artifactId>core</artifactId>
- <version>1.1.0-alpha01</version>
+ <version>1.1.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>androidx.test</groupId>
<artifactId>monitor</artifactId>
- <version>1.1.1-alpha01</version>
+ <version>1.1.1</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/common/androidx-test/androidx/test/ext/truth/1.1.0-alpha01/truth-1.1.0-alpha01.aar b/common/androidx-test/androidx/test/ext/truth/1.1.0-alpha01/truth-1.1.0-alpha01.aar
deleted file mode 100644
index f896715..0000000
--- a/common/androidx-test/androidx/test/ext/truth/1.1.0-alpha01/truth-1.1.0-alpha01.aar
+++ /dev/null
Binary files differ
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
new file mode 100644
index 0000000..bf92353
--- /dev/null
+++ b/common/androidx-test/androidx/test/ext/truth/1.1.0/truth-1.1.0.aar
Binary files differ
diff --git a/common/androidx-test/androidx/test/ext/truth/1.1.0-alpha01/truth-1.1.0-alpha01.pom b/common/androidx-test/androidx/test/ext/truth/1.1.0/truth-1.1.0.pom
similarity index 95%
rename from common/androidx-test/androidx/test/ext/truth/1.1.0-alpha01/truth-1.1.0-alpha01.pom
rename to common/androidx-test/androidx/test/ext/truth/1.1.0/truth-1.1.0.pom
index 98e6ee7..e14ff16 100644
--- a/common/androidx-test/androidx/test/ext/truth/1.1.0-alpha01/truth-1.1.0-alpha01.pom
+++ b/common/androidx-test/androidx/test/ext/truth/1.1.0/truth-1.1.0.pom
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>androidx.test.ext</groupId>
<artifactId>truth</artifactId>
- <version>1.1.0-alpha01</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>core</artifactId>
- <version>1.1.0-alpha01</version>
+ <version>1.1.0</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/common/androidx-test/androidx/test/monitor/1.1.1-alpha01/monitor-1.1.1-alpha01.aar b/common/androidx-test/androidx/test/monitor/1.1.1/monitor-1.1.1.aar
similarity index 71%
rename from common/androidx-test/androidx/test/monitor/1.1.1-alpha01/monitor-1.1.1-alpha01.aar
rename to common/androidx-test/androidx/test/monitor/1.1.1/monitor-1.1.1.aar
index cd1ba1e..2fe1450 100644
--- a/common/androidx-test/androidx/test/monitor/1.1.1-alpha01/monitor-1.1.1-alpha01.aar
+++ b/common/androidx-test/androidx/test/monitor/1.1.1/monitor-1.1.1.aar
Binary files differ
diff --git a/common/androidx-test/androidx/test/monitor/1.1.1-alpha01/monitor-1.1.1-alpha01.pom b/common/androidx-test/androidx/test/monitor/1.1.1/monitor-1.1.1.pom
similarity index 96%
rename from common/androidx-test/androidx/test/monitor/1.1.1-alpha01/monitor-1.1.1-alpha01.pom
rename to common/androidx-test/androidx/test/monitor/1.1.1/monitor-1.1.1.pom
index 7a778ee..4f1037e 100644
--- a/common/androidx-test/androidx/test/monitor/1.1.1-alpha01/monitor-1.1.1-alpha01.pom
+++ b/common/androidx-test/androidx/test/monitor/1.1.1/monitor-1.1.1.pom
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>androidx.test</groupId>
<artifactId>monitor</artifactId>
- <version>1.1.1-alpha01</version>
+ <version>1.1.1</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-alpha01/rules-1.1.1-alpha01.aar b/common/androidx-test/androidx/test/rules/1.1.1-alpha01/rules-1.1.1-alpha01.aar
deleted file mode 100644
index 37845d4..0000000
--- a/common/androidx-test/androidx/test/rules/1.1.1-alpha01/rules-1.1.1-alpha01.aar
+++ /dev/null
Binary files differ
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.1/rules-1.1.1.aar
new file mode 100644
index 0000000..33079b4
--- /dev/null
+++ b/common/androidx-test/androidx/test/rules/1.1.1/rules-1.1.1.aar
Binary files differ
diff --git a/common/androidx-test/androidx/test/rules/1.1.1-alpha01/rules-1.1.1-alpha01.pom b/common/androidx-test/androidx/test/rules/1.1.1/rules-1.1.1.pom
similarity index 93%
rename from common/androidx-test/androidx/test/rules/1.1.1-alpha01/rules-1.1.1-alpha01.pom
rename to common/androidx-test/androidx/test/rules/1.1.1/rules-1.1.1.pom
index b5a824a..c92edea 100644
--- a/common/androidx-test/androidx/test/rules/1.1.1-alpha01/rules-1.1.1-alpha01.pom
+++ b/common/androidx-test/androidx/test/rules/1.1.1/rules-1.1.1.pom
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>androidx.test</groupId>
<artifactId>rules</artifactId>
- <version>1.1.1-alpha01</version>
+ <version>1.1.1</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-alpha01</version>
+ <version>1.1.1</version>
<scope>compile</scope>
</dependency>
</dependencies>
diff --git a/common/androidx-test/androidx/test/runner/1.1.1-alpha01/runner-1.1.1-alpha01.aar b/common/androidx-test/androidx/test/runner/1.1.1-alpha01/runner-1.1.1-alpha01.aar
deleted file mode 100644
index 25d1c29..0000000
--- a/common/androidx-test/androidx/test/runner/1.1.1-alpha01/runner-1.1.1-alpha01.aar
+++ /dev/null
Binary files differ
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
new file mode 100644
index 0000000..117353d
--- /dev/null
+++ b/common/androidx-test/androidx/test/runner/1.1.1/runner-1.1.1.aar
Binary files differ
diff --git a/common/androidx-test/androidx/test/runner/1.1.1-alpha01/runner-1.1.1-alpha01.pom b/common/androidx-test/androidx/test/runner/1.1.1/runner-1.1.1.pom
similarity index 95%
rename from common/androidx-test/androidx/test/runner/1.1.1-alpha01/runner-1.1.1-alpha01.pom
rename to common/androidx-test/androidx/test/runner/1.1.1/runner-1.1.1.pom
index 8d724f9..5a8f033 100644
--- a/common/androidx-test/androidx/test/runner/1.1.1-alpha01/runner-1.1.1-alpha01.pom
+++ b/common/androidx-test/androidx/test/runner/1.1.1/runner-1.1.1.pom
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>androidx.test</groupId>
<artifactId>runner</artifactId>
- <version>1.1.1-alpha01</version>
+ <version>1.1.1</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-alpha01</version>
+ <version>1.1.1</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 d999353..0fb04cb 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.1-alpha01"
-rulesVersion="1.1.1-alpha01"
-espressoVersion="3.1.1-alpha01"
-coreVersion="1.1.0-alpha01"
-extJUnitVersion="1.1.0-alpha01"
-extTruthVersion="1.1.0-alpha01"
+runnerVersion="1.1.1"
+rulesVersion="1.1.1"
+espressoVersion="3.1.1"
+coreVersion="1.1.0"
+extJUnitVersion="1.1.0"
+extTruthVersion="1.1.0"
mavenToBpPatternMap = {
"androidx.test:" : "androidx.test.",
