Merge "Add prebuilt of libprotobuf-cpp-full-3.9.1."
diff --git a/common/androidx-test/Android.bp b/common/androidx-test/Android.bp
index b912f80..fc95ae4 100644
--- a/common/androidx-test/Android.bp
+++ b/common/androidx-test/Android.bp
@@ -7,7 +7,7 @@
android_library_import {
name: "androidx.test.annotation-nodeps",
- aars: ["androidx/test/annotation/1.0.1-rc01/annotation-1.0.1-rc01.aar"],
+ aars: ["androidx/test/annotation/1.0.1/annotation-1.0.1.aar"],
sdk_version: "current",
apex_available: [
"//apex_available:platform",
@@ -39,7 +39,7 @@
android_library_import {
name: "androidx.test.core-nodeps",
- aars: ["androidx/test/core/1.5.0-rc01/core-1.5.0-rc01.aar"],
+ aars: ["androidx/test/core/1.5.0/core-1.5.0.aar"],
sdk_version: "current",
apex_available: [
"//apex_available:platform",
@@ -83,7 +83,7 @@
android_library_import {
name: "androidx.test.espresso.contrib-nodeps",
- aars: ["androidx/test/espresso/espresso-contrib/3.5.0-rc01/espresso-contrib-3.5.0-rc01.aar"],
+ aars: ["androidx/test/espresso/espresso-contrib/3.5.0/espresso-contrib-3.5.0.aar"],
sdk_version: "current",
apex_available: [
"//apex_available:platform",
@@ -129,7 +129,7 @@
android_library_import {
name: "androidx.test.espresso.core-nodeps",
- aars: ["androidx/test/espresso/espresso-core/3.5.0-rc01/espresso-core-3.5.0-rc01.aar"],
+ aars: ["androidx/test/espresso/espresso-core/3.5.0/espresso-core-3.5.0.aar"],
sdk_version: "current",
apex_available: [
"//apex_available:platform",
@@ -179,7 +179,7 @@
android_library_import {
name: "androidx.test.espresso.idling-resource-nodeps",
- aars: ["androidx/test/espresso/espresso-idling-resource/3.5.0-rc01/espresso-idling-resource-3.5.0-rc01.aar"],
+ aars: ["androidx/test/espresso/espresso-idling-resource/3.5.0/espresso-idling-resource-3.5.0.aar"],
sdk_version: "current",
apex_available: [
"//apex_available:platform",
@@ -207,7 +207,7 @@
android_library_import {
name: "androidx.test.espresso.intents-nodeps",
- aars: ["androidx/test/espresso/espresso-intents/3.5.0-rc01/espresso-intents-3.5.0-rc01.aar"],
+ aars: ["androidx/test/espresso/espresso-intents/3.5.0/espresso-intents-3.5.0.aar"],
sdk_version: "current",
apex_available: [
"//apex_available:platform",
@@ -245,7 +245,7 @@
android_library_import {
name: "androidx.test.espresso.web-nodeps",
- aars: ["androidx/test/espresso/espresso-web/3.5.0-rc01/espresso-web-3.5.0-rc01.aar"],
+ aars: ["androidx/test/espresso/espresso-web/3.5.0/espresso-web-3.5.0.aar"],
sdk_version: "current",
apex_available: [
"//apex_available:platform",
@@ -279,7 +279,7 @@
android_library_import {
name: "androidx.test.ext.junit-nodeps",
- aars: ["androidx/test/ext/junit/1.1.4-rc01/junit-1.1.4-rc01.aar"],
+ aars: ["androidx/test/ext/junit/1.1.4/junit-1.1.4.aar"],
sdk_version: "current",
apex_available: [
"//apex_available:platform",
@@ -315,7 +315,7 @@
android_library_import {
name: "androidx.test.ext.truth-nodeps",
- aars: ["androidx/test/ext/truth/1.5.0-rc01/truth-1.5.0-rc01.aar"],
+ aars: ["androidx/test/ext/truth/1.5.0/truth-1.5.0.aar"],
sdk_version: "current",
apex_available: [
"//apex_available:platform",
@@ -385,7 +385,7 @@
android_library_import {
name: "androidx.test.monitor-nodeps",
- aars: ["androidx/test/monitor/1.6.0-rc01/monitor-1.6.0-rc01.aar"],
+ aars: ["androidx/test/monitor/1.6.0/monitor-1.6.0.aar"],
sdk_version: "current",
apex_available: [
"//apex_available:platform",
@@ -419,7 +419,7 @@
android_library_import {
name: "androidx.test.rules-nodeps",
- aars: ["androidx/test/rules/1.5.0-rc01/rules-1.5.0-rc01.aar"],
+ aars: ["androidx/test/rules/1.5.0/rules-1.5.0.aar"],
sdk_version: "current",
apex_available: [
"//apex_available:platform",
@@ -457,7 +457,7 @@
android_library_import {
name: "androidx.test.runner-nodeps",
- aars: ["androidx/test/runner/1.5.0-rc01/runner-1.5.0-rc01.aar"],
+ aars: ["androidx/test/runner/1.5.0/runner-1.5.0.aar"],
sdk_version: "current",
apex_available: [
"//apex_available:platform",
@@ -497,7 +497,7 @@
android_library_import {
name: "androidx.test.services.storage-nodeps",
- aars: ["androidx/test/services/storage/1.4.2-rc01/storage-1.4.2-rc01.aar"],
+ aars: ["androidx/test/services/storage/1.4.2/storage-1.4.2.aar"],
sdk_version: "current",
apex_available: [
"//apex_available:platform",
@@ -533,7 +533,7 @@
android_app_import {
name: "androidx.test.services.test-services",
- apk: "androidx/test/services/test-services/1.4.2-rc01/test-services-1.4.2-rc01.apk",
+ apk: "androidx/test/services/test-services/1.4.2/test-services-1.4.2.apk",
apex_available: [
"//apex_available:platform",
"//apex_available:anyapex",
diff --git a/common/androidx-test/androidx/test/annotation/1.0.1-rc01/annotation-1.0.1-rc01-sources.jar b/common/androidx-test/androidx/test/annotation/1.0.1/annotation-1.0.1-sources.jar
similarity index 100%
rename from common/androidx-test/androidx/test/annotation/1.0.1-rc01/annotation-1.0.1-rc01-sources.jar
rename to common/androidx-test/androidx/test/annotation/1.0.1/annotation-1.0.1-sources.jar
Binary files differ
diff --git a/common/androidx-test/androidx/test/annotation/1.0.1-rc01/annotation-1.0.1-rc01.aar b/common/androidx-test/androidx/test/annotation/1.0.1/annotation-1.0.1.aar
similarity index 100%
rename from common/androidx-test/androidx/test/annotation/1.0.1-rc01/annotation-1.0.1-rc01.aar
rename to common/androidx-test/androidx/test/annotation/1.0.1/annotation-1.0.1.aar
Binary files differ
diff --git a/common/androidx-test/androidx/test/annotation/1.0.1-rc01/annotation-1.0.1-rc01.pom b/common/androidx-test/androidx/test/annotation/1.0.1/annotation-1.0.1.pom
similarity index 97%
rename from common/androidx-test/androidx/test/annotation/1.0.1-rc01/annotation-1.0.1-rc01.pom
rename to common/androidx-test/androidx/test/annotation/1.0.1/annotation-1.0.1.pom
index 2d9e3c3..6ad4282 100644
--- a/common/androidx-test/androidx/test/annotation/1.0.1-rc01/annotation-1.0.1-rc01.pom
+++ b/common/androidx-test/androidx/test/annotation/1.0.1/annotation-1.0.1.pom
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>androidx.test</groupId>
<artifactId>annotation</artifactId>
- <version>1.0.1-rc01</version>
+ <version>1.0.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/core/1.5.0-rc01/core-1.5.0-rc01-sources.jar b/common/androidx-test/androidx/test/core/1.5.0/core-1.5.0-sources.jar
similarity index 100%
rename from common/androidx-test/androidx/test/core/1.5.0-rc01/core-1.5.0-rc01-sources.jar
rename to common/androidx-test/androidx/test/core/1.5.0/core-1.5.0-sources.jar
Binary files differ
diff --git a/common/androidx-test/androidx/test/core/1.5.0-rc01/core-1.5.0-rc01.aar b/common/androidx-test/androidx/test/core/1.5.0/core-1.5.0.aar
similarity index 100%
rename from common/androidx-test/androidx/test/core/1.5.0-rc01/core-1.5.0-rc01.aar
rename to common/androidx-test/androidx/test/core/1.5.0/core-1.5.0.aar
Binary files differ
diff --git a/common/androidx-test/androidx/test/core/1.5.0-rc01/core-1.5.0-rc01.pom b/common/androidx-test/androidx/test/core/1.5.0/core-1.5.0.pom
similarity index 95%
rename from common/androidx-test/androidx/test/core/1.5.0-rc01/core-1.5.0-rc01.pom
rename to common/androidx-test/androidx/test/core/1.5.0/core-1.5.0.pom
index 26be0a8..dc106dc 100644
--- a/common/androidx-test/androidx/test/core/1.5.0-rc01/core-1.5.0-rc01.pom
+++ b/common/androidx-test/androidx/test/core/1.5.0/core-1.5.0.pom
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>androidx.test</groupId>
<artifactId>core</artifactId>
- <version>1.5.0-rc01</version>
+ <version>1.5.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>monitor</artifactId>
- <version>1.6.0-rc01</version>
+ <version>1.6.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>androidx.test.services</groupId>
<artifactId>storage</artifactId>
- <version>1.4.2-rc01</version>
+ <version>1.4.2</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/common/androidx-test/androidx/test/espresso/espresso-contrib/3.5.0-rc01/espresso-contrib-3.5.0-rc01-sources.jar b/common/androidx-test/androidx/test/espresso/espresso-contrib/3.5.0/espresso-contrib-3.5.0-sources.jar
similarity index 100%
rename from common/androidx-test/androidx/test/espresso/espresso-contrib/3.5.0-rc01/espresso-contrib-3.5.0-rc01-sources.jar
rename to common/androidx-test/androidx/test/espresso/espresso-contrib/3.5.0/espresso-contrib-3.5.0-sources.jar
Binary files differ
diff --git a/common/androidx-test/androidx/test/espresso/espresso-contrib/3.5.0-rc01/espresso-contrib-3.5.0-rc01.aar b/common/androidx-test/androidx/test/espresso/espresso-contrib/3.5.0/espresso-contrib-3.5.0.aar
similarity index 100%
rename from common/androidx-test/androidx/test/espresso/espresso-contrib/3.5.0-rc01/espresso-contrib-3.5.0-rc01.aar
rename to common/androidx-test/androidx/test/espresso/espresso-contrib/3.5.0/espresso-contrib-3.5.0.aar
Binary files differ
diff --git a/common/androidx-test/androidx/test/espresso/espresso-contrib/3.5.0-rc01/espresso-contrib-3.5.0-rc01.pom b/common/androidx-test/androidx/test/espresso/espresso-contrib/3.5.0/espresso-contrib-3.5.0.pom
similarity index 95%
rename from common/androidx-test/androidx/test/espresso/espresso-contrib/3.5.0-rc01/espresso-contrib-3.5.0-rc01.pom
rename to common/androidx-test/androidx/test/espresso/espresso-contrib/3.5.0/espresso-contrib-3.5.0.pom
index b99d55f..1b2a99b 100644
--- a/common/androidx-test/androidx/test/espresso/espresso-contrib/3.5.0-rc01/espresso-contrib-3.5.0-rc01.pom
+++ b/common/androidx-test/androidx/test/espresso/espresso-contrib/3.5.0/espresso-contrib-3.5.0.pom
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>androidx.test.espresso</groupId>
<artifactId>espresso-contrib</artifactId>
- <version>3.5.0-rc01</version>
+ <version>3.5.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.5.0-rc01</version>
+ <version>3.5.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>androidx.test.espresso</groupId>
<artifactId>espresso-idling-resource</artifactId>
- <version>3.5.0-rc01</version>
+ <version>3.5.0</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/common/androidx-test/androidx/test/espresso/espresso-core/3.5.0-rc01/espresso-core-3.5.0-rc01-sources.jar b/common/androidx-test/androidx/test/espresso/espresso-core/3.5.0/espresso-core-3.5.0-sources.jar
similarity index 95%
rename from common/androidx-test/androidx/test/espresso/espresso-core/3.5.0-rc01/espresso-core-3.5.0-rc01-sources.jar
rename to common/androidx-test/androidx/test/espresso/espresso-core/3.5.0/espresso-core-3.5.0-sources.jar
index d087109..53aec95 100644
--- a/common/androidx-test/androidx/test/espresso/espresso-core/3.5.0-rc01/espresso-core-3.5.0-rc01-sources.jar
+++ b/common/androidx-test/androidx/test/espresso/espresso-core/3.5.0/espresso-core-3.5.0-sources.jar
Binary files differ
diff --git a/common/androidx-test/androidx/test/espresso/espresso-core/3.5.0-rc01/espresso-core-3.5.0-rc01.aar b/common/androidx-test/androidx/test/espresso/espresso-core/3.5.0/espresso-core-3.5.0.aar
similarity index 79%
rename from common/androidx-test/androidx/test/espresso/espresso-core/3.5.0-rc01/espresso-core-3.5.0-rc01.aar
rename to common/androidx-test/androidx/test/espresso/espresso-core/3.5.0/espresso-core-3.5.0.aar
index f52cb11..11107dc 100644
--- a/common/androidx-test/androidx/test/espresso/espresso-core/3.5.0-rc01/espresso-core-3.5.0-rc01.aar
+++ b/common/androidx-test/androidx/test/espresso/espresso-core/3.5.0/espresso-core-3.5.0.aar
Binary files differ
diff --git a/common/androidx-test/androidx/test/espresso/espresso-core/3.5.0-rc01/espresso-core-3.5.0-rc01.pom b/common/androidx-test/androidx/test/espresso/espresso-core/3.5.0/espresso-core-3.5.0.pom
similarity index 93%
rename from common/androidx-test/androidx/test/espresso/espresso-core/3.5.0-rc01/espresso-core-3.5.0-rc01.pom
rename to common/androidx-test/androidx/test/espresso/espresso-core/3.5.0/espresso-core-3.5.0.pom
index 8a6f949..ac40a8f 100644
--- a/common/androidx-test/androidx/test/espresso/espresso-core/3.5.0-rc01/espresso-core-3.5.0-rc01.pom
+++ b/common/androidx-test/androidx/test/espresso/espresso-core/3.5.0/espresso-core-3.5.0.pom
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>androidx.test.espresso</groupId>
<artifactId>espresso-core</artifactId>
- <version>3.5.0-rc01</version>
+ <version>3.5.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,19 +33,19 @@
<dependency>
<groupId>androidx.test</groupId>
<artifactId>core</artifactId>
- <version>1.5.0-rc01</version>
+ <version>1.5.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>androidx.test</groupId>
<artifactId>runner</artifactId>
- <version>1.5.0-rc01</version>
+ <version>1.5.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>androidx.test.espresso</groupId>
<artifactId>espresso-idling-resource</artifactId>
- <version>3.5.0-rc01</version>
+ <version>3.5.0</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -87,7 +87,7 @@
<dependency>
<groupId>androidx.test</groupId>
<artifactId>annotation</artifactId>
- <version>1.0.1-rc01</version>
+ <version>1.0.1</version>
<scope>compile</scope>
</dependency>
</dependencies>
diff --git a/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.5.0-rc01/espresso-idling-resource-3.5.0-rc01-sources.jar b/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.5.0/espresso-idling-resource-3.5.0-sources.jar
similarity index 100%
rename from common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.5.0-rc01/espresso-idling-resource-3.5.0-rc01-sources.jar
rename to common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.5.0/espresso-idling-resource-3.5.0-sources.jar
Binary files differ
diff --git a/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.5.0-rc01/espresso-idling-resource-3.5.0-rc01.aar b/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.5.0/espresso-idling-resource-3.5.0.aar
similarity index 100%
rename from common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.5.0-rc01/espresso-idling-resource-3.5.0-rc01.aar
rename to common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.5.0/espresso-idling-resource-3.5.0.aar
Binary files differ
diff --git a/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.5.0-rc01/espresso-idling-resource-3.5.0-rc01.pom b/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.5.0/espresso-idling-resource-3.5.0.pom
similarity index 96%
rename from common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.5.0-rc01/espresso-idling-resource-3.5.0-rc01.pom
rename to common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.5.0/espresso-idling-resource-3.5.0.pom
index 154969a..345f055 100644
--- a/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.5.0-rc01/espresso-idling-resource-3.5.0-rc01.pom
+++ b/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.5.0/espresso-idling-resource-3.5.0.pom
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>androidx.test.espresso</groupId>
<artifactId>espresso-idling-resource</artifactId>
- <version>3.5.0-rc01</version>
+ <version>3.5.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.5.0-rc01/espresso-intents-3.5.0-rc01-sources.jar b/common/androidx-test/androidx/test/espresso/espresso-intents/3.5.0/espresso-intents-3.5.0-sources.jar
similarity index 100%
rename from common/androidx-test/androidx/test/espresso/espresso-intents/3.5.0-rc01/espresso-intents-3.5.0-rc01-sources.jar
rename to common/androidx-test/androidx/test/espresso/espresso-intents/3.5.0/espresso-intents-3.5.0-sources.jar
Binary files differ
diff --git a/common/androidx-test/androidx/test/espresso/espresso-intents/3.5.0-rc01/espresso-intents-3.5.0-rc01.aar b/common/androidx-test/androidx/test/espresso/espresso-intents/3.5.0/espresso-intents-3.5.0.aar
similarity index 100%
rename from common/androidx-test/androidx/test/espresso/espresso-intents/3.5.0-rc01/espresso-intents-3.5.0-rc01.aar
rename to common/androidx-test/androidx/test/espresso/espresso-intents/3.5.0/espresso-intents-3.5.0.aar
Binary files differ
diff --git a/common/androidx-test/androidx/test/espresso/espresso-intents/3.5.0-rc01/espresso-intents-3.5.0-rc01.pom b/common/androidx-test/androidx/test/espresso/espresso-intents/3.5.0/espresso-intents-3.5.0.pom
similarity index 90%
rename from common/androidx-test/androidx/test/espresso/espresso-intents/3.5.0-rc01/espresso-intents-3.5.0-rc01.pom
rename to common/androidx-test/androidx/test/espresso/espresso-intents/3.5.0/espresso-intents-3.5.0.pom
index e75a212..74cd436 100644
--- a/common/androidx-test/androidx/test/espresso/espresso-intents/3.5.0-rc01/espresso-intents-3.5.0-rc01.pom
+++ b/common/androidx-test/androidx/test/espresso/espresso-intents/3.5.0/espresso-intents-3.5.0.pom
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>androidx.test.espresso</groupId>
<artifactId>espresso-intents</artifactId>
- <version>3.5.0-rc01</version>
+ <version>3.5.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,25 +27,25 @@
<dependency>
<groupId>androidx.test.espresso</groupId>
<artifactId>espresso-core</artifactId>
- <version>3.5.0-rc01</version>
+ <version>3.5.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>androidx.test</groupId>
<artifactId>core</artifactId>
- <version>1.5.0-rc01</version>
+ <version>1.5.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>androidx.test</groupId>
<artifactId>rules</artifactId>
- <version>1.5.0-rc01</version>
+ <version>1.5.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>androidx.test</groupId>
<artifactId>annotation</artifactId>
- <version>1.0.1-rc01</version>
+ <version>1.0.1</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/common/androidx-test/androidx/test/espresso/espresso-web/3.5.0-rc01/espresso-web-3.5.0-rc01-sources.jar b/common/androidx-test/androidx/test/espresso/espresso-web/3.5.0/espresso-web-3.5.0-sources.jar
similarity index 100%
rename from common/androidx-test/androidx/test/espresso/espresso-web/3.5.0-rc01/espresso-web-3.5.0-rc01-sources.jar
rename to common/androidx-test/androidx/test/espresso/espresso-web/3.5.0/espresso-web-3.5.0-sources.jar
Binary files differ
diff --git a/common/androidx-test/androidx/test/espresso/espresso-web/3.5.0-rc01/espresso-web-3.5.0-rc01.aar b/common/androidx-test/androidx/test/espresso/espresso-web/3.5.0/espresso-web-3.5.0.aar
similarity index 100%
rename from common/androidx-test/androidx/test/espresso/espresso-web/3.5.0-rc01/espresso-web-3.5.0-rc01.aar
rename to common/androidx-test/androidx/test/espresso/espresso-web/3.5.0/espresso-web-3.5.0.aar
Binary files differ
diff --git a/common/androidx-test/androidx/test/espresso/espresso-web/3.5.0-rc01/espresso-web-3.5.0-rc01.pom b/common/androidx-test/androidx/test/espresso/espresso-web/3.5.0/espresso-web-3.5.0.pom
similarity index 95%
rename from common/androidx-test/androidx/test/espresso/espresso-web/3.5.0-rc01/espresso-web-3.5.0-rc01.pom
rename to common/androidx-test/androidx/test/espresso/espresso-web/3.5.0/espresso-web-3.5.0.pom
index ae4c279..580f5a6 100644
--- a/common/androidx-test/androidx/test/espresso/espresso-web/3.5.0-rc01/espresso-web-3.5.0-rc01.pom
+++ b/common/androidx-test/androidx/test/espresso/espresso-web/3.5.0/espresso-web-3.5.0.pom
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>androidx.test.espresso</groupId>
<artifactId>espresso-web</artifactId>
- <version>3.5.0-rc01</version>
+ <version>3.5.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.5.0-rc01</version>
+ <version>3.5.0</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/common/androidx-test/androidx/test/ext/junit/1.1.4-rc01/junit-1.1.4-rc01-sources.jar b/common/androidx-test/androidx/test/ext/junit/1.1.4/junit-1.1.4-sources.jar
similarity index 100%
rename from common/androidx-test/androidx/test/ext/junit/1.1.4-rc01/junit-1.1.4-rc01-sources.jar
rename to common/androidx-test/androidx/test/ext/junit/1.1.4/junit-1.1.4-sources.jar
Binary files differ
diff --git a/common/androidx-test/androidx/test/ext/junit/1.1.4-rc01/junit-1.1.4-rc01.aar b/common/androidx-test/androidx/test/ext/junit/1.1.4/junit-1.1.4.aar
similarity index 100%
rename from common/androidx-test/androidx/test/ext/junit/1.1.4-rc01/junit-1.1.4-rc01.aar
rename to common/androidx-test/androidx/test/ext/junit/1.1.4/junit-1.1.4.aar
Binary files differ
diff --git a/common/androidx-test/androidx/test/ext/junit/1.1.4-rc01/junit-1.1.4-rc01.pom b/common/androidx-test/androidx/test/ext/junit/1.1.4/junit-1.1.4.pom
similarity index 93%
rename from common/androidx-test/androidx/test/ext/junit/1.1.4-rc01/junit-1.1.4-rc01.pom
rename to common/androidx-test/androidx/test/ext/junit/1.1.4/junit-1.1.4.pom
index b12e95d..695b601 100644
--- a/common/androidx-test/androidx/test/ext/junit/1.1.4-rc01/junit-1.1.4-rc01.pom
+++ b/common/androidx-test/androidx/test/ext/junit/1.1.4/junit-1.1.4.pom
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>androidx.test.ext</groupId>
<artifactId>junit</artifactId>
- <version>1.1.4-rc01</version>
+ <version>1.1.4</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.5.0-rc01</version>
+ <version>1.5.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>androidx.test</groupId>
<artifactId>monitor</artifactId>
- <version>1.6.0-rc01</version>
+ <version>1.6.0</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/common/androidx-test/androidx/test/ext/truth/1.5.0-rc01/truth-1.5.0-rc01-sources.jar b/common/androidx-test/androidx/test/ext/truth/1.5.0/truth-1.5.0-sources.jar
similarity index 100%
rename from common/androidx-test/androidx/test/ext/truth/1.5.0-rc01/truth-1.5.0-rc01-sources.jar
rename to common/androidx-test/androidx/test/ext/truth/1.5.0/truth-1.5.0-sources.jar
Binary files differ
diff --git a/common/androidx-test/androidx/test/ext/truth/1.5.0-rc01/truth-1.5.0-rc01.aar b/common/androidx-test/androidx/test/ext/truth/1.5.0/truth-1.5.0.aar
similarity index 100%
rename from common/androidx-test/androidx/test/ext/truth/1.5.0-rc01/truth-1.5.0-rc01.aar
rename to common/androidx-test/androidx/test/ext/truth/1.5.0/truth-1.5.0.aar
Binary files differ
diff --git a/common/androidx-test/androidx/test/ext/truth/1.5.0-rc01/truth-1.5.0-rc01.pom b/common/androidx-test/androidx/test/ext/truth/1.5.0/truth-1.5.0.pom
similarity index 93%
rename from common/androidx-test/androidx/test/ext/truth/1.5.0-rc01/truth-1.5.0-rc01.pom
rename to common/androidx-test/androidx/test/ext/truth/1.5.0/truth-1.5.0.pom
index c6e4baa..d39c073 100644
--- a/common/androidx-test/androidx/test/ext/truth/1.5.0-rc01/truth-1.5.0-rc01.pom
+++ b/common/androidx-test/androidx/test/ext/truth/1.5.0/truth-1.5.0.pom
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>androidx.test.ext</groupId>
<artifactId>truth</artifactId>
- <version>1.5.0-rc01</version>
+ <version>1.5.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.5.0-rc01</version>
+ <version>1.5.0</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -51,7 +51,7 @@
<dependency>
<groupId>androidx.test</groupId>
<artifactId>annotation</artifactId>
- <version>1.0.1-rc01</version>
+ <version>1.0.1</version>
<scope>compile</scope>
</dependency>
</dependencies>
diff --git a/common/androidx-test/androidx/test/monitor/1.6.0-rc01/monitor-1.6.0-rc01-sources.jar b/common/androidx-test/androidx/test/monitor/1.6.0/monitor-1.6.0-sources.jar
similarity index 100%
rename from common/androidx-test/androidx/test/monitor/1.6.0-rc01/monitor-1.6.0-rc01-sources.jar
rename to common/androidx-test/androidx/test/monitor/1.6.0/monitor-1.6.0-sources.jar
Binary files differ
diff --git a/common/androidx-test/androidx/test/monitor/1.6.0-rc01/monitor-1.6.0-rc01.aar b/common/androidx-test/androidx/test/monitor/1.6.0/monitor-1.6.0.aar
similarity index 100%
rename from common/androidx-test/androidx/test/monitor/1.6.0-rc01/monitor-1.6.0-rc01.aar
rename to common/androidx-test/androidx/test/monitor/1.6.0/monitor-1.6.0.aar
Binary files differ
diff --git a/common/androidx-test/androidx/test/monitor/1.6.0-rc01/monitor-1.6.0-rc01.pom b/common/androidx-test/androidx/test/monitor/1.6.0/monitor-1.6.0.pom
similarity index 95%
rename from common/androidx-test/androidx/test/monitor/1.6.0-rc01/monitor-1.6.0-rc01.pom
rename to common/androidx-test/androidx/test/monitor/1.6.0/monitor-1.6.0.pom
index 7ec083c..127ebf0 100644
--- a/common/androidx-test/androidx/test/monitor/1.6.0-rc01/monitor-1.6.0-rc01.pom
+++ b/common/androidx-test/androidx/test/monitor/1.6.0/monitor-1.6.0.pom
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>androidx.test</groupId>
<artifactId>monitor</artifactId>
- <version>1.6.0-rc01</version>
+ <version>1.6.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>annotation</artifactId>
- <version>1.0.1-rc01</version>
+ <version>1.0.1</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/common/androidx-test/androidx/test/rules/1.5.0-rc01/rules-1.5.0-rc01-sources.jar b/common/androidx-test/androidx/test/rules/1.5.0/rules-1.5.0-sources.jar
similarity index 100%
rename from common/androidx-test/androidx/test/rules/1.5.0-rc01/rules-1.5.0-rc01-sources.jar
rename to common/androidx-test/androidx/test/rules/1.5.0/rules-1.5.0-sources.jar
Binary files differ
diff --git a/common/androidx-test/androidx/test/rules/1.5.0-rc01/rules-1.5.0-rc01.aar b/common/androidx-test/androidx/test/rules/1.5.0/rules-1.5.0.aar
similarity index 100%
rename from common/androidx-test/androidx/test/rules/1.5.0-rc01/rules-1.5.0-rc01.aar
rename to common/androidx-test/androidx/test/rules/1.5.0/rules-1.5.0.aar
Binary files differ
diff --git a/common/androidx-test/androidx/test/rules/1.5.0-rc01/rules-1.5.0-rc01.pom b/common/androidx-test/androidx/test/rules/1.5.0/rules-1.5.0.pom
similarity index 91%
rename from common/androidx-test/androidx/test/rules/1.5.0-rc01/rules-1.5.0-rc01.pom
rename to common/androidx-test/androidx/test/rules/1.5.0/rules-1.5.0.pom
index e262138..8c31eca 100644
--- a/common/androidx-test/androidx/test/rules/1.5.0-rc01/rules-1.5.0-rc01.pom
+++ b/common/androidx-test/androidx/test/rules/1.5.0/rules-1.5.0.pom
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>androidx.test</groupId>
<artifactId>rules</artifactId>
- <version>1.5.0-rc01</version>
+ <version>1.5.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.5.0-rc01</version>
+ <version>1.5.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>androidx.test</groupId>
<artifactId>annotation</artifactId>
- <version>1.0.1-rc01</version>
+ <version>1.0.1</version>
<scope>compile</scope>
</dependency>
</dependencies>
diff --git a/common/androidx-test/androidx/test/runner/1.5.0-rc01/runner-1.5.0-rc01-sources.jar b/common/androidx-test/androidx/test/runner/1.5.0/runner-1.5.0-sources.jar
similarity index 100%
rename from common/androidx-test/androidx/test/runner/1.5.0-rc01/runner-1.5.0-rc01-sources.jar
rename to common/androidx-test/androidx/test/runner/1.5.0/runner-1.5.0-sources.jar
Binary files differ
diff --git a/common/androidx-test/androidx/test/runner/1.5.0-rc01/runner-1.5.0-rc01.aar b/common/androidx-test/androidx/test/runner/1.5.0/runner-1.5.0.aar
similarity index 100%
rename from common/androidx-test/androidx/test/runner/1.5.0-rc01/runner-1.5.0-rc01.aar
rename to common/androidx-test/androidx/test/runner/1.5.0/runner-1.5.0.aar
Binary files differ
diff --git a/common/androidx-test/androidx/test/runner/1.5.0-rc01/runner-1.5.0-rc01.pom b/common/androidx-test/androidx/test/runner/1.5.0/runner-1.5.0.pom
similarity index 92%
rename from common/androidx-test/androidx/test/runner/1.5.0-rc01/runner-1.5.0-rc01.pom
rename to common/androidx-test/androidx/test/runner/1.5.0/runner-1.5.0.pom
index b05e8a5..364acee 100644
--- a/common/androidx-test/androidx/test/runner/1.5.0-rc01/runner-1.5.0-rc01.pom
+++ b/common/androidx-test/androidx/test/runner/1.5.0/runner-1.5.0.pom
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>androidx.test</groupId>
<artifactId>runner</artifactId>
- <version>1.5.0-rc01</version>
+ <version>1.5.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,19 +33,19 @@
<dependency>
<groupId>androidx.test</groupId>
<artifactId>annotation</artifactId>
- <version>1.0.1-rc01</version>
+ <version>1.0.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>androidx.test</groupId>
<artifactId>monitor</artifactId>
- <version>[1.6.0-rc01]</version>
+ <version>[1.6.0]</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>androidx.test.services</groupId>
<artifactId>storage</artifactId>
- <version>[1.4.2-rc01]</version>
+ <version>[1.4.2]</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/common/androidx-test/androidx/test/services/storage/1.4.2-rc01/storage-1.4.2-rc01-sources.jar b/common/androidx-test/androidx/test/services/storage/1.4.2/storage-1.4.2-sources.jar
similarity index 100%
rename from common/androidx-test/androidx/test/services/storage/1.4.2-rc01/storage-1.4.2-rc01-sources.jar
rename to common/androidx-test/androidx/test/services/storage/1.4.2/storage-1.4.2-sources.jar
Binary files differ
diff --git a/common/androidx-test/androidx/test/services/storage/1.4.2-rc01/storage-1.4.2-rc01.aar b/common/androidx-test/androidx/test/services/storage/1.4.2/storage-1.4.2.aar
similarity index 100%
rename from common/androidx-test/androidx/test/services/storage/1.4.2-rc01/storage-1.4.2-rc01.aar
rename to common/androidx-test/androidx/test/services/storage/1.4.2/storage-1.4.2.aar
Binary files differ
diff --git a/common/androidx-test/androidx/test/services/storage/1.4.2-rc01/storage-1.4.2-rc01.pom b/common/androidx-test/androidx/test/services/storage/1.4.2/storage-1.4.2.pom
similarity index 93%
rename from common/androidx-test/androidx/test/services/storage/1.4.2-rc01/storage-1.4.2-rc01.pom
rename to common/androidx-test/androidx/test/services/storage/1.4.2/storage-1.4.2.pom
index dc48e77..8685d29 100644
--- a/common/androidx-test/androidx/test/services/storage/1.4.2-rc01/storage-1.4.2-rc01.pom
+++ b/common/androidx-test/androidx/test/services/storage/1.4.2/storage-1.4.2.pom
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>androidx.test.services</groupId>
<artifactId>storage</artifactId>
- <version>1.4.2-rc01</version>
+ <version>1.4.2</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.6.0-rc01]</version>
+ <version>[1.6.0]</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -45,7 +45,7 @@
<dependency>
<groupId>androidx.test</groupId>
<artifactId>annotation</artifactId>
- <version>1.0.1-rc01</version>
+ <version>1.0.1</version>
<scope>compile</scope>
</dependency>
</dependencies>
diff --git a/common/androidx-test/androidx/test/services/test-services/1.4.2-rc01/test-services-1.4.2-rc01.apk b/common/androidx-test/androidx/test/services/test-services/1.4.2/test-services-1.4.2.apk
similarity index 98%
rename from common/androidx-test/androidx/test/services/test-services/1.4.2-rc01/test-services-1.4.2-rc01.apk
rename to common/androidx-test/androidx/test/services/test-services/1.4.2/test-services-1.4.2.apk
index dbd2881..86aeb40 100644
--- a/common/androidx-test/androidx/test/services/test-services/1.4.2-rc01/test-services-1.4.2-rc01.apk
+++ b/common/androidx-test/androidx/test/services/test-services/1.4.2/test-services-1.4.2.apk
Binary files differ
diff --git a/common/androidx-test/androidx/test/services/test-services/1.4.2-rc01/test-services-1.4.2-rc01.pom b/common/androidx-test/androidx/test/services/test-services/1.4.2/test-services-1.4.2.pom
similarity index 96%
rename from common/androidx-test/androidx/test/services/test-services/1.4.2-rc01/test-services-1.4.2-rc01.pom
rename to common/androidx-test/androidx/test/services/test-services/1.4.2/test-services-1.4.2.pom
index 0ccf3ea..b01b811 100644
--- a/common/androidx-test/androidx/test/services/test-services/1.4.2-rc01/test-services-1.4.2-rc01.pom
+++ b/common/androidx-test/androidx/test/services/test-services/1.4.2/test-services-1.4.2.pom
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>androidx.test.services</groupId>
<artifactId>test-services</artifactId>
- <version>1.4.2-rc01</version>
+ <version>1.4.2</version>
<packaging>apk</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/update-from-gmaven.py b/common/androidx-test/update-from-gmaven.py
index 6a09405..67156cb 100755
--- a/common/androidx-test/update-from-gmaven.py
+++ b/common/androidx-test/update-from-gmaven.py
@@ -18,15 +18,15 @@
import subprocess
import sys
-annotationVersion="1.0.1-rc01"
-monitorVersion="1.6.0-rc01"
-runnerVersion="1.5.0-rc01"
-rulesVersion="1.5.0-rc01"
-espressoVersion="3.5.0-rc01"
-coreVersion="1.5.0-rc01"
-extJUnitVersion="1.1.4-rc01"
-extTruthVersion="1.5.0-rc01"
-servicesVersion="1.4.2-rc01"
+annotationVersion="1.0.1"
+monitorVersion="1.6.0"
+runnerVersion="1.5.0"
+rulesVersion="1.5.0"
+espressoVersion="3.5.0"
+coreVersion="1.5.0"
+extJUnitVersion="1.1.4"
+extTruthVersion="1.5.0"
+servicesVersion="1.4.2"
jankTestHelperVersion="1.0.1"
mavenToBpPatternMap = {
