Merge "Merge Android 14 QPR2 to AOSP main" into main
diff --git a/common/androidx-media3/Android.bp b/common/androidx-media3/Android.bp
index 1b88a8c..ab5fab2 100644
--- a/common/androidx-media3/Android.bp
+++ b/common/androidx-media3/Android.bp
@@ -9,6 +9,7 @@
"//vendor:__subpackages__",
"//cts/tests/tests/mediacujtest:__subpackages__",
"//cts/tests/tests/mediaediting",
+ "//packages/modules/AdServices/sdksandbox/tests/manual-test-apps:__subpackages__",
]
android_library_import {
diff --git a/common/androidx-test/Android.bp b/common/androidx-test/Android.bp
index 23badd1..37067cf 100644
--- a/common/androidx-test/Android.bp
+++ b/common/androidx-test/Android.bp
@@ -1,14 +1,14 @@
// This is a generated file. Do not modify directly.
// Automatically generated with:
-// pom2bp -rewrite 'androidx.test:=androidx.test.' -rewrite 'androidx.test.annotation:annotation=androidx.test.annotation' -rewrite 'androidx.test.ext:=androidx.test.ext.' -rewrite 'androidx.test.espresso:espresso-=androidx.test.espresso.' -rewrite 'androidx.test.janktesthelper:janktesthelper=androidx.test.janktesthelper' -rewrite 'androidx.test.services:storage=androidx.test.services.storage' -rewrite 'androidx.test.services:test-services=androidx.test.services.test-services' -rewrite 'androidx.tracing:tracing=androidx.tracing_tracing' -rewrite 'androidx.concurrent:concurrent-futures=androidx.concurrent_concurrent-futures' -rewrite 'com.google.guava:listenablefuture=guava-listenablefuture-prebuilt-jar' -extra-libs androidx.test.rules=android.test.base -rewrite 'com.google.truth:truth=truth' -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 -static-deps -prepend prepend-license.txt .
+// pom2bp -rewrite 'androidx.test:=androidx.test.' -rewrite 'androidx.test.annotation:annotation=androidx.test.annotation' -rewrite 'androidx.test.ext:=androidx.test.ext.' -rewrite 'androidx.test.espresso:espresso-=androidx.test.espresso.' -rewrite 'androidx.test.janktesthelper:janktesthelper=androidx.test.janktesthelper' -rewrite 'androidx.test.services:storage=androidx.test.services.storage' -rewrite 'androidx.test.services:test-services=androidx.test.services.test-services' -rewrite 'androidx.tracing:tracing=androidx.tracing_tracing' -rewrite 'androidx.concurrent:concurrent-futures=androidx.concurrent_concurrent-futures' -rewrite 'com.google.guava:listenablefuture=guava-listenablefuture-prebuilt-jar' -extra-libs androidx.test.rules=android.test.base -rewrite 'com.google.truth:truth=truth' -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 'org.hamcrest:hamcrest-core=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' -rewrite 'androidx.appcompat:appcompat=androidx.appcompat_appcompat' -sdk-version current -static-deps -prepend prepend-license.txt .
package {
default_applicable_licenses: ["Android-Apache-2.0"],
}
filegroup {
name: "test-services.apk",
- srcs: ["androidx/test/services/test-services/1.4.2/test-services-1.4.2.apk"],
- path: "androidx/test/services/test-services/1.4.2",
+ srcs: ["androidx/test/services/test-services/1.5.0-alpha02/test-services-1.5.0-alpha02.apk"],
+ path: "androidx/test/services/test-services/1.5.0-alpha02",
visibility: [
"//tools/tradefederation/core:__pkg__",
],
@@ -16,7 +16,7 @@
android_library_import {
name: "androidx.test.annotation-nodeps",
- aars: ["androidx/test/annotation/1.0.1/annotation-1.0.1.aar"],
+ aars: ["androidx/test/annotation/1.1.0-alpha02/annotation-1.1.0-alpha02.aar"],
sdk_version: "current",
apex_available: [
"//apex_available:platform",
@@ -24,8 +24,8 @@
],
min_sdk_version: "19",
static_libs: [
- "androidx.annotation_annotation",
"androidx.annotation_annotation-experimental",
+ "androidx.annotation_annotation",
],
}
@@ -40,15 +40,15 @@
manifest: "manifests/androidx.test.annotation/AndroidManifest.xml",
static_libs: [
"androidx.test.annotation-nodeps",
- "androidx.annotation_annotation",
"androidx.annotation_annotation-experimental",
+ "androidx.annotation_annotation",
],
java_version: "1.7",
}
android_library_import {
name: "androidx.test.core-nodeps",
- aars: ["androidx/test/core/1.5.0/core-1.5.0.aar"],
+ aars: ["androidx/test/core/1.6.0-alpha04/core-1.6.0-alpha04.aar"],
sdk_version: "current",
apex_available: [
"//apex_available:platform",
@@ -57,13 +57,14 @@
min_sdk_version: "19",
static_libs: [
"androidx.annotation_annotation",
+ "androidx.concurrent_concurrent-futures",
"androidx.lifecycle_lifecycle-common",
"androidx.tracing_tracing",
"guava-listenablefuture-prebuilt-jar",
"kotlin-stdlib",
- "androidx.concurrent_concurrent-futures",
- "androidx.test.monitor",
"androidx.test.services.storage",
+ "androidx.test.annotation",
+ "androidx.test.monitor",
],
}
@@ -79,20 +80,21 @@
static_libs: [
"androidx.test.core-nodeps",
"androidx.annotation_annotation",
+ "androidx.concurrent_concurrent-futures",
"androidx.lifecycle_lifecycle-common",
"androidx.tracing_tracing",
"guava-listenablefuture-prebuilt-jar",
"kotlin-stdlib",
- "androidx.concurrent_concurrent-futures",
- "androidx.test.monitor",
"androidx.test.services.storage",
+ "androidx.test.annotation",
+ "androidx.test.monitor",
],
java_version: "1.7",
}
android_library_import {
name: "androidx.test.espresso.accessibility-nodeps",
- aars: ["androidx/test/espresso/espresso-accessibility/3.5.0-alpha07/espresso-accessibility-3.5.0-alpha07.aar"],
+ aars: ["androidx/test/espresso/espresso-accessibility/3.6.0-alpha02/espresso-accessibility-3.6.0-alpha02.aar"],
sdk_version: "current",
apex_available: [
"//apex_available:platform",
@@ -101,6 +103,8 @@
min_sdk_version: "19",
static_libs: [
"accessibility-test-framework",
+ "hamcrest",
+ "hamcrest-library",
"androidx.test.espresso.core",
],
}
@@ -117,6 +121,8 @@
static_libs: [
"androidx.test.espresso.accessibility-nodeps",
"accessibility-test-framework",
+ "hamcrest",
+ "hamcrest-library",
"androidx.test.espresso.core",
],
java_version: "1.7",
@@ -124,7 +130,7 @@
android_library_import {
name: "androidx.test.espresso.contrib-nodeps",
- aars: ["androidx/test/espresso/espresso-contrib/3.5.1/espresso-contrib-3.5.1.aar"],
+ aars: ["androidx/test/espresso/espresso-contrib/3.6.0-alpha02/espresso-contrib-3.6.0-alpha02.aar"],
sdk_version: "current",
apex_available: [
"//apex_available:platform",
@@ -132,15 +138,17 @@
],
min_sdk_version: "19",
static_libs: [
- "com.google.android.material_material",
- "androidx.recyclerview_recyclerview",
- "androidx.drawerlayout_drawerlayout",
- "androidx.viewpager_viewpager",
+ "androidx.appcompat_appcompat",
"androidx.core_core",
- "androidx.legacy_legacy-support-core-utils",
+ "androidx.drawerlayout_drawerlayout",
+ "androidx.recyclerview_recyclerview",
+ "androidx.viewpager_viewpager",
"accessibility-test-framework",
+ "com.google.android.material_material",
+ "hamcrest",
+ "hamcrest-library",
"androidx.test.espresso.core",
- "androidx.test.espresso.idling-resource",
+ "androidx.test.monitor",
],
}
@@ -155,22 +163,24 @@
manifest: "manifests/androidx.test.espresso.contrib/AndroidManifest.xml",
static_libs: [
"androidx.test.espresso.contrib-nodeps",
- "com.google.android.material_material",
- "androidx.recyclerview_recyclerview",
- "androidx.drawerlayout_drawerlayout",
- "androidx.viewpager_viewpager",
+ "androidx.appcompat_appcompat",
"androidx.core_core",
- "androidx.legacy_legacy-support-core-utils",
+ "androidx.drawerlayout_drawerlayout",
+ "androidx.recyclerview_recyclerview",
+ "androidx.viewpager_viewpager",
"accessibility-test-framework",
+ "com.google.android.material_material",
+ "hamcrest",
+ "hamcrest-library",
"androidx.test.espresso.core",
- "androidx.test.espresso.idling-resource",
+ "androidx.test.monitor",
],
java_version: "1.7",
}
android_library_import {
name: "androidx.test.espresso.core-nodeps",
- aars: ["androidx/test/espresso/espresso-core/3.5.1/espresso-core-3.5.1.aar"],
+ aars: ["androidx/test/espresso/espresso-core/3.6.0-alpha02/espresso-core-3.6.0-alpha02.aar"],
sdk_version: "current",
apex_available: [
"//apex_available:platform",
@@ -179,16 +189,21 @@
min_sdk_version: "19",
static_libs: [
"androidx.annotation_annotation",
- "javawriter",
- "jsr330",
- "hamcrest-library",
- "hamcrest",
+ "androidx.concurrent_concurrent-futures",
"jsr305",
+ "error_prone_annotations",
+ "guava-listenablefuture-prebuilt-jar",
+ "jsr330",
+ "junit",
+ "hamcrest",
+ "hamcrest-library",
"kotlin-stdlib",
- "androidx.test.core",
- "androidx.test.runner",
"androidx.test.espresso.idling-resource",
+ "androidx.test.services.storage",
"androidx.test.annotation",
+ "androidx.test.core",
+ "androidx.test.monitor",
+ "androidx.test.runner",
],
}
@@ -204,23 +219,28 @@
static_libs: [
"androidx.test.espresso.core-nodeps",
"androidx.annotation_annotation",
- "javawriter",
- "jsr330",
- "hamcrest-library",
- "hamcrest",
+ "androidx.concurrent_concurrent-futures",
"jsr305",
+ "error_prone_annotations",
+ "guava-listenablefuture-prebuilt-jar",
+ "jsr330",
+ "junit",
+ "hamcrest",
+ "hamcrest-library",
"kotlin-stdlib",
- "androidx.test.core",
- "androidx.test.runner",
"androidx.test.espresso.idling-resource",
+ "androidx.test.services.storage",
"androidx.test.annotation",
+ "androidx.test.core",
+ "androidx.test.monitor",
+ "androidx.test.runner",
],
java_version: "1.7",
}
android_library_import {
name: "androidx.test.espresso.idling-resource-nodeps",
- aars: ["androidx/test/espresso/espresso-idling-resource/3.5.1/espresso-idling-resource-3.5.1.aar"],
+ aars: ["androidx/test/espresso/espresso-idling-resource/3.6.0-alpha02/espresso-idling-resource-3.6.0-alpha02.aar"],
sdk_version: "current",
apex_available: [
"//apex_available:platform",
@@ -248,7 +268,7 @@
android_library_import {
name: "androidx.test.espresso.intents-nodeps",
- aars: ["androidx/test/espresso/espresso-intents/3.5.1/espresso-intents-3.5.1.aar"],
+ aars: ["androidx/test/espresso/espresso-intents/3.6.0-alpha02/espresso-intents-3.6.0-alpha02.aar"],
sdk_version: "current",
apex_available: [
"//apex_available:platform",
@@ -256,11 +276,17 @@
],
min_sdk_version: "19",
static_libs: [
+ "androidx.annotation_annotation",
+ "error_prone_annotations",
+ "junit",
+ "hamcrest",
+ "hamcrest-library",
"kotlin-stdlib",
"androidx.test.espresso.core",
+ "androidx.test.annotation",
"androidx.test.core",
"androidx.test.rules",
- "androidx.test.annotation",
+ "androidx.test.runner",
],
}
@@ -275,18 +301,24 @@
manifest: "manifests/androidx.test.espresso.intents/AndroidManifest.xml",
static_libs: [
"androidx.test.espresso.intents-nodeps",
+ "androidx.annotation_annotation",
+ "error_prone_annotations",
+ "junit",
+ "hamcrest",
+ "hamcrest-library",
"kotlin-stdlib",
"androidx.test.espresso.core",
+ "androidx.test.annotation",
"androidx.test.core",
"androidx.test.rules",
- "androidx.test.annotation",
+ "androidx.test.runner",
],
java_version: "1.7",
}
android_library_import {
name: "androidx.test.espresso.web-nodeps",
- aars: ["androidx/test/espresso/espresso-web/3.5.1/espresso-web-3.5.1.aar"],
+ aars: ["androidx/test/espresso/espresso-web/3.6.0-alpha02/espresso-web-3.6.0-alpha02.aar"],
sdk_version: "current",
apex_available: [
"//apex_available:platform",
@@ -295,8 +327,17 @@
min_sdk_version: "19",
static_libs: [
"androidx.annotation_annotation",
+ "androidx.concurrent_concurrent-futures",
+ "jsr305",
+ "error_prone_annotations",
+ "guava-listenablefuture-prebuilt-jar",
"tagsoup",
+ "hamcrest",
+ "hamcrest-library",
+ "kotlin-stdlib",
"androidx.test.espresso.core",
+ "androidx.test.monitor",
+ "androidx.test.runner",
],
}
@@ -312,15 +353,24 @@
static_libs: [
"androidx.test.espresso.web-nodeps",
"androidx.annotation_annotation",
+ "androidx.concurrent_concurrent-futures",
+ "jsr305",
+ "error_prone_annotations",
+ "guava-listenablefuture-prebuilt-jar",
"tagsoup",
+ "hamcrest",
+ "hamcrest-library",
+ "kotlin-stdlib",
"androidx.test.espresso.core",
+ "androidx.test.monitor",
+ "androidx.test.runner",
],
java_version: "1.7",
}
android_library_import {
name: "androidx.test.ext.junit-nodeps",
- aars: ["androidx/test/ext/junit/1.1.5/junit-1.1.5.aar"],
+ aars: ["androidx/test/ext/junit/1.2.0-alpha02/junit-1.2.0-alpha02.aar"],
sdk_version: "current",
apex_available: [
"//apex_available:platform",
@@ -328,8 +378,10 @@
],
min_sdk_version: "19",
static_libs: [
- "junit",
"androidx.annotation_annotation",
+ "junit",
+ "kotlin-stdlib",
+ "androidx.test.services.storage",
"androidx.test.core",
"androidx.test.monitor",
],
@@ -346,8 +398,10 @@
manifest: "manifests/androidx.test.ext.junit/AndroidManifest.xml",
static_libs: [
"androidx.test.ext.junit-nodeps",
- "junit",
"androidx.annotation_annotation",
+ "junit",
+ "kotlin-stdlib",
+ "androidx.test.services.storage",
"androidx.test.core",
"androidx.test.monitor",
],
@@ -356,7 +410,7 @@
android_library_import {
name: "androidx.test.ext.truth-nodeps",
- aars: ["androidx/test/ext/truth/1.5.0/truth-1.5.0.aar"],
+ aars: ["androidx/test/ext/truth/1.6.0-alpha02/truth-1.6.0-alpha02.aar"],
sdk_version: "current",
apex_available: [
"//apex_available:platform",
@@ -364,11 +418,11 @@
],
min_sdk_version: "19",
static_libs: [
+ "androidx.annotation_annotation",
"guava",
"truth",
- "androidx.annotation_annotation",
- "androidx.test.core",
"androidx.test.annotation",
+ "androidx.test.core",
],
}
@@ -383,11 +437,11 @@
manifest: "manifests/androidx.test.ext.truth/AndroidManifest.xml",
static_libs: [
"androidx.test.ext.truth-nodeps",
+ "androidx.annotation_annotation",
"guava",
"truth",
- "androidx.annotation_annotation",
- "androidx.test.core",
"androidx.test.annotation",
+ "androidx.test.core",
],
java_version: "1.7",
}
@@ -426,7 +480,7 @@
android_library_import {
name: "androidx.test.monitor-nodeps",
- aars: ["androidx/test/monitor/1.6.1/monitor-1.6.1.aar"],
+ aars: ["androidx/test/monitor/1.7.0-alpha03/monitor-1.7.0-alpha03.aar"],
sdk_version: "current",
apex_available: [
"//apex_available:platform",
@@ -436,6 +490,7 @@
static_libs: [
"androidx.annotation_annotation",
"androidx.tracing_tracing",
+ "kotlin-stdlib",
"androidx.test.annotation",
],
}
@@ -453,6 +508,7 @@
"androidx.test.monitor-nodeps",
"androidx.annotation_annotation",
"androidx.tracing_tracing",
+ "kotlin-stdlib",
"androidx.test.annotation",
],
java_version: "1.7",
@@ -460,7 +516,7 @@
android_library_import {
name: "androidx.test.rules-nodeps",
- aars: ["androidx/test/rules/1.5.0/rules-1.5.0.aar"],
+ aars: ["androidx/test/rules/1.6.0-alpha02/rules-1.6.0-alpha02.aar"],
sdk_version: "current",
apex_available: [
"//apex_available:platform",
@@ -468,8 +524,10 @@
],
min_sdk_version: "19",
static_libs: [
- "androidx.test.runner",
+ "androidx.annotation_annotation",
+ "junit",
"androidx.test.annotation",
+ "androidx.test.runner",
],
libs: [
"android.test.base",
@@ -487,8 +545,10 @@
manifest: "manifests/androidx.test.rules/AndroidManifest.xml",
static_libs: [
"androidx.test.rules-nodeps",
- "androidx.test.runner",
+ "androidx.annotation_annotation",
+ "junit",
"androidx.test.annotation",
+ "androidx.test.runner",
],
libs: [
"android.test.base",
@@ -498,7 +558,7 @@
android_library_import {
name: "androidx.test.runner-nodeps",
- aars: ["androidx/test/runner/1.5.3-alpha01/runner-1.5.3-alpha01.aar"],
+ aars: ["androidx/test/runner/1.6.0-alpha05/runner-1.6.0-alpha05.aar"],
sdk_version: "current",
apex_available: [
"//apex_available:platform",
@@ -509,9 +569,9 @@
"androidx.annotation_annotation",
"androidx.tracing_tracing",
"junit",
+ "androidx.test.services.storage",
"androidx.test.annotation",
"androidx.test.monitor",
- "androidx.test.services.storage",
],
}
@@ -529,16 +589,16 @@
"androidx.annotation_annotation",
"androidx.tracing_tracing",
"junit",
+ "androidx.test.services.storage",
"androidx.test.annotation",
"androidx.test.monitor",
- "androidx.test.services.storage",
],
java_version: "1.7",
}
android_library_import {
name: "androidx.test.services.storage-nodeps",
- aars: ["androidx/test/services/storage/1.4.2/storage-1.4.2.aar"],
+ aars: ["androidx/test/services/storage/1.5.0-alpha02/storage-1.5.0-alpha02.aar"],
sdk_version: "current",
apex_available: [
"//apex_available:platform",
@@ -547,9 +607,8 @@
min_sdk_version: "19",
static_libs: [
"androidx.annotation_annotation",
- "jsr305",
- "androidx.test.monitor",
"androidx.test.annotation",
+ "androidx.test.monitor",
],
}
@@ -565,20 +624,20 @@
static_libs: [
"androidx.test.services.storage-nodeps",
"androidx.annotation_annotation",
- "jsr305",
- "androidx.test.monitor",
"androidx.test.annotation",
+ "androidx.test.monitor",
],
java_version: "1.7",
}
android_app_import {
name: "androidx.test.services.test-services",
- apk: "androidx/test/services/test-services/1.4.2/test-services-1.4.2.apk",
+ apk: "androidx/test/services/test-services/1.5.0-alpha02/test-services-1.5.0-alpha02.apk",
apex_available: [
"//apex_available:platform",
"//apex_available:anyapex",
],
preprocessed: true,
presigned: true,
+
}
diff --git a/common/androidx-test/androidx/test/annotation/1.0.1/annotation-1.0.1-sources.jar b/common/androidx-test/androidx/test/annotation/1.0.1/annotation-1.0.1-sources.jar
deleted file mode 100644
index 32dbe2a..0000000
--- a/common/androidx-test/androidx/test/annotation/1.0.1/annotation-1.0.1-sources.jar
+++ /dev/null
Binary files differ
diff --git a/common/androidx-test/androidx/test/annotation/1.0.1/annotation-1.0.1.aar b/common/androidx-test/androidx/test/annotation/1.0.1/annotation-1.0.1.aar
deleted file mode 100644
index 8a9a058..0000000
--- a/common/androidx-test/androidx/test/annotation/1.0.1/annotation-1.0.1.aar
+++ /dev/null
Binary files differ
diff --git a/common/androidx-test/androidx/test/annotation/1.1.0-alpha02/annotation-1.1.0-alpha02-sources.jar b/common/androidx-test/androidx/test/annotation/1.1.0-alpha02/annotation-1.1.0-alpha02-sources.jar
new file mode 100644
index 0000000..5c08af9
--- /dev/null
+++ b/common/androidx-test/androidx/test/annotation/1.1.0-alpha02/annotation-1.1.0-alpha02-sources.jar
Binary files differ
diff --git a/common/androidx-test/androidx/test/annotation/1.1.0-alpha02/annotation-1.1.0-alpha02.aar b/common/androidx-test/androidx/test/annotation/1.1.0-alpha02/annotation-1.1.0-alpha02.aar
new file mode 100644
index 0000000..a254635
--- /dev/null
+++ b/common/androidx-test/androidx/test/annotation/1.1.0-alpha02/annotation-1.1.0-alpha02.aar
Binary files differ
diff --git a/common/androidx-test/androidx/test/annotation/1.0.1/annotation-1.0.1.pom b/common/androidx-test/androidx/test/annotation/1.1.0-alpha02/annotation-1.1.0-alpha02.pom
similarity index 94%
rename from common/androidx-test/androidx/test/annotation/1.0.1/annotation-1.0.1.pom
rename to common/androidx-test/androidx/test/annotation/1.1.0-alpha02/annotation-1.1.0-alpha02.pom
index 6ad4282..ea173e9 100644
--- a/common/androidx-test/androidx/test/annotation/1.0.1/annotation-1.0.1.pom
+++ b/common/androidx-test/androidx/test/annotation/1.1.0-alpha02/annotation-1.1.0-alpha02.pom
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>androidx.test</groupId>
<artifactId>annotation</artifactId>
- <version>1.0.1</version>
+ <version>1.1.0-alpha02</version>
<packaging>aar</packaging>
<name>AndroidX Test Library</name>
<description>The AndroidX Test Library provides an extensive framework for testing Android apps</description>
@@ -26,15 +26,17 @@
<dependencies>
<dependency>
<groupId>androidx.annotation</groupId>
- <artifactId>annotation</artifactId>
- <version>1.2.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>androidx.annotation</groupId>
<artifactId>annotation-experimental</artifactId>
<version>1.1.0</version>
<scope>compile</scope>
+
+ </dependency>
+ <dependency>
+ <groupId>androidx.annotation</groupId>
+ <artifactId>annotation</artifactId>
+ <version>1.7.0-beta01</version>
+ <scope>compile</scope>
+
</dependency>
</dependencies>
</project>
diff --git a/common/androidx-test/androidx/test/core/1.5.0/core-1.5.0-sources.jar b/common/androidx-test/androidx/test/core/1.5.0/core-1.5.0-sources.jar
deleted file mode 100644
index 63564c2..0000000
--- a/common/androidx-test/androidx/test/core/1.5.0/core-1.5.0-sources.jar
+++ /dev/null
Binary files differ
diff --git a/common/androidx-test/androidx/test/core/1.5.0/core-1.5.0.aar b/common/androidx-test/androidx/test/core/1.5.0/core-1.5.0.aar
deleted file mode 100644
index c8d04ba..0000000
--- a/common/androidx-test/androidx/test/core/1.5.0/core-1.5.0.aar
+++ /dev/null
Binary files differ
diff --git a/common/androidx-test/androidx/test/core/1.6.0-alpha04/core-1.6.0-alpha04-sources.jar b/common/androidx-test/androidx/test/core/1.6.0-alpha04/core-1.6.0-alpha04-sources.jar
new file mode 100644
index 0000000..4e93a51
--- /dev/null
+++ b/common/androidx-test/androidx/test/core/1.6.0-alpha04/core-1.6.0-alpha04-sources.jar
Binary files differ
diff --git a/common/androidx-test/androidx/test/core/1.6.0-alpha04/core-1.6.0-alpha04.aar b/common/androidx-test/androidx/test/core/1.6.0-alpha04/core-1.6.0-alpha04.aar
new file mode 100644
index 0000000..f5f2362
--- /dev/null
+++ b/common/androidx-test/androidx/test/core/1.6.0-alpha04/core-1.6.0-alpha04.aar
Binary files differ
diff --git a/common/androidx-test/androidx/test/core/1.5.0/core-1.5.0.pom b/common/androidx-test/androidx/test/core/1.6.0-alpha04/core-1.6.0-alpha04.pom
similarity index 84%
rename from common/androidx-test/androidx/test/core/1.5.0/core-1.5.0.pom
rename to common/androidx-test/androidx/test/core/1.6.0-alpha04/core-1.6.0-alpha04.pom
index dc106dc..297b5f0 100644
--- a/common/androidx-test/androidx/test/core/1.5.0/core-1.5.0.pom
+++ b/common/androidx-test/androidx/test/core/1.6.0-alpha04/core-1.6.0-alpha04.pom
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>androidx.test</groupId>
<artifactId>core</artifactId>
- <version>1.5.0</version>
+ <version>1.6.0-alpha04</version>
<packaging>aar</packaging>
<name>AndroidX Test Library</name>
<description>The AndroidX Test Library provides an extensive framework for testing Android apps</description>
@@ -27,50 +27,65 @@
<dependency>
<groupId>androidx.annotation</groupId>
<artifactId>annotation</artifactId>
- <version>1.2.0</version>
+ <version>1.7.0-beta01</version>
<scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>androidx.test</groupId>
- <artifactId>monitor</artifactId>
- <version>1.6.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>androidx.test.services</groupId>
- <artifactId>storage</artifactId>
- <version>1.4.2</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>androidx.lifecycle</groupId>
- <artifactId>lifecycle-common</artifactId>
- <version>2.3.1</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>androidx.tracing</groupId>
- <artifactId>tracing</artifactId>
- <version>1.0.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>listenablefuture</artifactId>
- <version>1.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.jetbrains.kotlin</groupId>
- <artifactId>kotlin-stdlib</artifactId>
- <version>1.7.10</version>
- <scope>compile</scope>
+
</dependency>
<dependency>
<groupId>androidx.concurrent</groupId>
<artifactId>concurrent-futures</artifactId>
<version>1.1.0</version>
<scope>compile</scope>
+
+ </dependency>
+ <dependency>
+ <groupId>androidx.lifecycle</groupId>
+ <artifactId>lifecycle-common</artifactId>
+ <version>2.3.1</version>
+ <scope>compile</scope>
+
+ </dependency>
+ <dependency>
+ <groupId>androidx.test.services</groupId>
+ <artifactId>storage</artifactId>
+ <version>1.5.0-alpha02</version>
+ <scope>compile</scope>
+
+ </dependency>
+ <dependency>
+ <groupId>androidx.test</groupId>
+ <artifactId>annotation</artifactId>
+ <version>1.1.0-alpha02</version>
+ <scope>compile</scope>
+
+ </dependency>
+ <dependency>
+ <groupId>androidx.test</groupId>
+ <artifactId>monitor</artifactId>
+ <version>1.7.0-alpha03</version>
+ <scope>compile</scope>
+
+ </dependency>
+ <dependency>
+ <groupId>androidx.tracing</groupId>
+ <artifactId>tracing</artifactId>
+ <version>1.1.0</version>
+ <scope>compile</scope>
+
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>listenablefuture</artifactId>
+ <version>1.0</version>
+ <scope>compile</scope>
+
+ </dependency>
+ <dependency>
+ <groupId>org.jetbrains.kotlin</groupId>
+ <artifactId>kotlin-stdlib</artifactId>
+ <version>1.8.20</version>
+ <scope>compile</scope>
+
</dependency>
</dependencies>
</project>
diff --git a/common/androidx-test/androidx/test/espresso/espresso-accessibility/3.5.0-alpha07/espresso-accessibility-3.5.0-alpha07-sources.jar b/common/androidx-test/androidx/test/espresso/espresso-accessibility/3.5.0-alpha07/espresso-accessibility-3.5.0-alpha07-sources.jar
deleted file mode 100644
index cce8838..0000000
--- a/common/androidx-test/androidx/test/espresso/espresso-accessibility/3.5.0-alpha07/espresso-accessibility-3.5.0-alpha07-sources.jar
+++ /dev/null
Binary files differ
diff --git a/common/androidx-test/androidx/test/espresso/espresso-accessibility/3.5.0-alpha07/espresso-accessibility-3.5.0-alpha07.aar b/common/androidx-test/androidx/test/espresso/espresso-accessibility/3.5.0-alpha07/espresso-accessibility-3.5.0-alpha07.aar
deleted file mode 100644
index dc61149..0000000
--- a/common/androidx-test/androidx/test/espresso/espresso-accessibility/3.5.0-alpha07/espresso-accessibility-3.5.0-alpha07.aar
+++ /dev/null
Binary files differ
diff --git a/common/androidx-test/androidx/test/espresso/espresso-accessibility/3.6.0-alpha02/espresso-accessibility-3.6.0-alpha02-sources.jar b/common/androidx-test/androidx/test/espresso/espresso-accessibility/3.6.0-alpha02/espresso-accessibility-3.6.0-alpha02-sources.jar
new file mode 100644
index 0000000..12083b0
--- /dev/null
+++ b/common/androidx-test/androidx/test/espresso/espresso-accessibility/3.6.0-alpha02/espresso-accessibility-3.6.0-alpha02-sources.jar
Binary files differ
diff --git a/common/androidx-test/androidx/test/espresso/espresso-accessibility/3.6.0-alpha02/espresso-accessibility-3.6.0-alpha02.aar b/common/androidx-test/androidx/test/espresso/espresso-accessibility/3.6.0-alpha02/espresso-accessibility-3.6.0-alpha02.aar
new file mode 100644
index 0000000..641b843
--- /dev/null
+++ b/common/androidx-test/androidx/test/espresso/espresso-accessibility/3.6.0-alpha02/espresso-accessibility-3.6.0-alpha02.aar
Binary files differ
diff --git a/common/androidx-test/androidx/test/espresso/espresso-accessibility/3.5.0-alpha07/espresso-accessibility-3.5.0-alpha07.pom b/common/androidx-test/androidx/test/espresso/espresso-accessibility/3.6.0-alpha02/espresso-accessibility-3.6.0-alpha02.pom
similarity index 74%
rename from common/androidx-test/androidx/test/espresso/espresso-accessibility/3.5.0-alpha07/espresso-accessibility-3.5.0-alpha07.pom
rename to common/androidx-test/androidx/test/espresso/espresso-accessibility/3.6.0-alpha02/espresso-accessibility-3.6.0-alpha02.pom
index 70b1b59..736337c 100644
--- a/common/androidx-test/androidx/test/espresso/espresso-accessibility/3.5.0-alpha07/espresso-accessibility-3.5.0-alpha07.pom
+++ b/common/androidx-test/androidx/test/espresso/espresso-accessibility/3.6.0-alpha02/espresso-accessibility-3.6.0-alpha02.pom
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>androidx.test.espresso</groupId>
<artifactId>espresso-accessibility</artifactId>
- <version>3.5.0-alpha07</version>
+ <version>3.6.0-alpha02</version>
<packaging>aar</packaging>
<name>AndroidX Test Library</name>
<description>The AndroidX Test Library provides an extensive framework for testing Android apps</description>
@@ -27,14 +27,30 @@
<dependency>
<groupId>androidx.test.espresso</groupId>
<artifactId>espresso-core</artifactId>
- <version>3.5.0-alpha07</version>
+ <version>3.6.0-alpha02</version>
<scope>compile</scope>
+
</dependency>
<dependency>
<groupId>com.google.android.apps.common.testing.accessibility.framework</groupId>
<artifactId>accessibility-test-framework</artifactId>
- <version>3.1.2</version>
+ <version>3.1</version>
<scope>compile</scope>
+
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-core</artifactId>
+ <version>1.3</version>
+ <scope>compile</scope>
+
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-library</artifactId>
+ <version>1.3</version>
+ <scope>compile</scope>
+
</dependency>
</dependencies>
</project>
diff --git a/common/androidx-test/androidx/test/espresso/espresso-contrib/3.5.1/espresso-contrib-3.5.1-sources.jar b/common/androidx-test/androidx/test/espresso/espresso-contrib/3.5.1/espresso-contrib-3.5.1-sources.jar
deleted file mode 100644
index 6dcc430..0000000
--- a/common/androidx-test/androidx/test/espresso/espresso-contrib/3.5.1/espresso-contrib-3.5.1-sources.jar
+++ /dev/null
Binary files differ
diff --git a/common/androidx-test/androidx/test/espresso/espresso-contrib/3.5.1/espresso-contrib-3.5.1.aar b/common/androidx-test/androidx/test/espresso/espresso-contrib/3.5.1/espresso-contrib-3.5.1.aar
deleted file mode 100644
index f794316..0000000
--- a/common/androidx-test/androidx/test/espresso/espresso-contrib/3.5.1/espresso-contrib-3.5.1.aar
+++ /dev/null
Binary files differ
diff --git a/common/androidx-test/androidx/test/espresso/espresso-contrib/3.6.0-alpha02/espresso-contrib-3.6.0-alpha02-sources.jar b/common/androidx-test/androidx/test/espresso/espresso-contrib/3.6.0-alpha02/espresso-contrib-3.6.0-alpha02-sources.jar
new file mode 100644
index 0000000..e16b325
--- /dev/null
+++ b/common/androidx-test/androidx/test/espresso/espresso-contrib/3.6.0-alpha02/espresso-contrib-3.6.0-alpha02-sources.jar
Binary files differ
diff --git a/common/androidx-test/androidx/test/espresso/espresso-contrib/3.6.0-alpha02/espresso-contrib-3.6.0-alpha02.aar b/common/androidx-test/androidx/test/espresso/espresso-contrib/3.6.0-alpha02/espresso-contrib-3.6.0-alpha02.aar
new file mode 100644
index 0000000..fc02dd0
--- /dev/null
+++ b/common/androidx-test/androidx/test/espresso/espresso-contrib/3.6.0-alpha02/espresso-contrib-3.6.0-alpha02.aar
Binary files differ
diff --git a/common/androidx-test/androidx/test/espresso/espresso-contrib/3.5.1/espresso-contrib-3.5.1.pom b/common/androidx-test/androidx/test/espresso/espresso-contrib/3.6.0-alpha02/espresso-contrib-3.6.0-alpha02.pom
similarity index 76%
rename from common/androidx-test/androidx/test/espresso/espresso-contrib/3.5.1/espresso-contrib-3.5.1.pom
rename to common/androidx-test/androidx/test/espresso/espresso-contrib/3.6.0-alpha02/espresso-contrib-3.6.0-alpha02.pom
index 2fee32d..7403b25 100644
--- a/common/androidx-test/androidx/test/espresso/espresso-contrib/3.5.1/espresso-contrib-3.5.1.pom
+++ b/common/androidx-test/androidx/test/espresso/espresso-contrib/3.6.0-alpha02/espresso-contrib-3.6.0-alpha02.pom
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>androidx.test.espresso</groupId>
<artifactId>espresso-contrib</artifactId>
- <version>3.5.1</version>
+ <version>3.6.0-alpha02</version>
<packaging>aar</packaging>
<name>AndroidX Test Library</name>
<description>The AndroidX Test Library provides an extensive framework for testing Android apps</description>
@@ -25,58 +25,81 @@
</developers>
<dependencies>
<dependency>
- <groupId>androidx.test.espresso</groupId>
- <artifactId>espresso-core</artifactId>
- <version>3.5.1</version>
+ <groupId>androidx.appcompat</groupId>
+ <artifactId>appcompat</artifactId>
+ <version>1.3.1</version>
<scope>compile</scope>
+
</dependency>
<dependency>
- <groupId>androidx.test.espresso</groupId>
- <artifactId>espresso-idling-resource</artifactId>
- <version>3.5.1</version>
+ <groupId>androidx.core</groupId>
+ <artifactId>core</artifactId>
+ <version>1.8.0</version>
<scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>com.google.android.material</groupId>
- <artifactId>material</artifactId>
- <version>1.4.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>androidx.recyclerview</groupId>
- <artifactId>recyclerview</artifactId>
- <version>1.2.1</version>
- <scope>compile</scope>
+
</dependency>
<dependency>
<groupId>androidx.drawerlayout</groupId>
<artifactId>drawerlayout</artifactId>
<version>1.1.1</version>
<scope>compile</scope>
+
+ </dependency>
+ <dependency>
+ <groupId>androidx.recyclerview</groupId>
+ <artifactId>recyclerview</artifactId>
+ <version>1.2.1</version>
+ <scope>compile</scope>
+
+ </dependency>
+ <dependency>
+ <groupId>androidx.test.espresso</groupId>
+ <artifactId>espresso-core</artifactId>
+ <version>3.6.0-alpha02</version>
+ <scope>compile</scope>
+
+ </dependency>
+ <dependency>
+ <groupId>androidx.test</groupId>
+ <artifactId>monitor</artifactId>
+ <version>1.7.0-alpha03</version>
+ <scope>compile</scope>
+
</dependency>
<dependency>
<groupId>androidx.viewpager</groupId>
<artifactId>viewpager</artifactId>
<version>1.0.0</version>
<scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>androidx.core</groupId>
- <artifactId>core</artifactId>
- <version>1.6.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>androidx.legacy</groupId>
- <artifactId>legacy-support-core-utils</artifactId>
- <version>1.0.0</version>
- <scope>compile</scope>
+
</dependency>
<dependency>
<groupId>com.google.android.apps.common.testing.accessibility.framework</groupId>
<artifactId>accessibility-test-framework</artifactId>
- <version>3.1.2</version>
+ <version>3.1</version>
<scope>compile</scope>
+
+ </dependency>
+ <dependency>
+ <groupId>com.google.android.material</groupId>
+ <artifactId>material</artifactId>
+ <version>1.4.0</version>
+ <scope>compile</scope>
+
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-core</artifactId>
+ <version>1.3</version>
+ <scope>compile</scope>
+
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-library</artifactId>
+ <version>1.3</version>
+ <scope>compile</scope>
+
</dependency>
</dependencies>
</project>
diff --git a/common/androidx-test/androidx/test/espresso/espresso-core/3.5.1/espresso-core-3.5.1-sources.jar b/common/androidx-test/androidx/test/espresso/espresso-core/3.5.1/espresso-core-3.5.1-sources.jar
deleted file mode 100644
index 53aec95..0000000
--- a/common/androidx-test/androidx/test/espresso/espresso-core/3.5.1/espresso-core-3.5.1-sources.jar
+++ /dev/null
Binary files differ
diff --git a/common/androidx-test/androidx/test/espresso/espresso-core/3.5.1/espresso-core-3.5.1.aar b/common/androidx-test/androidx/test/espresso/espresso-core/3.5.1/espresso-core-3.5.1.aar
deleted file mode 100644
index 11107dc..0000000
--- a/common/androidx-test/androidx/test/espresso/espresso-core/3.5.1/espresso-core-3.5.1.aar
+++ /dev/null
Binary files differ
diff --git a/common/androidx-test/androidx/test/espresso/espresso-core/3.6.0-alpha02/espresso-core-3.6.0-alpha02-sources.jar b/common/androidx-test/androidx/test/espresso/espresso-core/3.6.0-alpha02/espresso-core-3.6.0-alpha02-sources.jar
new file mode 100644
index 0000000..3d70aeb
--- /dev/null
+++ b/common/androidx-test/androidx/test/espresso/espresso-core/3.6.0-alpha02/espresso-core-3.6.0-alpha02-sources.jar
Binary files differ
diff --git a/common/androidx-test/androidx/test/espresso/espresso-core/3.6.0-alpha02/espresso-core-3.6.0-alpha02.aar b/common/androidx-test/androidx/test/espresso/espresso-core/3.6.0-alpha02/espresso-core-3.6.0-alpha02.aar
new file mode 100644
index 0000000..9fedf81
--- /dev/null
+++ b/common/androidx-test/androidx/test/espresso/espresso-core/3.6.0-alpha02/espresso-core-3.6.0-alpha02.aar
Binary files differ
diff --git a/common/androidx-test/androidx/test/espresso/espresso-core/3.5.1/espresso-core-3.5.1.pom b/common/androidx-test/androidx/test/espresso/espresso-core/3.6.0-alpha02/espresso-core-3.6.0-alpha02.pom
similarity index 64%
copy from common/androidx-test/androidx/test/espresso/espresso-core/3.5.1/espresso-core-3.5.1.pom
copy to common/androidx-test/androidx/test/espresso/espresso-core/3.6.0-alpha02/espresso-core-3.6.0-alpha02.pom
index b34d79c..faecad6 100644
--- a/common/androidx-test/androidx/test/espresso/espresso-core/3.5.1/espresso-core-3.5.1.pom
+++ b/common/androidx-test/androidx/test/espresso/espresso-core/3.6.0-alpha02/espresso-core-3.6.0-alpha02.pom
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>androidx.test.espresso</groupId>
<artifactId>espresso-core</artifactId>
- <version>3.5.1</version>
+ <version>3.6.0-alpha02</version>
<packaging>aar</packaging>
<name>AndroidX Test Library</name>
<description>The AndroidX Test Library provides an extensive framework for testing Android apps</description>
@@ -27,68 +27,114 @@
<dependency>
<groupId>androidx.annotation</groupId>
<artifactId>annotation</artifactId>
- <version>1.2.0</version>
+ <version>1.7.0-beta01</version>
<scope>compile</scope>
+
</dependency>
<dependency>
- <groupId>androidx.test</groupId>
- <artifactId>core</artifactId>
- <version>1.5.0</version>
+ <groupId>androidx.concurrent</groupId>
+ <artifactId>concurrent-futures</artifactId>
+ <version>1.1.0</version>
<scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>androidx.test</groupId>
- <artifactId>runner</artifactId>
- <version>1.5.2</version>
- <scope>compile</scope>
+
</dependency>
<dependency>
<groupId>androidx.test.espresso</groupId>
<artifactId>espresso-idling-resource</artifactId>
- <version>3.5.1</version>
+ <version>3.6.0-alpha02</version>
<scope>compile</scope>
+
</dependency>
<dependency>
- <groupId>com.squareup</groupId>
- <artifactId>javawriter</artifactId>
- <version>2.1.1</version>
+ <groupId>androidx.test.services</groupId>
+ <artifactId>storage</artifactId>
+ <version>1.5.0-alpha02</version>
<scope>compile</scope>
+
+ </dependency>
+ <dependency>
+ <groupId>androidx.test</groupId>
+ <artifactId>annotation</artifactId>
+ <version>1.1.0-alpha02</version>
+ <scope>compile</scope>
+
+ </dependency>
+ <dependency>
+ <groupId>androidx.test</groupId>
+ <artifactId>core</artifactId>
+ <version>1.6.0-alpha03</version>
+ <scope>compile</scope>
+
+ </dependency>
+ <dependency>
+ <groupId>androidx.test</groupId>
+ <artifactId>monitor</artifactId>
+ <version>1.7.0-alpha03</version>
+ <scope>compile</scope>
+
+ </dependency>
+ <dependency>
+ <groupId>androidx.test</groupId>
+ <artifactId>runner</artifactId>
+ <version>1.6.0-alpha05</version>
+ <scope>compile</scope>
+
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ <version>3.0.2</version>
+ <scope>compile</scope>
+
+ </dependency>
+ <dependency>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_annotations</artifactId>
+ <version>2.18.0</version>
+ <scope>compile</scope>
+
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>listenablefuture</artifactId>
+ <version>1.0</version>
+ <scope>compile</scope>
+
</dependency>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<version>1</version>
<scope>compile</scope>
+
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.13.2</version>
+ <scope>compile</scope>
+
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-core</artifactId>
+ <version>1.3</version>
+ <scope>compile</scope>
+
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<version>1.3</version>
<scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-integration</artifactId>
- <version>1.3</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- <version>2.0.2</version>
- <scope>compile</scope>
+
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId>
- <version>1.7.10</version>
+ <version>1.8.20</version>
<scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>androidx.test</groupId>
- <artifactId>annotation</artifactId>
- <version>1.0.1</version>
- <scope>compile</scope>
+
</dependency>
</dependencies>
</project>
diff --git a/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.5.1/espresso-idling-resource-3.5.1-sources.jar b/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.5.1/espresso-idling-resource-3.5.1-sources.jar
deleted file mode 100644
index 7ca5648..0000000
--- a/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.5.1/espresso-idling-resource-3.5.1-sources.jar
+++ /dev/null
Binary files differ
diff --git a/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.5.1/espresso-idling-resource-3.5.1.aar b/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.5.1/espresso-idling-resource-3.5.1.aar
deleted file mode 100644
index 2a8f39a..0000000
--- a/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.5.1/espresso-idling-resource-3.5.1.aar
+++ /dev/null
Binary files differ
diff --git a/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.6.0-alpha02/espresso-idling-resource-3.6.0-alpha02-sources.jar b/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.6.0-alpha02/espresso-idling-resource-3.6.0-alpha02-sources.jar
new file mode 100644
index 0000000..077ee95
--- /dev/null
+++ b/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.6.0-alpha02/espresso-idling-resource-3.6.0-alpha02-sources.jar
Binary files differ
diff --git a/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.6.0-alpha02/espresso-idling-resource-3.6.0-alpha02.aar b/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.6.0-alpha02/espresso-idling-resource-3.6.0-alpha02.aar
new file mode 100644
index 0000000..c98fb9b
--- /dev/null
+++ b/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.6.0-alpha02/espresso-idling-resource-3.6.0-alpha02.aar
Binary files differ
diff --git a/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.5.1/espresso-idling-resource-3.5.1.pom b/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.6.0-alpha02/espresso-idling-resource-3.6.0-alpha02.pom
similarity index 96%
rename from common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.5.1/espresso-idling-resource-3.5.1.pom
rename to common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.6.0-alpha02/espresso-idling-resource-3.6.0-alpha02.pom
index cd475d7..47cf87c 100644
--- a/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.5.1/espresso-idling-resource-3.5.1.pom
+++ b/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.6.0-alpha02/espresso-idling-resource-3.6.0-alpha02.pom
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>androidx.test.espresso</groupId>
<artifactId>espresso-idling-resource</artifactId>
- <version>3.5.1</version>
+ <version>3.6.0-alpha02</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.1/espresso-intents-3.5.1-sources.jar b/common/androidx-test/androidx/test/espresso/espresso-intents/3.5.1/espresso-intents-3.5.1-sources.jar
deleted file mode 100644
index fb1fd3b..0000000
--- a/common/androidx-test/androidx/test/espresso/espresso-intents/3.5.1/espresso-intents-3.5.1-sources.jar
+++ /dev/null
Binary files differ
diff --git a/common/androidx-test/androidx/test/espresso/espresso-intents/3.5.1/espresso-intents-3.5.1.aar b/common/androidx-test/androidx/test/espresso/espresso-intents/3.5.1/espresso-intents-3.5.1.aar
deleted file mode 100644
index 864bac9..0000000
--- a/common/androidx-test/androidx/test/espresso/espresso-intents/3.5.1/espresso-intents-3.5.1.aar
+++ /dev/null
Binary files differ
diff --git a/common/androidx-test/androidx/test/espresso/espresso-intents/3.5.1/espresso-intents-3.5.1.pom b/common/androidx-test/androidx/test/espresso/espresso-intents/3.5.1/espresso-intents-3.5.1.pom
deleted file mode 100644
index ad48430..0000000
--- a/common/androidx-test/androidx/test/espresso/espresso-intents/3.5.1/espresso-intents-3.5.1.pom
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>androidx.test.espresso</groupId>
- <artifactId>espresso-intents</artifactId>
- <version>3.5.1</version>
- <packaging>aar</packaging>
- <name>AndroidX Test Library</name>
- <description>The AndroidX Test Library provides an extensive framework for testing Android apps</description>
- <url>https://developer.android.com/testing</url>
- <inceptionYear>2015</inceptionYear>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
- <developers>
- <developer>
- <name>The Android Open Source Project</name>
- </developer>
- </developers>
- <dependencies>
- <dependency>
- <groupId>androidx.test.espresso</groupId>
- <artifactId>espresso-core</artifactId>
- <version>3.5.1</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>androidx.test</groupId>
- <artifactId>core</artifactId>
- <version>1.5.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>androidx.test</groupId>
- <artifactId>rules</artifactId>
- <version>1.5.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>androidx.test</groupId>
- <artifactId>annotation</artifactId>
- <version>1.0.1</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.jetbrains.kotlin</groupId>
- <artifactId>kotlin-stdlib</artifactId>
- <version>1.7.10</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/common/androidx-test/androidx/test/espresso/espresso-intents/3.6.0-alpha02/espresso-intents-3.6.0-alpha02-sources.jar b/common/androidx-test/androidx/test/espresso/espresso-intents/3.6.0-alpha02/espresso-intents-3.6.0-alpha02-sources.jar
new file mode 100644
index 0000000..7402051
--- /dev/null
+++ b/common/androidx-test/androidx/test/espresso/espresso-intents/3.6.0-alpha02/espresso-intents-3.6.0-alpha02-sources.jar
Binary files differ
diff --git a/common/androidx-test/androidx/test/espresso/espresso-intents/3.6.0-alpha02/espresso-intents-3.6.0-alpha02.aar b/common/androidx-test/androidx/test/espresso/espresso-intents/3.6.0-alpha02/espresso-intents-3.6.0-alpha02.aar
new file mode 100644
index 0000000..2813528
--- /dev/null
+++ b/common/androidx-test/androidx/test/espresso/espresso-intents/3.6.0-alpha02/espresso-intents-3.6.0-alpha02.aar
Binary files differ
diff --git a/common/androidx-test/androidx/test/espresso/espresso-core/3.5.1/espresso-core-3.5.1.pom b/common/androidx-test/androidx/test/espresso/espresso-intents/3.6.0-alpha02/espresso-intents-3.6.0-alpha02.pom
similarity index 74%
rename from common/androidx-test/androidx/test/espresso/espresso-core/3.5.1/espresso-core-3.5.1.pom
rename to common/androidx-test/androidx/test/espresso/espresso-intents/3.6.0-alpha02/espresso-intents-3.6.0-alpha02.pom
index b34d79c..7986759 100644
--- a/common/androidx-test/androidx/test/espresso/espresso-core/3.5.1/espresso-core-3.5.1.pom
+++ b/common/androidx-test/androidx/test/espresso/espresso-intents/3.6.0-alpha02/espresso-intents-3.6.0-alpha02.pom
@@ -4,8 +4,8 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>androidx.test.espresso</groupId>
- <artifactId>espresso-core</artifactId>
- <version>3.5.1</version>
+ <artifactId>espresso-intents</artifactId>
+ <version>3.6.0-alpha02</version>
<packaging>aar</packaging>
<name>AndroidX Test Library</name>
<description>The AndroidX Test Library provides an extensive framework for testing Android apps</description>
@@ -27,68 +27,79 @@
<dependency>
<groupId>androidx.annotation</groupId>
<artifactId>annotation</artifactId>
- <version>1.2.0</version>
+ <version>1.7.0-beta01</version>
<scope>compile</scope>
+
+ </dependency>
+ <dependency>
+ <groupId>androidx.test.espresso</groupId>
+ <artifactId>espresso-core</artifactId>
+ <version>3.6.0-alpha02</version>
+ <scope>compile</scope>
+
+ </dependency>
+ <dependency>
+ <groupId>androidx.test</groupId>
+ <artifactId>annotation</artifactId>
+ <version>1.1.0-alpha02</version>
+ <scope>compile</scope>
+
</dependency>
<dependency>
<groupId>androidx.test</groupId>
<artifactId>core</artifactId>
- <version>1.5.0</version>
+ <version>1.6.0-alpha03</version>
<scope>compile</scope>
+
+ </dependency>
+ <dependency>
+ <groupId>androidx.test</groupId>
+ <artifactId>rules</artifactId>
+ <version>1.6.0-alpha02</version>
+ <scope>compile</scope>
+
</dependency>
<dependency>
<groupId>androidx.test</groupId>
<artifactId>runner</artifactId>
- <version>1.5.2</version>
+ <version>1.6.0-alpha05</version>
<scope>compile</scope>
+
</dependency>
<dependency>
- <groupId>androidx.test.espresso</groupId>
- <artifactId>espresso-idling-resource</artifactId>
- <version>3.5.1</version>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_annotations</artifactId>
+ <version>2.18.0</version>
<scope>compile</scope>
+
</dependency>
<dependency>
- <groupId>com.squareup</groupId>
- <artifactId>javawriter</artifactId>
- <version>2.1.1</version>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.13.2</version>
<scope>compile</scope>
+
</dependency>
<dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- <version>1</version>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-core</artifactId>
+ <version>1.3</version>
<scope>compile</scope>
+
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<version>1.3</version>
<scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-integration</artifactId>
- <version>1.3</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- <version>2.0.2</version>
- <scope>compile</scope>
+
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId>
- <version>1.7.10</version>
+ <version>1.8.20</version>
<scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>androidx.test</groupId>
- <artifactId>annotation</artifactId>
- <version>1.0.1</version>
- <scope>compile</scope>
+
</dependency>
</dependencies>
</project>
diff --git a/common/androidx-test/androidx/test/espresso/espresso-web/3.5.1/espresso-web-3.5.1-sources.jar b/common/androidx-test/androidx/test/espresso/espresso-web/3.5.1/espresso-web-3.5.1-sources.jar
deleted file mode 100644
index dd47e2b..0000000
--- a/common/androidx-test/androidx/test/espresso/espresso-web/3.5.1/espresso-web-3.5.1-sources.jar
+++ /dev/null
Binary files differ
diff --git a/common/androidx-test/androidx/test/espresso/espresso-web/3.5.1/espresso-web-3.5.1.aar b/common/androidx-test/androidx/test/espresso/espresso-web/3.5.1/espresso-web-3.5.1.aar
deleted file mode 100644
index 4a705cc..0000000
--- a/common/androidx-test/androidx/test/espresso/espresso-web/3.5.1/espresso-web-3.5.1.aar
+++ /dev/null
Binary files differ
diff --git a/common/androidx-test/androidx/test/espresso/espresso-web/3.5.1/espresso-web-3.5.1.pom b/common/androidx-test/androidx/test/espresso/espresso-web/3.5.1/espresso-web-3.5.1.pom
deleted file mode 100644
index 1d9ed45..0000000
--- a/common/androidx-test/androidx/test/espresso/espresso-web/3.5.1/espresso-web-3.5.1.pom
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>androidx.test.espresso</groupId>
- <artifactId>espresso-web</artifactId>
- <version>3.5.1</version>
- <packaging>aar</packaging>
- <name>AndroidX Test Library</name>
- <description>The AndroidX Test Library provides an extensive framework for testing Android apps</description>
- <url>https://developer.android.com/testing</url>
- <inceptionYear>2015</inceptionYear>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
- <developers>
- <developer>
- <name>The Android Open Source Project</name>
- </developer>
- </developers>
- <dependencies>
- <dependency>
- <groupId>androidx.test.espresso</groupId>
- <artifactId>espresso-core</artifactId>
- <version>3.5.1</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>androidx.annotation</groupId>
- <artifactId>annotation</artifactId>
- <version>1.2.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.ccil.cowan.tagsoup</groupId>
- <artifactId>tagsoup</artifactId>
- <version>1.2.1</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/common/androidx-test/androidx/test/espresso/espresso-web/3.6.0-alpha02/espresso-web-3.6.0-alpha02-sources.jar b/common/androidx-test/androidx/test/espresso/espresso-web/3.6.0-alpha02/espresso-web-3.6.0-alpha02-sources.jar
new file mode 100644
index 0000000..aad1a8f
--- /dev/null
+++ b/common/androidx-test/androidx/test/espresso/espresso-web/3.6.0-alpha02/espresso-web-3.6.0-alpha02-sources.jar
Binary files differ
diff --git a/common/androidx-test/androidx/test/espresso/espresso-web/3.6.0-alpha02/espresso-web-3.6.0-alpha02.aar b/common/androidx-test/androidx/test/espresso/espresso-web/3.6.0-alpha02/espresso-web-3.6.0-alpha02.aar
new file mode 100644
index 0000000..7d6427d
--- /dev/null
+++ b/common/androidx-test/androidx/test/espresso/espresso-web/3.6.0-alpha02/espresso-web-3.6.0-alpha02.aar
Binary files differ
diff --git a/common/androidx-test/androidx/test/espresso/espresso-core/3.5.1/espresso-core-3.5.1.pom b/common/androidx-test/androidx/test/espresso/espresso-web/3.6.0-alpha02/espresso-web-3.6.0-alpha02.pom
similarity index 69%
copy from common/androidx-test/androidx/test/espresso/espresso-core/3.5.1/espresso-core-3.5.1.pom
copy to common/androidx-test/androidx/test/espresso/espresso-web/3.6.0-alpha02/espresso-web-3.6.0-alpha02.pom
index b34d79c..1ae40ed 100644
--- a/common/androidx-test/androidx/test/espresso/espresso-core/3.5.1/espresso-core-3.5.1.pom
+++ b/common/androidx-test/androidx/test/espresso/espresso-web/3.6.0-alpha02/espresso-web-3.6.0-alpha02.pom
@@ -4,8 +4,8 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>androidx.test.espresso</groupId>
- <artifactId>espresso-core</artifactId>
- <version>3.5.1</version>
+ <artifactId>espresso-web</artifactId>
+ <version>3.6.0-alpha02</version>
<packaging>aar</packaging>
<name>AndroidX Test Library</name>
<description>The AndroidX Test Library provides an extensive framework for testing Android apps</description>
@@ -27,68 +27,86 @@
<dependency>
<groupId>androidx.annotation</groupId>
<artifactId>annotation</artifactId>
- <version>1.2.0</version>
+ <version>1.7.0-beta01</version>
<scope>compile</scope>
+
+ </dependency>
+ <dependency>
+ <groupId>androidx.concurrent</groupId>
+ <artifactId>concurrent-futures</artifactId>
+ <version>1.1.0</version>
+ <scope>compile</scope>
+
+ </dependency>
+ <dependency>
+ <groupId>androidx.test.espresso</groupId>
+ <artifactId>espresso-core</artifactId>
+ <version>3.6.0-alpha02</version>
+ <scope>compile</scope>
+
</dependency>
<dependency>
<groupId>androidx.test</groupId>
- <artifactId>core</artifactId>
- <version>1.5.0</version>
+ <artifactId>monitor</artifactId>
+ <version>1.7.0-alpha03</version>
<scope>compile</scope>
+
</dependency>
<dependency>
<groupId>androidx.test</groupId>
<artifactId>runner</artifactId>
- <version>1.5.2</version>
+ <version>1.6.0-alpha05</version>
<scope>compile</scope>
+
</dependency>
<dependency>
- <groupId>androidx.test.espresso</groupId>
- <artifactId>espresso-idling-resource</artifactId>
- <version>3.5.1</version>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ <version>3.0.2</version>
<scope>compile</scope>
+
</dependency>
<dependency>
- <groupId>com.squareup</groupId>
- <artifactId>javawriter</artifactId>
- <version>2.1.1</version>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_annotations</artifactId>
+ <version>2.18.0</version>
<scope>compile</scope>
+
</dependency>
<dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- <version>1</version>
+ <groupId>com.google.guava</groupId>
+ <artifactId>listenablefuture</artifactId>
+ <version>1.0</version>
<scope>compile</scope>
+
+ </dependency>
+ <dependency>
+ <groupId>org.ccil.cowan.tagsoup</groupId>
+ <artifactId>tagsoup</artifactId>
+ <version>1.2.1</version>
+ <scope>compile</scope>
+
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-core</artifactId>
+ <version>1.3</version>
+ <scope>compile</scope>
+
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<version>1.3</version>
<scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-integration</artifactId>
- <version>1.3</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- <version>2.0.2</version>
- <scope>compile</scope>
+
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId>
- <version>1.7.10</version>
+ <version>1.8.20</version>
<scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>androidx.test</groupId>
- <artifactId>annotation</artifactId>
- <version>1.0.1</version>
- <scope>compile</scope>
+
</dependency>
</dependencies>
</project>
diff --git a/common/androidx-test/androidx/test/ext/junit/1.1.5/junit-1.1.5-sources.jar b/common/androidx-test/androidx/test/ext/junit/1.1.5/junit-1.1.5-sources.jar
deleted file mode 100644
index de449ba..0000000
--- a/common/androidx-test/androidx/test/ext/junit/1.1.5/junit-1.1.5-sources.jar
+++ /dev/null
Binary files differ
diff --git a/common/androidx-test/androidx/test/ext/junit/1.1.5/junit-1.1.5.aar b/common/androidx-test/androidx/test/ext/junit/1.1.5/junit-1.1.5.aar
deleted file mode 100644
index 162d864..0000000
--- a/common/androidx-test/androidx/test/ext/junit/1.1.5/junit-1.1.5.aar
+++ /dev/null
Binary files differ
diff --git a/common/androidx-test/androidx/test/ext/junit/1.2.0-alpha02/junit-1.2.0-alpha02-sources.jar b/common/androidx-test/androidx/test/ext/junit/1.2.0-alpha02/junit-1.2.0-alpha02-sources.jar
new file mode 100644
index 0000000..6402fe8
--- /dev/null
+++ b/common/androidx-test/androidx/test/ext/junit/1.2.0-alpha02/junit-1.2.0-alpha02-sources.jar
Binary files differ
diff --git a/common/androidx-test/androidx/test/ext/junit/1.2.0-alpha02/junit-1.2.0-alpha02.aar b/common/androidx-test/androidx/test/ext/junit/1.2.0-alpha02/junit-1.2.0-alpha02.aar
new file mode 100644
index 0000000..e011bd2
--- /dev/null
+++ b/common/androidx-test/androidx/test/ext/junit/1.2.0-alpha02/junit-1.2.0-alpha02.aar
Binary files differ
diff --git a/common/androidx-test/androidx/test/runner/1.5.3-alpha01/runner-1.5.3-alpha01.pom b/common/androidx-test/androidx/test/ext/junit/1.2.0-alpha02/junit-1.2.0-alpha02.pom
similarity index 79%
copy from common/androidx-test/androidx/test/runner/1.5.3-alpha01/runner-1.5.3-alpha01.pom
copy to common/androidx-test/androidx/test/ext/junit/1.2.0-alpha02/junit-1.2.0-alpha02.pom
index 0ae83de..fac57d6 100644
--- a/common/androidx-test/androidx/test/runner/1.5.3-alpha01/runner-1.5.3-alpha01.pom
+++ b/common/androidx-test/androidx/test/ext/junit/1.2.0-alpha02/junit-1.2.0-alpha02.pom
@@ -3,9 +3,9 @@
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
- <groupId>androidx.test</groupId>
- <artifactId>runner</artifactId>
- <version>1.5.3-alpha01</version>
+ <groupId>androidx.test.ext</groupId>
+ <artifactId>junit</artifactId>
+ <version>1.2.0-alpha02</version>
<packaging>aar</packaging>
<name>AndroidX Test Library</name>
<description>The AndroidX Test Library provides an extensive framework for testing Android apps</description>
@@ -27,38 +27,44 @@
<dependency>
<groupId>androidx.annotation</groupId>
<artifactId>annotation</artifactId>
- <version>1.2.0</version>
+ <version>1.7.0-beta01</version>
<scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>androidx.test</groupId>
- <artifactId>annotation</artifactId>
- <version>1.0.1</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>androidx.test</groupId>
- <artifactId>monitor</artifactId>
- <version>[1.6.1]</version>
- <scope>compile</scope>
+
</dependency>
<dependency>
<groupId>androidx.test.services</groupId>
<artifactId>storage</artifactId>
- <version>[1.4.2]</version>
+ <version>1.5.0-alpha02</version>
<scope>compile</scope>
+
</dependency>
<dependency>
- <groupId>androidx.tracing</groupId>
- <artifactId>tracing</artifactId>
- <version>1.0.0</version>
+ <groupId>androidx.test</groupId>
+ <artifactId>core</artifactId>
+ <version>1.6.0-alpha03</version>
<scope>compile</scope>
+
+ </dependency>
+ <dependency>
+ <groupId>androidx.test</groupId>
+ <artifactId>monitor</artifactId>
+ <version>1.7.0-alpha03</version>
+ <scope>compile</scope>
+
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
<scope>compile</scope>
+
+ </dependency>
+ <dependency>
+ <groupId>org.jetbrains.kotlin</groupId>
+ <artifactId>kotlin-stdlib</artifactId>
+ <version>1.8.20</version>
+ <scope>compile</scope>
+
</dependency>
</dependencies>
</project>
diff --git a/common/androidx-test/androidx/test/ext/truth/1.5.0/truth-1.5.0.aar b/common/androidx-test/androidx/test/ext/truth/1.5.0/truth-1.5.0.aar
deleted file mode 100644
index b9e9690..0000000
--- a/common/androidx-test/androidx/test/ext/truth/1.5.0/truth-1.5.0.aar
+++ /dev/null
Binary files differ
diff --git a/common/androidx-test/androidx/test/ext/truth/1.5.0/truth-1.5.0-sources.jar b/common/androidx-test/androidx/test/ext/truth/1.6.0-alpha02/truth-1.6.0-alpha02-sources.jar
similarity index 67%
rename from common/androidx-test/androidx/test/ext/truth/1.5.0/truth-1.5.0-sources.jar
rename to common/androidx-test/androidx/test/ext/truth/1.6.0-alpha02/truth-1.6.0-alpha02-sources.jar
index 709d1ab..ec1f449 100644
--- a/common/androidx-test/androidx/test/ext/truth/1.5.0/truth-1.5.0-sources.jar
+++ b/common/androidx-test/androidx/test/ext/truth/1.6.0-alpha02/truth-1.6.0-alpha02-sources.jar
Binary files differ
diff --git a/common/androidx-test/androidx/test/ext/truth/1.6.0-alpha02/truth-1.6.0-alpha02.aar b/common/androidx-test/androidx/test/ext/truth/1.6.0-alpha02/truth-1.6.0-alpha02.aar
new file mode 100644
index 0000000..c86d9b1
--- /dev/null
+++ b/common/androidx-test/androidx/test/ext/truth/1.6.0-alpha02/truth-1.6.0-alpha02.aar
Binary files differ
diff --git a/common/androidx-test/androidx/test/ext/truth/1.5.0/truth-1.5.0.pom b/common/androidx-test/androidx/test/ext/truth/1.6.0-alpha02/truth-1.6.0-alpha02.pom
similarity index 87%
rename from common/androidx-test/androidx/test/ext/truth/1.5.0/truth-1.5.0.pom
rename to common/androidx-test/androidx/test/ext/truth/1.6.0-alpha02/truth-1.6.0-alpha02.pom
index d39c073..c5e82e2 100644
--- a/common/androidx-test/androidx/test/ext/truth/1.5.0/truth-1.5.0.pom
+++ b/common/androidx-test/androidx/test/ext/truth/1.6.0-alpha02/truth-1.6.0-alpha02.pom
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>androidx.test.ext</groupId>
<artifactId>truth</artifactId>
- <version>1.5.0</version>
+ <version>1.6.0-alpha02</version>
<packaging>aar</packaging>
<name>AndroidX Test Library</name>
<description>The AndroidX Test Library provides an extensive framework for testing Android apps</description>
@@ -25,34 +25,39 @@
</developers>
<dependencies>
<dependency>
+ <groupId>androidx.annotation</groupId>
+ <artifactId>annotation</artifactId>
+ <version>1.7.0-beta01</version>
+ <scope>compile</scope>
+
+ </dependency>
+ <dependency>
+ <groupId>androidx.test</groupId>
+ <artifactId>annotation</artifactId>
+ <version>1.1.0-alpha02</version>
+ <scope>compile</scope>
+
+ </dependency>
+ <dependency>
<groupId>androidx.test</groupId>
<artifactId>core</artifactId>
- <version>1.5.0</version>
+ <version>1.6.0-alpha03</version>
<scope>compile</scope>
+
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>30.1.1-android</version>
+ <version>31.1-android</version>
<scope>compile</scope>
+
</dependency>
<dependency>
<groupId>com.google.truth</groupId>
<artifactId>truth</artifactId>
- <version>1.1.3</version>
+ <version>1.0</version>
<scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>androidx.annotation</groupId>
- <artifactId>annotation</artifactId>
- <version>1.2.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>androidx.test</groupId>
- <artifactId>annotation</artifactId>
- <version>1.0.1</version>
- <scope>compile</scope>
+
</dependency>
</dependencies>
</project>
diff --git a/common/androidx-test/androidx/test/monitor/1.6.1/monitor-1.6.1-sources.jar b/common/androidx-test/androidx/test/monitor/1.6.1/monitor-1.6.1-sources.jar
deleted file mode 100644
index 4f89266..0000000
--- a/common/androidx-test/androidx/test/monitor/1.6.1/monitor-1.6.1-sources.jar
+++ /dev/null
Binary files differ
diff --git a/common/androidx-test/androidx/test/monitor/1.6.1/monitor-1.6.1.aar b/common/androidx-test/androidx/test/monitor/1.6.1/monitor-1.6.1.aar
deleted file mode 100644
index 116fcbe..0000000
--- a/common/androidx-test/androidx/test/monitor/1.6.1/monitor-1.6.1.aar
+++ /dev/null
Binary files differ
diff --git a/common/androidx-test/androidx/test/monitor/1.7.0-alpha03/monitor-1.7.0-alpha03-sources.jar b/common/androidx-test/androidx/test/monitor/1.7.0-alpha03/monitor-1.7.0-alpha03-sources.jar
new file mode 100644
index 0000000..4d22043
--- /dev/null
+++ b/common/androidx-test/androidx/test/monitor/1.7.0-alpha03/monitor-1.7.0-alpha03-sources.jar
Binary files differ
diff --git a/common/androidx-test/androidx/test/monitor/1.7.0-alpha03/monitor-1.7.0-alpha03.aar b/common/androidx-test/androidx/test/monitor/1.7.0-alpha03/monitor-1.7.0-alpha03.aar
new file mode 100644
index 0000000..29717db
--- /dev/null
+++ b/common/androidx-test/androidx/test/monitor/1.7.0-alpha03/monitor-1.7.0-alpha03.aar
Binary files differ
diff --git a/common/androidx-test/androidx/test/monitor/1.6.1/monitor-1.6.1.pom b/common/androidx-test/androidx/test/monitor/1.7.0-alpha03/monitor-1.7.0-alpha03.pom
similarity index 80%
rename from common/androidx-test/androidx/test/monitor/1.6.1/monitor-1.6.1.pom
rename to common/androidx-test/androidx/test/monitor/1.7.0-alpha03/monitor-1.7.0-alpha03.pom
index a0ec941..e8286c6 100644
--- a/common/androidx-test/androidx/test/monitor/1.6.1/monitor-1.6.1.pom
+++ b/common/androidx-test/androidx/test/monitor/1.7.0-alpha03/monitor-1.7.0-alpha03.pom
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>androidx.test</groupId>
<artifactId>monitor</artifactId>
- <version>1.6.1</version>
+ <version>1.7.0-alpha03</version>
<packaging>aar</packaging>
<name>AndroidX Test Library</name>
<description>The AndroidX Test Library provides an extensive framework for testing Android apps</description>
@@ -27,20 +27,30 @@
<dependency>
<groupId>androidx.annotation</groupId>
<artifactId>annotation</artifactId>
- <version>1.2.0</version>
+ <version>1.7.0-beta01</version>
<scope>compile</scope>
+
</dependency>
<dependency>
<groupId>androidx.test</groupId>
<artifactId>annotation</artifactId>
- <version>1.0.1</version>
+ <version>1.1.0-alpha02</version>
<scope>compile</scope>
+
</dependency>
<dependency>
<groupId>androidx.tracing</groupId>
<artifactId>tracing</artifactId>
- <version>1.0.0</version>
+ <version>1.1.0</version>
<scope>compile</scope>
+
+ </dependency>
+ <dependency>
+ <groupId>org.jetbrains.kotlin</groupId>
+ <artifactId>kotlin-stdlib</artifactId>
+ <version>1.8.20</version>
+ <scope>compile</scope>
+
</dependency>
</dependencies>
</project>
diff --git a/common/androidx-test/androidx/test/rules/1.5.0/rules-1.5.0.aar b/common/androidx-test/androidx/test/rules/1.5.0/rules-1.5.0.aar
deleted file mode 100644
index b9a4d16..0000000
--- a/common/androidx-test/androidx/test/rules/1.5.0/rules-1.5.0.aar
+++ /dev/null
Binary files differ
diff --git a/common/androidx-test/androidx/test/rules/1.5.0/rules-1.5.0.pom b/common/androidx-test/androidx/test/rules/1.5.0/rules-1.5.0.pom
deleted file mode 100644
index 8c31eca..0000000
--- a/common/androidx-test/androidx/test/rules/1.5.0/rules-1.5.0.pom
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>androidx.test</groupId>
- <artifactId>rules</artifactId>
- <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>
- <url>https://developer.android.com/testing</url>
- <inceptionYear>2015</inceptionYear>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
- <developers>
- <developer>
- <name>The Android Open Source Project</name>
- </developer>
- </developers>
- <dependencies>
- <dependency>
- <groupId>androidx.test</groupId>
- <artifactId>runner</artifactId>
- <version>1.5.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>androidx.test</groupId>
- <artifactId>annotation</artifactId>
- <version>1.0.1</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/common/androidx-test/androidx/test/rules/1.5.0/rules-1.5.0-sources.jar b/common/androidx-test/androidx/test/rules/1.6.0-alpha02/rules-1.6.0-alpha02-sources.jar
similarity index 63%
rename from common/androidx-test/androidx/test/rules/1.5.0/rules-1.5.0-sources.jar
rename to common/androidx-test/androidx/test/rules/1.6.0-alpha02/rules-1.6.0-alpha02-sources.jar
index 31a5568..c877c10 100644
--- a/common/androidx-test/androidx/test/rules/1.5.0/rules-1.5.0-sources.jar
+++ b/common/androidx-test/androidx/test/rules/1.6.0-alpha02/rules-1.6.0-alpha02-sources.jar
Binary files differ
diff --git a/common/androidx-test/androidx/test/rules/1.6.0-alpha02/rules-1.6.0-alpha02.aar b/common/androidx-test/androidx/test/rules/1.6.0-alpha02/rules-1.6.0-alpha02.aar
new file mode 100644
index 0000000..0c0e582
--- /dev/null
+++ b/common/androidx-test/androidx/test/rules/1.6.0-alpha02/rules-1.6.0-alpha02.aar
Binary files differ
diff --git a/common/androidx-test/androidx/test/ext/junit/1.1.5/junit-1.1.5.pom b/common/androidx-test/androidx/test/rules/1.6.0-alpha02/rules-1.6.0-alpha02.pom
similarity index 82%
rename from common/androidx-test/androidx/test/ext/junit/1.1.5/junit-1.1.5.pom
rename to common/androidx-test/androidx/test/rules/1.6.0-alpha02/rules-1.6.0-alpha02.pom
index 7dd12cb..b1617bb 100644
--- a/common/androidx-test/androidx/test/ext/junit/1.1.5/junit-1.1.5.pom
+++ b/common/androidx-test/androidx/test/rules/1.6.0-alpha02/rules-1.6.0-alpha02.pom
@@ -3,9 +3,9 @@
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
- <groupId>androidx.test.ext</groupId>
- <artifactId>junit</artifactId>
- <version>1.1.5</version>
+ <groupId>androidx.test</groupId>
+ <artifactId>rules</artifactId>
+ <version>1.6.0-alpha02</version>
<packaging>aar</packaging>
<name>AndroidX Test Library</name>
<description>The AndroidX Test Library provides an extensive framework for testing Android apps</description>
@@ -25,28 +25,32 @@
</developers>
<dependencies>
<dependency>
+ <groupId>androidx.annotation</groupId>
+ <artifactId>annotation</artifactId>
+ <version>1.7.0-beta01</version>
+ <scope>compile</scope>
+
+ </dependency>
+ <dependency>
+ <groupId>androidx.test</groupId>
+ <artifactId>annotation</artifactId>
+ <version>1.1.0-alpha02</version>
+ <scope>compile</scope>
+
+ </dependency>
+ <dependency>
+ <groupId>androidx.test</groupId>
+ <artifactId>runner</artifactId>
+ <version>1.6.0-alpha05</version>
+ <scope>compile</scope>
+
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
<scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>androidx.test</groupId>
- <artifactId>core</artifactId>
- <version>1.5.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>androidx.test</groupId>
- <artifactId>monitor</artifactId>
- <version>1.6.1</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>androidx.annotation</groupId>
- <artifactId>annotation</artifactId>
- <version>1.2.0</version>
- <scope>compile</scope>
+
</dependency>
</dependencies>
</project>
diff --git a/common/androidx-test/androidx/test/runner/1.5.3-alpha01/runner-1.5.3-alpha01-sources.jar b/common/androidx-test/androidx/test/runner/1.5.3-alpha01/runner-1.5.3-alpha01-sources.jar
deleted file mode 100644
index 090711e..0000000
--- a/common/androidx-test/androidx/test/runner/1.5.3-alpha01/runner-1.5.3-alpha01-sources.jar
+++ /dev/null
Binary files differ
diff --git a/common/androidx-test/androidx/test/runner/1.5.3-alpha01/runner-1.5.3-alpha01.aar b/common/androidx-test/androidx/test/runner/1.5.3-alpha01/runner-1.5.3-alpha01.aar
deleted file mode 100644
index 0140d16..0000000
--- a/common/androidx-test/androidx/test/runner/1.5.3-alpha01/runner-1.5.3-alpha01.aar
+++ /dev/null
Binary files differ
diff --git a/common/androidx-test/androidx/test/runner/1.6.0-alpha05/runner-1.6.0-alpha05-sources.jar b/common/androidx-test/androidx/test/runner/1.6.0-alpha05/runner-1.6.0-alpha05-sources.jar
new file mode 100644
index 0000000..1a492c3
--- /dev/null
+++ b/common/androidx-test/androidx/test/runner/1.6.0-alpha05/runner-1.6.0-alpha05-sources.jar
Binary files differ
diff --git a/common/androidx-test/androidx/test/runner/1.6.0-alpha05/runner-1.6.0-alpha05.aar b/common/androidx-test/androidx/test/runner/1.6.0-alpha05/runner-1.6.0-alpha05.aar
new file mode 100644
index 0000000..421bbca
--- /dev/null
+++ b/common/androidx-test/androidx/test/runner/1.6.0-alpha05/runner-1.6.0-alpha05.aar
Binary files differ
diff --git a/common/androidx-test/androidx/test/runner/1.5.3-alpha01/runner-1.5.3-alpha01.pom b/common/androidx-test/androidx/test/runner/1.6.0-alpha05/runner-1.6.0-alpha05.pom
similarity index 88%
rename from common/androidx-test/androidx/test/runner/1.5.3-alpha01/runner-1.5.3-alpha01.pom
rename to common/androidx-test/androidx/test/runner/1.6.0-alpha05/runner-1.6.0-alpha05.pom
index 0ae83de..aeeb69f 100644
--- a/common/androidx-test/androidx/test/runner/1.5.3-alpha01/runner-1.5.3-alpha01.pom
+++ b/common/androidx-test/androidx/test/runner/1.6.0-alpha05/runner-1.6.0-alpha05.pom
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>androidx.test</groupId>
<artifactId>runner</artifactId>
- <version>1.5.3-alpha01</version>
+ <version>1.6.0-alpha05</version>
<packaging>aar</packaging>
<name>AndroidX Test Library</name>
<description>The AndroidX Test Library provides an extensive framework for testing Android apps</description>
@@ -27,38 +27,44 @@
<dependency>
<groupId>androidx.annotation</groupId>
<artifactId>annotation</artifactId>
- <version>1.2.0</version>
+ <version>1.7.0-beta01</version>
<scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>androidx.test</groupId>
- <artifactId>annotation</artifactId>
- <version>1.0.1</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>androidx.test</groupId>
- <artifactId>monitor</artifactId>
- <version>[1.6.1]</version>
- <scope>compile</scope>
+
</dependency>
<dependency>
<groupId>androidx.test.services</groupId>
<artifactId>storage</artifactId>
- <version>[1.4.2]</version>
+ <version>1.5.0-alpha02</version>
<scope>compile</scope>
+
+ </dependency>
+ <dependency>
+ <groupId>androidx.test</groupId>
+ <artifactId>annotation</artifactId>
+ <version>1.1.0-alpha02</version>
+ <scope>compile</scope>
+
+ </dependency>
+ <dependency>
+ <groupId>androidx.test</groupId>
+ <artifactId>monitor</artifactId>
+ <version>1.7.0-alpha03</version>
+ <scope>compile</scope>
+
</dependency>
<dependency>
<groupId>androidx.tracing</groupId>
<artifactId>tracing</artifactId>
- <version>1.0.0</version>
+ <version>1.1.0</version>
<scope>compile</scope>
+
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
<scope>compile</scope>
+
</dependency>
</dependencies>
</project>
diff --git a/common/androidx-test/androidx/test/services/storage/1.4.2/storage-1.4.2-sources.jar b/common/androidx-test/androidx/test/services/storage/1.4.2/storage-1.4.2-sources.jar
deleted file mode 100644
index 56d815d..0000000
--- a/common/androidx-test/androidx/test/services/storage/1.4.2/storage-1.4.2-sources.jar
+++ /dev/null
Binary files differ
diff --git a/common/androidx-test/androidx/test/services/storage/1.4.2/storage-1.4.2.aar b/common/androidx-test/androidx/test/services/storage/1.4.2/storage-1.4.2.aar
deleted file mode 100644
index 59a57ea..0000000
--- a/common/androidx-test/androidx/test/services/storage/1.4.2/storage-1.4.2.aar
+++ /dev/null
Binary files differ
diff --git a/common/androidx-test/androidx/test/services/storage/1.5.0-alpha02/storage-1.5.0-alpha02-sources.jar b/common/androidx-test/androidx/test/services/storage/1.5.0-alpha02/storage-1.5.0-alpha02-sources.jar
new file mode 100644
index 0000000..b4a44f3
--- /dev/null
+++ b/common/androidx-test/androidx/test/services/storage/1.5.0-alpha02/storage-1.5.0-alpha02-sources.jar
Binary files differ
diff --git a/common/androidx-test/androidx/test/services/storage/1.5.0-alpha02/storage-1.5.0-alpha02.aar b/common/androidx-test/androidx/test/services/storage/1.5.0-alpha02/storage-1.5.0-alpha02.aar
new file mode 100644
index 0000000..fbb51ca
--- /dev/null
+++ b/common/androidx-test/androidx/test/services/storage/1.5.0-alpha02/storage-1.5.0-alpha02.aar
Binary files differ
diff --git a/common/androidx-test/androidx/test/services/storage/1.4.2/storage-1.4.2.pom b/common/androidx-test/androidx/test/services/storage/1.5.0-alpha02/storage-1.5.0-alpha02.pom
similarity index 82%
rename from common/androidx-test/androidx/test/services/storage/1.4.2/storage-1.4.2.pom
rename to common/androidx-test/androidx/test/services/storage/1.5.0-alpha02/storage-1.5.0-alpha02.pom
index 8685d29..a50ad75 100644
--- a/common/androidx-test/androidx/test/services/storage/1.4.2/storage-1.4.2.pom
+++ b/common/androidx-test/androidx/test/services/storage/1.5.0-alpha02/storage-1.5.0-alpha02.pom
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>androidx.test.services</groupId>
<artifactId>storage</artifactId>
- <version>1.4.2</version>
+ <version>1.5.0-alpha02</version>
<packaging>aar</packaging>
<name>AndroidX Test Library</name>
<description>The AndroidX Test Library provides an extensive framework for testing Android apps</description>
@@ -27,26 +27,23 @@
<dependency>
<groupId>androidx.annotation</groupId>
<artifactId>annotation</artifactId>
- <version>1.2.0</version>
+ <version>1.7.0-beta01</version>
<scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>androidx.test</groupId>
- <artifactId>monitor</artifactId>
- <version>[1.6.0]</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- <version>2.0.2</version>
- <scope>compile</scope>
+
</dependency>
<dependency>
<groupId>androidx.test</groupId>
<artifactId>annotation</artifactId>
- <version>1.0.1</version>
+ <version>1.1.0-alpha02</version>
<scope>compile</scope>
+
+ </dependency>
+ <dependency>
+ <groupId>androidx.test</groupId>
+ <artifactId>monitor</artifactId>
+ <version>1.7.0-alpha03</version>
+ <scope>compile</scope>
+
</dependency>
</dependencies>
</project>
diff --git a/common/androidx-test/androidx/test/services/test-services/1.4.2/test-services-1.4.2.apk b/common/androidx-test/androidx/test/services/test-services/1.4.2/test-services-1.4.2.apk
deleted file mode 100644
index 86aeb40..0000000
--- a/common/androidx-test/androidx/test/services/test-services/1.4.2/test-services-1.4.2.apk
+++ /dev/null
Binary files differ
diff --git a/common/androidx-test/androidx/test/services/test-services/1.5.0-alpha02/test-services-1.5.0-alpha02.apk b/common/androidx-test/androidx/test/services/test-services/1.5.0-alpha02/test-services-1.5.0-alpha02.apk
new file mode 100644
index 0000000..48a63a5
--- /dev/null
+++ b/common/androidx-test/androidx/test/services/test-services/1.5.0-alpha02/test-services-1.5.0-alpha02.apk
Binary files differ
diff --git a/common/androidx-test/androidx/test/services/test-services/1.4.2/test-services-1.4.2.pom b/common/androidx-test/androidx/test/services/test-services/1.5.0-alpha02/test-services-1.5.0-alpha02.pom
similarity index 96%
rename from common/androidx-test/androidx/test/services/test-services/1.4.2/test-services-1.4.2.pom
rename to common/androidx-test/androidx/test/services/test-services/1.5.0-alpha02/test-services-1.5.0-alpha02.pom
index b01b811..b6dddb0 100644
--- a/common/androidx-test/androidx/test/services/test-services/1.4.2/test-services-1.4.2.pom
+++ b/common/androidx-test/androidx/test/services/test-services/1.5.0-alpha02/test-services-1.5.0-alpha02.pom
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>androidx.test.services</groupId>
<artifactId>test-services</artifactId>
- <version>1.4.2</version>
+ <version>1.5.0-alpha02</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/manifests/androidx.test.annotation/AndroidManifest.xml b/common/androidx-test/manifests/androidx.test.annotation/AndroidManifest.xml
index da6d25a..9123286 100644
--- a/common/androidx-test/manifests/androidx.test.annotation/AndroidManifest.xml
+++ b/common/androidx-test/manifests/androidx.test.annotation/AndroidManifest.xml
@@ -18,7 +18,7 @@
package="androidx.test.annotation" >
<uses-sdk
- android:minSdkVersion="14"
- android:targetSdkVersion="30" />
+ android:minSdkVersion="19"
+ android:targetSdkVersion="34" />
</manifest>
\ No newline at end of file
diff --git a/common/androidx-test/manifests/androidx.test.core/AndroidManifest.xml b/common/androidx-test/manifests/androidx.test.core/AndroidManifest.xml
index 3f114f7..dc53bf6 100644
--- a/common/androidx-test/manifests/androidx.test.core/AndroidManifest.xml
+++ b/common/androidx-test/manifests/androidx.test.core/AndroidManifest.xml
@@ -18,7 +18,7 @@
package="androidx.test.core" >
<uses-sdk
- android:minSdkVersion="14"
+ android:minSdkVersion="19"
android:targetSdkVersion="28" />
<uses-permission android:name="android.permission.REORDER_TASKS" />
diff --git a/common/androidx-test/manifests/androidx.test.espresso.accessibility/AndroidManifest.xml b/common/androidx-test/manifests/androidx.test.espresso.accessibility/AndroidManifest.xml
index b04d2b6..279abbd 100644
--- a/common/androidx-test/manifests/androidx.test.espresso.accessibility/AndroidManifest.xml
+++ b/common/androidx-test/manifests/androidx.test.espresso.accessibility/AndroidManifest.xml
@@ -18,8 +18,8 @@
package="androidx.test.espresso.accessibility" >
<uses-sdk
- android:minSdkVersion="14"
- android:targetSdkVersion="28" />
+ android:minSdkVersion="19"
+ android:targetSdkVersion="34" />
<application />
diff --git a/common/androidx-test/manifests/androidx.test.espresso.contrib/AndroidManifest.xml b/common/androidx-test/manifests/androidx.test.espresso.contrib/AndroidManifest.xml
index 602c3d3..03488c6 100644
--- a/common/androidx-test/manifests/androidx.test.espresso.contrib/AndroidManifest.xml
+++ b/common/androidx-test/manifests/androidx.test.espresso.contrib/AndroidManifest.xml
@@ -18,8 +18,8 @@
package="androidx.test.espresso.contrib" >
<uses-sdk
- android:minSdkVersion="14"
- android:targetSdkVersion="28" />
+ android:minSdkVersion="19"
+ android:targetSdkVersion="34" />
<application />
diff --git a/common/androidx-test/manifests/androidx.test.espresso.core/AndroidManifest.xml b/common/androidx-test/manifests/androidx.test.espresso.core/AndroidManifest.xml
index 82f8cb0..cd5c1f6 100644
--- a/common/androidx-test/manifests/androidx.test.espresso.core/AndroidManifest.xml
+++ b/common/androidx-test/manifests/androidx.test.espresso.core/AndroidManifest.xml
@@ -18,7 +18,7 @@
package="androidx.test.espresso.core" >
<uses-sdk
- android:minSdkVersion="14"
- android:targetSdkVersion="28" />
+ android:minSdkVersion="19"
+ android:targetSdkVersion="34" />
</manifest>
\ No newline at end of file
diff --git a/common/androidx-test/manifests/androidx.test.espresso.idling-resource/AndroidManifest.xml b/common/androidx-test/manifests/androidx.test.espresso.idling-resource/AndroidManifest.xml
index 7a50129..d64ec84 100644
--- a/common/androidx-test/manifests/androidx.test.espresso.idling-resource/AndroidManifest.xml
+++ b/common/androidx-test/manifests/androidx.test.espresso.idling-resource/AndroidManifest.xml
@@ -18,7 +18,7 @@
package="androidx.test.espresso.idling.resource" >
<uses-sdk
- android:minSdkVersion="14"
- android:targetSdkVersion="28" />
+ android:minSdkVersion="19"
+ android:targetSdkVersion="34" />
</manifest>
\ No newline at end of file
diff --git a/common/androidx-test/manifests/androidx.test.espresso.intents/AndroidManifest.xml b/common/androidx-test/manifests/androidx.test.espresso.intents/AndroidManifest.xml
index 4794b77..6ea9934 100644
--- a/common/androidx-test/manifests/androidx.test.espresso.intents/AndroidManifest.xml
+++ b/common/androidx-test/manifests/androidx.test.espresso.intents/AndroidManifest.xml
@@ -18,7 +18,7 @@
package="androidx.test.espresso.intent" >
<uses-sdk
- android:minSdkVersion="14"
- android:targetSdkVersion="28" />
+ android:minSdkVersion="19"
+ android:targetSdkVersion="34" />
</manifest>
\ No newline at end of file
diff --git a/common/androidx-test/manifests/androidx.test.espresso.web/AndroidManifest.xml b/common/androidx-test/manifests/androidx.test.espresso.web/AndroidManifest.xml
index e258c4c..5d55d2e 100644
--- a/common/androidx-test/manifests/androidx.test.espresso.web/AndroidManifest.xml
+++ b/common/androidx-test/manifests/androidx.test.espresso.web/AndroidManifest.xml
@@ -18,7 +18,7 @@
package="androidx.test.espresso.web" >
<uses-sdk
- android:minSdkVersion="14"
- android:targetSdkVersion="28" />
+ android:minSdkVersion="19"
+ android:targetSdkVersion="34" />
</manifest>
\ No newline at end of file
diff --git a/common/androidx-test/manifests/androidx.test.ext.junit/AndroidManifest.xml b/common/androidx-test/manifests/androidx.test.ext.junit/AndroidManifest.xml
index ed2316c..3b7c422 100644
--- a/common/androidx-test/manifests/androidx.test.ext.junit/AndroidManifest.xml
+++ b/common/androidx-test/manifests/androidx.test.ext.junit/AndroidManifest.xml
@@ -18,7 +18,7 @@
package="androidx.test.ext.junit" >
<uses-sdk
- android:minSdkVersion="14"
- android:targetSdkVersion="28" />
+ android:minSdkVersion="19"
+ android:targetSdkVersion="34" />
</manifest>
\ No newline at end of file
diff --git a/common/androidx-test/manifests/androidx.test.ext.truth/AndroidManifest.xml b/common/androidx-test/manifests/androidx.test.ext.truth/AndroidManifest.xml
index 910000a..2ba183e 100644
--- a/common/androidx-test/manifests/androidx.test.ext.truth/AndroidManifest.xml
+++ b/common/androidx-test/manifests/androidx.test.ext.truth/AndroidManifest.xml
@@ -18,7 +18,7 @@
package="androidx.test.ext.truth" >
<uses-sdk
- android:minSdkVersion="14"
- android:targetSdkVersion="28" />
+ android:minSdkVersion="19"
+ android:targetSdkVersion="34" />
</manifest>
\ No newline at end of file
diff --git a/common/androidx-test/manifests/androidx.test.monitor/AndroidManifest.xml b/common/androidx-test/manifests/androidx.test.monitor/AndroidManifest.xml
index 2cffb5c..a4fc11f 100644
--- a/common/androidx-test/manifests/androidx.test.monitor/AndroidManifest.xml
+++ b/common/androidx-test/manifests/androidx.test.monitor/AndroidManifest.xml
@@ -18,7 +18,7 @@
package="androidx.test.monitor" >
<uses-sdk
- android:minSdkVersion="14"
- android:targetSdkVersion="28" />
+ android:minSdkVersion="19"
+ android:targetSdkVersion="34" />
</manifest>
\ No newline at end of file
diff --git a/common/androidx-test/manifests/androidx.test.rules/AndroidManifest.xml b/common/androidx-test/manifests/androidx.test.rules/AndroidManifest.xml
index 654fd76..9aecef9 100644
--- a/common/androidx-test/manifests/androidx.test.rules/AndroidManifest.xml
+++ b/common/androidx-test/manifests/androidx.test.rules/AndroidManifest.xml
@@ -18,7 +18,7 @@
package="androidx.test.rules" >
<uses-sdk
- android:minSdkVersion="14"
- android:targetSdkVersion="28" />
+ android:minSdkVersion="19"
+ android:targetSdkVersion="34" />
</manifest>
\ No newline at end of file
diff --git a/common/androidx-test/manifests/androidx.test.runner/AndroidManifest.xml b/common/androidx-test/manifests/androidx.test.runner/AndroidManifest.xml
index 11755b3..94f4a6c 100644
--- a/common/androidx-test/manifests/androidx.test.runner/AndroidManifest.xml
+++ b/common/androidx-test/manifests/androidx.test.runner/AndroidManifest.xml
@@ -18,7 +18,7 @@
package="androidx.test.runner" >
<uses-sdk
- android:minSdkVersion="14"
+ android:minSdkVersion="19"
android:targetSdkVersion="30" />
<queries>
diff --git a/common/androidx-test/manifests/androidx.test.services.storage/AndroidManifest.xml b/common/androidx-test/manifests/androidx.test.services.storage/AndroidManifest.xml
index 7fdecc5..1b55ef1 100644
--- a/common/androidx-test/manifests/androidx.test.services.storage/AndroidManifest.xml
+++ b/common/androidx-test/manifests/androidx.test.services.storage/AndroidManifest.xml
@@ -18,7 +18,7 @@
package="androidx.test.services.storage" >
<uses-sdk
- android:minSdkVersion="14"
+ android:minSdkVersion="19"
android:targetSdkVersion="30" />
</manifest>
\ No newline at end of file
diff --git a/common/androidx-test/prepend-license.txt b/common/androidx-test/prepend-license.txt
index 8c4065d..28b4889 100644
--- a/common/androidx-test/prepend-license.txt
+++ b/common/androidx-test/prepend-license.txt
@@ -4,8 +4,9 @@
filegroup {
name: "test-services.apk",
- srcs: ["androidx/test/services/test-services/1.4.2/test-services-1.4.2.apk",],
- path: "androidx/test/services/test-services/1.4.2",
+ srcs:
+ ["androidx/test/services/test-services/1.5.0-alpha02/test-services-1.5.0-alpha02.apk",],
+ path: "androidx/test/services/test-services/1.5.0-alpha02",
visibility: [
"//tools/tradefederation/core:__pkg__",
],
diff --git a/common/androidx-test/update-from-gmaven.py b/common/androidx-test/update-from-gmaven.py
index 650b4b6..c193892 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"
-monitorVersion="1.6.1"
-runnerVersion="1.5.3-alpha01"
-rulesVersion="1.5.0"
-espressoVersion="3.5.1"
-coreVersion="1.5.0"
-extJUnitVersion="1.1.5"
-extTruthVersion="1.5.0"
-servicesVersion="1.4.2"
+annotationVersion="1.1.0-alpha02"
+monitorVersion="1.7.0-alpha03"
+runnerVersion="1.6.0-alpha05"
+rulesVersion="1.6.0-alpha02"
+espressoVersion="3.6.0-alpha02"
+coreVersion="1.6.0-alpha04"
+extJUnitVersion="1.2.0-alpha02"
+extTruthVersion="1.6.0-alpha02"
+servicesVersion="1.5.0-alpha02"
jankTestHelperVersion="1.0.1"
mavenToBpPatternMap = {
@@ -145,6 +145,7 @@
"-rewrite androidx.lifecycle:lifecycle-common=androidx.lifecycle_lifecycle-common " +
"-rewrite androidx.annotation:annotation=androidx.annotation_annotation " +
"-rewrite org.hamcrest:hamcrest-integration=hamcrest " +
+ "-rewrite org.hamcrest:hamcrest-core=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 " +
@@ -152,6 +153,7 @@
"-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 " +
+ "-rewrite androidx.appcompat:appcompat=androidx.appcompat_appcompat " +
"-sdk-version current " +
"-static-deps " +
"-prepend prepend-license.txt " +
diff --git a/common/atf/Android.bp b/common/atf/Android.bp
index 737af6b..55a9e48 100644
--- a/common/atf/Android.bp
+++ b/common/atf/Android.bp
@@ -35,14 +35,14 @@
}
java_import {
- name: "atf-prebuilt-jars-502584086",
+ name: "atf-prebuilt-jars-557133692",
host_supported: true,
jars: [
- "atf_classes_502584086.jar",
+ "atf_classes_557133692.jar",
],
}
java_library_host {
- name: "atf-prebuilt-502584086",
- static_libs: ["atf-prebuilt-jars-502584086"],
+ name: "atf-prebuilt-557133692",
+ static_libs: ["atf-prebuilt-jars-557133692"],
}
diff --git a/common/atf/PREBUILT b/common/atf/PREBUILT
index 8b192df..7af8ddd 100644
--- a/common/atf/PREBUILT
+++ b/common/atf/PREBUILT
@@ -1,2 +1,2 @@
-atf-classes.jar was built from g3 synced @502584086
+atf-classes.jar was built from g3 synced @557133692
go/atf_jar_to_studio_prebuilt
diff --git a/common/atf/atf_classes_502584086.jar b/common/atf/atf_classes_502584086.jar
deleted file mode 100644
index 778c09a..0000000
--- a/common/atf/atf_classes_502584086.jar
+++ /dev/null
Binary files differ
diff --git a/common/atf/atf_classes_557133692.jar b/common/atf/atf_classes_557133692.jar
new file mode 100644
index 0000000..29e3d83
--- /dev/null
+++ b/common/atf/atf_classes_557133692.jar
Binary files differ
diff --git a/common/flickerlib/Android.bp b/common/flickerlib/Android.bp
new file mode 100644
index 0000000..e3f3140
--- /dev/null
+++ b/common/flickerlib/Android.bp
@@ -0,0 +1,27 @@
+//
+// Copyright (C) 2023 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_library {
+ name: "flickerlib-trace_processor_shell",
+ asset_dirs: [
+ "trace_processor_shell",
+ ],
+ manifest: "trace_processor_shell/AndroidManifest.xml",
+}
diff --git a/common/flickerlib/trace_processor_shell/AndroidManifest.xml b/common/flickerlib/trace_processor_shell/AndroidManifest.xml
new file mode 100644
index 0000000..7cfbe89
--- /dev/null
+++ b/common/flickerlib/trace_processor_shell/AndroidManifest.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ * Copyright 2023 Google Inc. All Rights Reserved.
+ -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="android.tools">
+</manifest>
diff --git a/common/flickerlib/trace_processor_shell/trace_processor_shell_aarch64 b/common/flickerlib/trace_processor_shell/trace_processor_shell_aarch64
new file mode 100755
index 0000000..a582926
--- /dev/null
+++ b/common/flickerlib/trace_processor_shell/trace_processor_shell_aarch64
Binary files differ
diff --git a/common/flickerlib/trace_processor_shell/trace_processor_shell_x86 b/common/flickerlib/trace_processor_shell/trace_processor_shell_x86
new file mode 100755
index 0000000..a168157
--- /dev/null
+++ b/common/flickerlib/trace_processor_shell/trace_processor_shell_x86
Binary files differ
diff --git a/common/flickerlib/trace_processor_shell/trace_processor_shell_x86_64 b/common/flickerlib/trace_processor_shell/trace_processor_shell_x86_64
new file mode 100755
index 0000000..a857ccd
--- /dev/null
+++ b/common/flickerlib/trace_processor_shell/trace_processor_shell_x86_64
Binary files differ
diff --git a/common/jacoco/Android.bp b/common/jacoco/Android.bp
index b7fc330..f85d428 100644
--- a/common/jacoco/Android.bp
+++ b/common/jacoco/Android.bp
@@ -33,7 +33,7 @@
java_import_host {
name: "jvm-jacoco-report",
jars: [
- "lib/org.jacoco.core-0.8.0.201801022044.jar",
- "lib/org.jacoco.report-0.8.0.201801022044.jar",
+ "lib/org.jacoco.core-0.8.8.202204050719.jar",
+ "lib/org.jacoco.report-0.8.8.202204050719.jar",
],
}
diff --git a/common/jacoco/build.gradle b/common/jacoco/build.gradle
index ae2fb4d..6c5ae45 100644
--- a/common/jacoco/build.gradle
+++ b/common/jacoco/build.gradle
@@ -3,9 +3,18 @@
sourceCompatibility = 1.8
-def jacocoVersion = "0.7.2.201409121644"
+def jacocoVersion = "0.8.8.202204050719"
+def asmVersion = "9.2"
+
dependencies {
- compile files("lib/asm-debug-all-5.0.1.jar")
- compile files("lib/org.jacoco.core-${jacocoVersion}.jar", "lib/org.jacoco.report-${jacocoVersion}.jar")
- compile files("../commons-cli/commons-cli-1.2.jar")
+ implementation files("../asm/asm-analysis-${asmVersion}.jar")
+ implementation files("../asm/asm-common-${asmVersion}.jar")
+ implementation files("../asm/asm-${asmVersion}.jar")
+ implementation files("../asm/asm-tree-${asmVersion}.jar")
+ implementation files("../asm/asm-util-${asmVersion}.jar")
+
+ implementation files("lib/org.jacoco.core-${jacocoVersion}.jar")
+ implementation files("lib/org.jacoco.report-${jacocoVersion}.jar")
+
+ implementation files("../commons-cli/commons-cli-1.2.jar")
}
diff --git a/common/jacoco/lib/NOTICE.txt b/common/jacoco/lib/NOTICE.txt
index 336f1f7..0656a7a 100644
--- a/common/jacoco/lib/NOTICE.txt
+++ b/common/jacoco/lib/NOTICE.txt
@@ -1,12 +1,12 @@
License
-Copyright © 2009, 2016 Mountainminds GmbH & Co. KG and Contributors
+Copyright © 2009, 2022 Mountainminds GmbH & Co. KG and Contributors
The JaCoCo Java Code Coverage Library and all included documentation is made
available by Mountainminds GmbH & Co. KG, Munich. Except indicated below, the
Content is provided to you under the terms and conditions of the Eclipse Public
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this Content and
-is also available at http://www.eclipse.org/legal/epl-v10.html.
+License Version 2.0 ("EPL"). A copy of the EPL is provided with this Content and
+is also available at https://www.eclipse.org/legal/epl-2.0/.
Trademarks
@@ -23,11 +23,35 @@
The Content includes items that have been sourced from third parties as set out
below.
+args4j
+args4j 2.0.28 is subject to the terms and conditions of the following license:
+
+Copyright (c) 2013 Kohsuke Kawaguchi and other contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
ASM
-ASM is subject to the terms and conditions of the following license:
+ASM 9.3 is subject to the terms and conditions of the following license:
-Copyright (c) 2012 France Télécom
+ASM: a very small and fast Java bytecode manipulation framework
+Copyright (c) 2000-2011 INRIA, France Telecom
All rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -56,9 +80,12 @@
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
THE POSSIBILITY OF SUCH DAMAGE.
+
Google Code Prettify
-Google Code Prettify is subject to the terms and conditions of the following license:
+Google Code Prettify 2010/07/21 is subject to the terms and conditions of the following license:
+
+Copyright 2011 Mike Samuel et al
Apache License
Version 2.0, January 2004
@@ -233,4 +260,4 @@
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
+ of your accepting any such warranty or additional liability.
\ No newline at end of file
diff --git a/common/jacoco/lib/README b/common/jacoco/lib/README
index bad94cd..e40fa55 100644
--- a/common/jacoco/lib/README
+++ b/common/jacoco/lib/README
@@ -1,6 +1,6 @@
This directory contains JAR files from the distribution of JaCoCo
-(http://eclemma.org/jacoco/), version 0.8.0.
+(http://eclemma.org/jacoco/), version 0.8.8.
-URL: http://search.maven.org/remotecontent?filepath=org/jacoco/jacoco/0.8.0/jacoco-0.8.0.zip
+URL: https://github.com/jacoco/jacoco/releases/download/v0.8.8/jacoco-0.8.8.zip
Only the files that are needed have been included here.
diff --git a/common/jacoco/lib/jacocoagent.jar b/common/jacoco/lib/jacocoagent.jar
index e1b0fa0..7799b3c 100644
--- a/common/jacoco/lib/jacocoagent.jar
+++ b/common/jacoco/lib/jacocoagent.jar
Binary files differ
diff --git a/common/jacoco/lib/org.jacoco.core-0.8.0.201801022044.jar b/common/jacoco/lib/org.jacoco.core-0.8.0.201801022044.jar
deleted file mode 100644
index 55335c2..0000000
--- a/common/jacoco/lib/org.jacoco.core-0.8.0.201801022044.jar
+++ /dev/null
Binary files differ
diff --git a/common/jacoco/lib/org.jacoco.core-0.8.8.202204050719.jar b/common/jacoco/lib/org.jacoco.core-0.8.8.202204050719.jar
new file mode 100644
index 0000000..bbccce1
--- /dev/null
+++ b/common/jacoco/lib/org.jacoco.core-0.8.8.202204050719.jar
Binary files differ
diff --git a/common/jacoco/lib/org.jacoco.report-0.8.0.201801022044.jar b/common/jacoco/lib/org.jacoco.report-0.8.0.201801022044.jar
deleted file mode 100644
index f02e4a5..0000000
--- a/common/jacoco/lib/org.jacoco.report-0.8.0.201801022044.jar
+++ /dev/null
Binary files differ
diff --git a/common/jacoco/lib/org.jacoco.report-0.8.8.202204050719.jar b/common/jacoco/lib/org.jacoco.report-0.8.8.202204050719.jar
new file mode 100644
index 0000000..ccb60c8
--- /dev/null
+++ b/common/jacoco/lib/org.jacoco.report-0.8.8.202204050719.jar
Binary files differ
diff --git a/common/jacoco/src/main/java/com/google/android/jacoco/reporter/ReportGenerator.java b/common/jacoco/src/main/java/com/google/android/jacoco/reporter/ReportGenerator.java
index 9b5be53..e4e8134 100644
--- a/common/jacoco/src/main/java/com/google/android/jacoco/reporter/ReportGenerator.java
+++ b/common/jacoco/src/main/java/com/google/android/jacoco/reporter/ReportGenerator.java
@@ -32,12 +32,12 @@
import org.jacoco.report.MultiSourceFileLocator;
import org.jacoco.report.html.HTMLFormatter;
import org.jacoco.report.xml.XMLFormatter;
-import org.objectweb.asm.ClassReader;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
import java.util.jar.JarFile;
@@ -80,13 +80,18 @@
CoverageBuilder coverageBuilder = new CoverageBuilder();
Analyzer analyzer = new Analyzer(dataStore, coverageBuilder) {
@Override
- public void analyzeClass(ClassReader reader) {
- if (weHaveSourceFor(reader.getClassName(), "java")
- || weHaveSourceFor(reader.getClassName(), "kt")) {
- super.analyzeClass(reader);
+ public void analyzeClass(InputStream input, String location) throws IOException {
+ String className = parseClassName(location);
+ if (weHaveSourceFor(className, "java")
+ || weHaveSourceFor(className, "kt")) {
+ super.analyzeClass(input, location);
}
}
+ private String parseClassName(String location) {
+ return location.substring(location.indexOf('@') + 1, location.lastIndexOf('.'));
+ }
+
private boolean weHaveSourceFor(String asmClassName, String fileExtension) {
String fileName = asmClassName.replaceFirst("\\$.*", "") + "." + fileExtension;
return mConfig.mSourceDirs.stream().map(parent -> new File(parent, fileName))
diff --git a/common/layoutlib_api/PREBUILT b/common/layoutlib_api/PREBUILT
index 808b00b..57fe593 100644
--- a/common/layoutlib_api/PREBUILT
+++ b/common/layoutlib_api/PREBUILT
@@ -1 +1 @@
-layoutlib_api-prebuilt.jar was built from tools/base/layoutlib-api@f1bb3e54d35bccab59c2d768949ad0194d8ff554
+layoutlib_api-prebuilt.jar was built from tools/base/layoutlib-api@da3ca56264001b0bc872f37d957eab63a353f505
diff --git a/common/layoutlib_api/layoutlib_api-prebuilt.jar b/common/layoutlib_api/layoutlib_api-prebuilt.jar
index b8d9900..5a96562 100644
--- a/common/layoutlib_api/layoutlib_api-prebuilt.jar
+++ b/common/layoutlib_api/layoutlib_api-prebuilt.jar
Binary files differ
diff --git a/common/layoutlib_api/layoutlib_api-sources.jar b/common/layoutlib_api/layoutlib_api-sources.jar
index 3face8e..0e00094 100644
--- a/common/layoutlib_api/layoutlib_api-sources.jar
+++ b/common/layoutlib_api/layoutlib_api-sources.jar
Binary files differ
diff --git a/common/ninepatch/PREBUILT b/common/ninepatch/PREBUILT
index e9ffb8a..70eee2a 100644
--- a/common/ninepatch/PREBUILT
+++ b/common/ninepatch/PREBUILT
@@ -1 +1 @@
-ninepatch-prebuilt.jar was built from tools/base/ninepatch@3b90595ff0560171cab53fdd1a2be41e34d15ad3
+ninepatch-prebuilt.jar was built from tools/base/ninepatch@da3ca56264001b0bc872f37d957eab63a353f505
diff --git a/common/ninepatch/ninepatch-prebuilt-sources.jar b/common/ninepatch/ninepatch-prebuilt-sources.jar
index d8f864f..dce3b04 100644
--- a/common/ninepatch/ninepatch-prebuilt-sources.jar
+++ b/common/ninepatch/ninepatch-prebuilt-sources.jar
Binary files differ
diff --git a/common/ninepatch/ninepatch-prebuilt.jar b/common/ninepatch/ninepatch-prebuilt.jar
index 3cc3231..c6d1940 100644
--- a/common/ninepatch/ninepatch-prebuilt.jar
+++ b/common/ninepatch/ninepatch-prebuilt.jar
Binary files differ
diff --git a/common/sdk-common/PREBUILT b/common/sdk-common/PREBUILT
index 61e06fe..ba552ba 100644
--- a/common/sdk-common/PREBUILT
+++ b/common/sdk-common/PREBUILT
@@ -1 +1 @@
-sdk-common.jar was built from tools/base/sdk-common@f1bb3e54d35bccab59c2d768949ad0194d8ff554
+sdk-common.jar was built from tools/base/sdk-common@da3ca56264001b0bc872f37d957eab63a353f505
diff --git a/common/sdk-common/sdk-common-sources.jar b/common/sdk-common/sdk-common-sources.jar
index 04af9c7..ac3f492 100644
--- a/common/sdk-common/sdk-common-sources.jar
+++ b/common/sdk-common/sdk-common-sources.jar
Binary files differ
diff --git a/common/sdk-common/sdk-common.jar b/common/sdk-common/sdk-common.jar
index ad268ab..e0b6c5c 100644
--- a/common/sdk-common/sdk-common.jar
+++ b/common/sdk-common/sdk-common.jar
Binary files differ
diff --git a/common/tools-common/PREBUILT b/common/tools-common/PREBUILT
index 60243d6..90672b7 100644
--- a/common/tools-common/PREBUILT
+++ b/common/tools-common/PREBUILT
@@ -1 +1 @@
-tools-common-prebuilt.jar was built from tools/base/common@c5da0d598105d64762ec3bdea7f7efb3002717c7
+tools-common-prebuilt.jar was built from tools/base/common@da3ca56264001b0bc872f37d957eab63a353f505
diff --git a/common/tools-common/tools-common-prebuilt-sources.jar b/common/tools-common/tools-common-prebuilt-sources.jar
index b8aab23..267e7c3 100644
--- a/common/tools-common/tools-common-prebuilt-sources.jar
+++ b/common/tools-common/tools-common-prebuilt-sources.jar
Binary files differ
diff --git a/common/tools-common/tools-common-prebuilt.jar b/common/tools-common/tools-common-prebuilt.jar
index 0746c36..ab4026a 100644
--- a/common/tools-common/tools-common-prebuilt.jar
+++ b/common/tools-common/tools-common-prebuilt.jar
Binary files differ
