diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-03-15 18:21:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-03-15 18:21:04 +0000 |
| commit | 0f47ba045d73e0142d7f9484288d9bf3a2cc1e8b (patch) | |
| tree | 68cf9fd55ab2d84bec945402470262bdfe025d9b | |
| parent | 229f86322c58126a1e59a043f2c843c76dbcdf16 (diff) | |
| parent | f21505cba1ff52760bed3645974ccdec982e6f16 (diff) | |
| download | misc-build-tools-release.tar.gz | |
Merge "Snap for 11582845 from dbaa6d8d4950aa9087d75a88b77dee625871efc3 to build-tools-release" into build-tools-releasebuild-tools-release
121 files changed, 800 insertions, 346 deletions
diff --git a/common/androidx-media3/Android.bp b/common/androidx-media3/Android.bp index 1b88a8c9..ab5fab2b 100644 --- a/common/androidx-media3/Android.bp +++ b/common/androidx-media3/Android.bp @@ -9,6 +9,7 @@ library_visibility = [ "//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 23badd15..eb710e4e 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 @@ filegroup { 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 @@ android_library_import { ], min_sdk_version: "19", static_libs: [ - "androidx.annotation_annotation", "androidx.annotation_annotation-experimental", + "androidx.annotation_annotation", ], } @@ -40,15 +40,15 @@ android_library { 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", + java_version: "1.8", } 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 @@ android_library_import { 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 @@ android_library { 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", + java_version: "1.8", } 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 @@ android_library_import { min_sdk_version: "19", static_libs: [ "accessibility-test-framework", + "hamcrest", + "hamcrest-library", "androidx.test.espresso.core", ], } @@ -117,14 +121,16 @@ android_library { static_libs: [ "androidx.test.espresso.accessibility-nodeps", "accessibility-test-framework", + "hamcrest", + "hamcrest-library", "androidx.test.espresso.core", ], - java_version: "1.7", + java_version: "1.8", } 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 @@ android_library_import { ], min_sdk_version: "19", static_libs: [ - "com.google.android.material_material", - "androidx.recyclerview_recyclerview", + "androidx.appcompat_appcompat", + "androidx.core_core", "androidx.drawerlayout_drawerlayout", + "androidx.recyclerview_recyclerview", "androidx.viewpager_viewpager", - "androidx.core_core", - "androidx.legacy_legacy-support-core-utils", "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 @@ android_library { manifest: "manifests/androidx.test.espresso.contrib/AndroidManifest.xml", static_libs: [ "androidx.test.espresso.contrib-nodeps", - "com.google.android.material_material", - "androidx.recyclerview_recyclerview", + "androidx.appcompat_appcompat", + "androidx.core_core", "androidx.drawerlayout_drawerlayout", + "androidx.recyclerview_recyclerview", "androidx.viewpager_viewpager", - "androidx.core_core", - "androidx.legacy_legacy-support-core-utils", "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", + java_version: "1.8", } 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 @@ android_library_import { min_sdk_version: "19", static_libs: [ "androidx.annotation_annotation", - "javawriter", + "androidx.concurrent_concurrent-futures", + "jsr305", + "error_prone_annotations", + "guava-listenablefuture-prebuilt-jar", "jsr330", - "hamcrest-library", + "junit", "hamcrest", - "jsr305", + "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 @@ android_library { static_libs: [ "androidx.test.espresso.core-nodeps", "androidx.annotation_annotation", - "javawriter", + "androidx.concurrent_concurrent-futures", + "jsr305", + "error_prone_annotations", + "guava-listenablefuture-prebuilt-jar", "jsr330", - "hamcrest-library", + "junit", "hamcrest", - "jsr305", + "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", + java_version: "1.8", } 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", @@ -243,12 +263,12 @@ android_library { static_libs: [ "androidx.test.espresso.idling-resource-nodeps", ], - java_version: "1.7", + java_version: "1.8", } 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 @@ android_library_import { ], 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 @@ android_library { 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", + java_version: "1.8", } 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 @@ android_library_import { 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 @@ android_library { 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", + java_version: "1.8", } 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 @@ android_library_import { ], min_sdk_version: "19", static_libs: [ - "junit", "androidx.annotation_annotation", + "junit", + "kotlin-stdlib", + "androidx.test.services.storage", "androidx.test.core", "androidx.test.monitor", ], @@ -346,17 +398,19 @@ android_library { 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", ], - java_version: "1.7", + java_version: "1.8", } 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 @@ android_library_import { ], min_sdk_version: "19", static_libs: [ + "androidx.annotation_annotation", "guava", "truth", - "androidx.annotation_annotation", - "androidx.test.core", "androidx.test.annotation", + "androidx.test.core", ], } @@ -383,13 +437,13 @@ android_library { 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", + java_version: "1.8", } android_library_import { @@ -421,12 +475,12 @@ android_library { "androidx.test.runner", "androidx.test.rules", ], - java_version: "1.7", + java_version: "1.8", } 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 @@ android_library_import { static_libs: [ "androidx.annotation_annotation", "androidx.tracing_tracing", + "kotlin-stdlib", "androidx.test.annotation", ], } @@ -453,14 +508,27 @@ android_library { "androidx.test.monitor-nodeps", "androidx.annotation_annotation", "androidx.tracing_tracing", + "kotlin-stdlib", "androidx.test.annotation", ], - java_version: "1.7", + java_version: "1.8", +} + +android_app_import { + name: "androidx.test.orchestrator", + apk: "androidx/test/orchestrator/1.5.0-alpha03/orchestrator-1.5.0-alpha03.apk", + apex_available: [ + "//apex_available:platform", + "//apex_available:anyapex", + ], + preprocessed: true, + presigned: true, + } 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 +536,10 @@ android_library_import { ], min_sdk_version: "19", static_libs: [ - "androidx.test.runner", + "androidx.annotation_annotation", + "junit", "androidx.test.annotation", + "androidx.test.runner", ], libs: [ "android.test.base", @@ -487,18 +557,20 @@ android_library { 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", ], - java_version: "1.7", + java_version: "1.8", } 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 +581,9 @@ android_library_import { "androidx.annotation_annotation", "androidx.tracing_tracing", "junit", + "androidx.test.services.storage", "androidx.test.annotation", "androidx.test.monitor", - "androidx.test.services.storage", ], } @@ -529,16 +601,16 @@ android_library { "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", + java_version: "1.8", } 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 +619,8 @@ android_library_import { min_sdk_version: "19", static_libs: [ "androidx.annotation_annotation", - "jsr305", - "androidx.test.monitor", "androidx.test.annotation", + "androidx.test.monitor", ], } @@ -565,20 +636,20 @@ android_library { static_libs: [ "androidx.test.services.storage-nodeps", "androidx.annotation_annotation", - "jsr305", - "androidx.test.monitor", "androidx.test.annotation", + "androidx.test.monitor", ], - java_version: "1.7", + java_version: "1.8", } 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 Binary files differdeleted file mode 100644 index 32dbe2ac..00000000 --- a/common/androidx-test/androidx/test/annotation/1.0.1/annotation-1.0.1-sources.jar +++ /dev/null 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 Binary files differdeleted file mode 100644 index 8a9a0585..00000000 --- a/common/androidx-test/androidx/test/annotation/1.0.1/annotation-1.0.1.aar +++ /dev/null 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 Binary files differnew file mode 100644 index 00000000..5c08af98 --- /dev/null +++ b/common/androidx-test/androidx/test/annotation/1.1.0-alpha02/annotation-1.1.0-alpha02-sources.jar 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 Binary files differnew file mode 100644 index 00000000..a2546358 --- /dev/null +++ b/common/androidx-test/androidx/test/annotation/1.1.0-alpha02/annotation-1.1.0-alpha02.aar 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 index 6ad42825..ea173e94 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> + <artifactId>annotation-experimental</artifactId> + <version>1.1.0</version> <scope>compile</scope> + </dependency> <dependency> <groupId>androidx.annotation</groupId> - <artifactId>annotation-experimental</artifactId> - <version>1.1.0</version> + <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 Binary files differdeleted file mode 100644 index 63564c27..00000000 --- a/common/androidx-test/androidx/test/core/1.5.0/core-1.5.0-sources.jar +++ /dev/null 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 Binary files differdeleted file mode 100644 index c8d04bad..00000000 --- a/common/androidx-test/androidx/test/core/1.5.0/core-1.5.0.aar +++ /dev/null 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 Binary files differnew file mode 100644 index 00000000..4e93a51b --- /dev/null +++ b/common/androidx-test/androidx/test/core/1.6.0-alpha04/core-1.6.0-alpha04-sources.jar 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 Binary files differnew file mode 100644 index 00000000..f5f2362a --- /dev/null +++ b/common/androidx-test/androidx/test/core/1.6.0-alpha04/core-1.6.0-alpha04.aar 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 index dc106dc0..297b5f08 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> + <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.4.2</version> + <version>1.5.0-alpha02</version> <scope>compile</scope> + </dependency> <dependency> - <groupId>androidx.lifecycle</groupId> - <artifactId>lifecycle-common</artifactId> - <version>2.3.1</version> + <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>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> + <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.aar b/common/androidx-test/androidx/test/espresso/espresso-accessibility/3.5.0-alpha07/espresso-accessibility-3.5.0-alpha07.aar Binary files differdeleted file mode 100644 index dc611497..00000000 --- a/common/androidx-test/androidx/test/espresso/espresso-accessibility/3.5.0-alpha07/espresso-accessibility-3.5.0-alpha07.aar +++ /dev/null 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.6.0-alpha02/espresso-accessibility-3.6.0-alpha02-sources.jar Binary files differindex cce88382..12083b0c 100644 --- 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.6.0-alpha02/espresso-accessibility-3.6.0-alpha02-sources.jar 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 Binary files differnew file mode 100644 index 00000000..641b8434 --- /dev/null +++ b/common/androidx-test/androidx/test/espresso/espresso-accessibility/3.6.0-alpha02/espresso-accessibility-3.6.0-alpha02.aar 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 index 70b1b59e..736337c8 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.aar b/common/androidx-test/androidx/test/espresso/espresso-contrib/3.5.1/espresso-contrib-3.5.1.aar Binary files differdeleted file mode 100644 index f7943162..00000000 --- a/common/androidx-test/androidx/test/espresso/espresso-contrib/3.5.1/espresso-contrib-3.5.1.aar +++ /dev/null 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.6.0-alpha02/espresso-contrib-3.6.0-alpha02-sources.jar Binary files differindex 6dcc4300..e16b3252 100644 --- 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.6.0-alpha02/espresso-contrib-3.6.0-alpha02-sources.jar 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 Binary files differnew file mode 100644 index 00000000..fc02dd0f --- /dev/null +++ b/common/androidx-test/androidx/test/espresso/espresso-contrib/3.6.0-alpha02/espresso-contrib-3.6.0-alpha02.aar 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 index 2fee32db..7403b259 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> + <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.drawerlayout</groupId> - <artifactId>drawerlayout</artifactId> - <version>1.1.1</version> + <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> + <groupId>com.google.android.apps.common.testing.accessibility.framework</groupId> + <artifactId>accessibility-test-framework</artifactId> + <version>3.1</version> <scope>compile</scope> + </dependency> <dependency> - <groupId>androidx.legacy</groupId> - <artifactId>legacy-support-core-utils</artifactId> - <version>1.0.0</version> + <groupId>com.google.android.material</groupId> + <artifactId>material</artifactId> + <version>1.4.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> + <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 Binary files differdeleted file mode 100644 index 53aec95b..00000000 --- a/common/androidx-test/androidx/test/espresso/espresso-core/3.5.1/espresso-core-3.5.1-sources.jar +++ /dev/null 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 Binary files differdeleted file mode 100644 index 11107dcd..00000000 --- a/common/androidx-test/androidx/test/espresso/espresso-core/3.5.1/espresso-core-3.5.1.aar +++ /dev/null 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 Binary files differnew file mode 100644 index 00000000..3d70aeb1 --- /dev/null +++ b/common/androidx-test/androidx/test/espresso/espresso-core/3.6.0-alpha02/espresso-core-3.6.0-alpha02-sources.jar 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 Binary files differnew file mode 100644 index 00000000..9fedf818 --- /dev/null +++ b/common/androidx-test/androidx/test/espresso/espresso-core/3.6.0-alpha02/espresso-core-3.6.0-alpha02.aar diff --git a/common/androidx-test/androidx/test/espresso/espresso-core/3.6.0-alpha02/espresso-core-3.6.0-alpha02.pom b/common/androidx-test/androidx/test/espresso/espresso-core/3.6.0-alpha02/espresso-core-3.6.0-alpha02.pom new file mode 100644 index 00000000..faecad6c --- /dev/null +++ b/common/androidx-test/androidx/test/espresso/espresso-core/3.6.0-alpha02/espresso-core-3.6.0-alpha02.pom @@ -0,0 +1,140 @@ +<?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-core</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> + <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.annotation</groupId> + <artifactId>annotation</artifactId> + <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-idling-resource</artifactId> + <version>3.6.0-alpha02</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>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.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-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 Binary files differdeleted file mode 100644 index 7ca56485..00000000 --- a/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.5.1/espresso-idling-resource-3.5.1-sources.jar +++ /dev/null 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 Binary files differdeleted file mode 100644 index 2a8f39a2..00000000 --- a/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.5.1/espresso-idling-resource-3.5.1.aar +++ /dev/null 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 Binary files differnew file mode 100644 index 00000000..077ee95d --- /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 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 Binary files differnew file mode 100644 index 00000000..c98fb9bb --- /dev/null +++ b/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.6.0-alpha02/espresso-idling-resource-3.6.0-alpha02.aar 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 index cd475d76..47cf87c1 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.aar b/common/androidx-test/androidx/test/espresso/espresso-intents/3.5.1/espresso-intents-3.5.1.aar Binary files differdeleted file mode 100644 index 864bac9c..00000000 --- a/common/androidx-test/androidx/test/espresso/espresso-intents/3.5.1/espresso-intents-3.5.1.aar +++ /dev/null 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.6.0-alpha02/espresso-intents-3.6.0-alpha02-sources.jar Binary files differindex fb1fd3bc..74020515 100644 --- 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.6.0-alpha02/espresso-intents-3.6.0-alpha02-sources.jar 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 Binary files differnew file mode 100644 index 00000000..28135287 --- /dev/null +++ b/common/androidx-test/androidx/test/espresso/espresso-intents/3.6.0-alpha02/espresso-intents-3.6.0-alpha02.aar 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 index b34d79c1..79867592 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>core</artifactId> - <version>1.5.0</version> + <artifactId>annotation</artifactId> + <version>1.1.0-alpha02</version> <scope>compile</scope> + </dependency> <dependency> <groupId>androidx.test</groupId> - <artifactId>runner</artifactId> - <version>1.5.2</version> + <artifactId>core</artifactId> + <version>1.6.0-alpha03</version> <scope>compile</scope> + </dependency> <dependency> - <groupId>androidx.test.espresso</groupId> - <artifactId>espresso-idling-resource</artifactId> - <version>3.5.1</version> + <groupId>androidx.test</groupId> + <artifactId>rules</artifactId> + <version>1.6.0-alpha02</version> <scope>compile</scope> + </dependency> <dependency> - <groupId>com.squareup</groupId> - <artifactId>javawriter</artifactId> - <version>2.1.1</version> + <groupId>androidx.test</groupId> + <artifactId>runner</artifactId> + <version>1.6.0-alpha05</version> <scope>compile</scope> + </dependency> <dependency> - <groupId>javax.inject</groupId> - <artifactId>javax.inject</artifactId> - <version>1</version> + <groupId>com.google.errorprone</groupId> + <artifactId>error_prone_annotations</artifactId> + <version>2.18.0</version> <scope>compile</scope> + </dependency> <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-library</artifactId> - <version>1.3</version> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.13.2</version> <scope>compile</scope> + </dependency> <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-integration</artifactId> + <artifactId>hamcrest-core</artifactId> <version>1.3</version> <scope>compile</scope> + </dependency> <dependency> - <groupId>com.google.code.findbugs</groupId> - <artifactId>jsr305</artifactId> - <version>2.0.2</version> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-library</artifactId> + <version>1.3</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.test</groupId> - <artifactId>annotation</artifactId> - <version>1.0.1</version> + <version>1.8.20</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 Binary files differdeleted file mode 100644 index dd47e2b1..00000000 --- a/common/androidx-test/androidx/test/espresso/espresso-web/3.5.1/espresso-web-3.5.1-sources.jar +++ /dev/null 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 Binary files differdeleted file mode 100644 index 4a705cca..00000000 --- a/common/androidx-test/androidx/test/espresso/espresso-web/3.5.1/espresso-web-3.5.1.aar +++ /dev/null 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 1d9ed45d..00000000 --- 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 Binary files differnew file mode 100644 index 00000000..aad1a8f6 --- /dev/null +++ b/common/androidx-test/androidx/test/espresso/espresso-web/3.6.0-alpha02/espresso-web-3.6.0-alpha02-sources.jar 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 Binary files differnew file mode 100644 index 00000000..7d6427dc --- /dev/null +++ b/common/androidx-test/androidx/test/espresso/espresso-web/3.6.0-alpha02/espresso-web-3.6.0-alpha02.aar diff --git a/common/androidx-test/androidx/test/espresso/espresso-web/3.6.0-alpha02/espresso-web-3.6.0-alpha02.pom b/common/androidx-test/androidx/test/espresso/espresso-web/3.6.0-alpha02/espresso-web-3.6.0-alpha02.pom new file mode 100644 index 00000000..1ae40edb --- /dev/null +++ b/common/androidx-test/androidx/test/espresso/espresso-web/3.6.0-alpha02/espresso-web-3.6.0-alpha02.pom @@ -0,0 +1,112 @@ +<?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.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> + <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.annotation</groupId> + <artifactId>annotation</artifactId> + <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>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>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.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/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 Binary files differdeleted file mode 100644 index de449bad..00000000 --- a/common/androidx-test/androidx/test/ext/junit/1.1.5/junit-1.1.5-sources.jar +++ /dev/null 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 Binary files differdeleted file mode 100644 index 162d864f..00000000 --- a/common/androidx-test/androidx/test/ext/junit/1.1.5/junit-1.1.5.aar +++ /dev/null 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 Binary files differnew file mode 100644 index 00000000..6402fe84 --- /dev/null +++ b/common/androidx-test/androidx/test/ext/junit/1.2.0-alpha02/junit-1.2.0-alpha02-sources.jar 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 Binary files differnew file mode 100644 index 00000000..e011bd25 --- /dev/null +++ b/common/androidx-test/androidx/test/ext/junit/1.2.0-alpha02/junit-1.2.0-alpha02.aar 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/ext/junit/1.2.0-alpha02/junit-1.2.0-alpha02.pom index ad484304..fac57d63 100644 --- a/common/androidx-test/androidx/test/espresso/espresso-intents/3.5.1/espresso-intents-3.5.1.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.espresso</groupId> - <artifactId>espresso-intents</artifactId> - <version>3.5.1</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> @@ -25,34 +25,46 @@ </developers> <dependencies> <dependency> - <groupId>androidx.test.espresso</groupId> - <artifactId>espresso-core</artifactId> - <version>3.5.1</version> + <groupId>androidx.annotation</groupId> + <artifactId>annotation</artifactId> + <version>1.7.0-beta01</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>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.5.0</version> + <artifactId>monitor</artifactId> + <version>1.7.0-alpha03</version> <scope>compile</scope> + </dependency> <dependency> - <groupId>androidx.test</groupId> - <artifactId>annotation</artifactId> - <version>1.0.1</version> + <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.7.10</version> + <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 Binary files differdeleted file mode 100644 index b9e9690b..00000000 --- a/common/androidx-test/androidx/test/ext/truth/1.5.0/truth-1.5.0.aar +++ /dev/null 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 Binary files differindex 709d1abc..ec1f4491 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 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 Binary files differnew file mode 100644 index 00000000..c86d9b1e --- /dev/null +++ b/common/androidx-test/androidx/test/ext/truth/1.6.0-alpha02/truth-1.6.0-alpha02.aar 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 index d39c073b..c5e82e24 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.test</groupId> - <artifactId>core</artifactId> - <version>1.5.0</version> + <groupId>androidx.annotation</groupId> + <artifactId>annotation</artifactId> + <version>1.7.0-beta01</version> <scope>compile</scope> + </dependency> <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - <version>30.1.1-android</version> + <groupId>androidx.test</groupId> + <artifactId>annotation</artifactId> + <version>1.1.0-alpha02</version> <scope>compile</scope> + </dependency> <dependency> - <groupId>com.google.truth</groupId> - <artifactId>truth</artifactId> - <version>1.1.3</version> + <groupId>androidx.test</groupId> + <artifactId>core</artifactId> + <version>1.6.0-alpha03</version> <scope>compile</scope> + </dependency> <dependency> - <groupId>androidx.annotation</groupId> - <artifactId>annotation</artifactId> - <version>1.2.0</version> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>31.1-android</version> <scope>compile</scope> + </dependency> <dependency> - <groupId>androidx.test</groupId> - <artifactId>annotation</artifactId> - <version>1.0.1</version> + <groupId>com.google.truth</groupId> + <artifactId>truth</artifactId> + <version>1.0</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 Binary files differdeleted file mode 100644 index 4f89266c..00000000 --- a/common/androidx-test/androidx/test/monitor/1.6.1/monitor-1.6.1-sources.jar +++ /dev/null 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 Binary files differdeleted file mode 100644 index 116fcbe5..00000000 --- a/common/androidx-test/androidx/test/monitor/1.6.1/monitor-1.6.1.aar +++ /dev/null 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 Binary files differnew file mode 100644 index 00000000..4d220439 --- /dev/null +++ b/common/androidx-test/androidx/test/monitor/1.7.0-alpha03/monitor-1.7.0-alpha03-sources.jar 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 Binary files differnew file mode 100644 index 00000000..29717dbd --- /dev/null +++ b/common/androidx-test/androidx/test/monitor/1.7.0-alpha03/monitor-1.7.0-alpha03.aar 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 index a0ec941c..e8286c65 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/orchestrator/1.5.0-alpha03/orchestrator-1.5.0-alpha03.apk b/common/androidx-test/androidx/test/orchestrator/1.5.0-alpha03/orchestrator-1.5.0-alpha03.apk Binary files differnew file mode 100644 index 00000000..396fafa9 --- /dev/null +++ b/common/androidx-test/androidx/test/orchestrator/1.5.0-alpha03/orchestrator-1.5.0-alpha03.apk diff --git a/common/androidx-test/androidx/test/rules/1.5.0/rules-1.5.0.pom b/common/androidx-test/androidx/test/orchestrator/1.5.0-alpha03/orchestrator-1.5.0-alpha03.pom index 8c31eca6..ad34e769 100644 --- a/common/androidx-test/androidx/test/rules/1.5.0/rules-1.5.0.pom +++ b/common/androidx-test/androidx/test/orchestrator/1.5.0-alpha03/orchestrator-1.5.0-alpha03.pom @@ -4,9 +4,9 @@ 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> + <artifactId>orchestrator</artifactId> + <version>1.5.0-alpha03</version> + <packaging>apk</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> @@ -25,16 +25,11 @@ </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> + <groupId>androidx.test.services</groupId> + <artifactId>test-services</artifactId> + <version>1.5.0-alpha03</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 Binary files differdeleted file mode 100644 index b9a4d16e..00000000 --- a/common/androidx-test/androidx/test/rules/1.5.0/rules-1.5.0.aar +++ /dev/null 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 Binary files differindex 31a5568b..c877c10e 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 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 Binary files differnew file mode 100644 index 00000000..0c0e582f --- /dev/null +++ b/common/androidx-test/androidx/test/rules/1.6.0-alpha02/rules-1.6.0-alpha02.aar 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 index 7dd12cbd..b1617bb4 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>junit</groupId> - <artifactId>junit</artifactId> - <version>4.13.2</version> + <groupId>androidx.annotation</groupId> + <artifactId>annotation</artifactId> + <version>1.7.0-beta01</version> <scope>compile</scope> + </dependency> <dependency> <groupId>androidx.test</groupId> - <artifactId>core</artifactId> - <version>1.5.0</version> + <artifactId>annotation</artifactId> + <version>1.1.0-alpha02</version> <scope>compile</scope> + </dependency> <dependency> <groupId>androidx.test</groupId> - <artifactId>monitor</artifactId> - <version>1.6.1</version> + <artifactId>runner</artifactId> + <version>1.6.0-alpha05</version> <scope>compile</scope> + </dependency> <dependency> - <groupId>androidx.annotation</groupId> - <artifactId>annotation</artifactId> - <version>1.2.0</version> + <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/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 Binary files differdeleted file mode 100644 index 090711e2..00000000 --- a/common/androidx-test/androidx/test/runner/1.5.3-alpha01/runner-1.5.3-alpha01-sources.jar +++ /dev/null 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 Binary files differdeleted file mode 100644 index 0140d16b..00000000 --- a/common/androidx-test/androidx/test/runner/1.5.3-alpha01/runner-1.5.3-alpha01.aar +++ /dev/null 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 Binary files differnew file mode 100644 index 00000000..1a492c30 --- /dev/null +++ b/common/androidx-test/androidx/test/runner/1.6.0-alpha05/runner-1.6.0-alpha05-sources.jar 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 Binary files differnew file mode 100644 index 00000000..421bbca5 --- /dev/null +++ b/common/androidx-test/androidx/test/runner/1.6.0-alpha05/runner-1.6.0-alpha05.aar 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 index 0ae83def..aeeb69fc 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> + <groupId>androidx.test.services</groupId> + <artifactId>storage</artifactId> + <version>1.5.0-alpha02</version> <scope>compile</scope> + </dependency> <dependency> <groupId>androidx.test</groupId> - <artifactId>monitor</artifactId> - <version>[1.6.1]</version> + <artifactId>annotation</artifactId> + <version>1.1.0-alpha02</version> <scope>compile</scope> + </dependency> <dependency> - <groupId>androidx.test.services</groupId> - <artifactId>storage</artifactId> - <version>[1.4.2]</version> + <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 Binary files differdeleted file mode 100644 index 56d815d5..00000000 --- a/common/androidx-test/androidx/test/services/storage/1.4.2/storage-1.4.2-sources.jar +++ /dev/null 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 Binary files differdeleted file mode 100644 index 59a57eac..00000000 --- a/common/androidx-test/androidx/test/services/storage/1.4.2/storage-1.4.2.aar +++ /dev/null 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 Binary files differnew file mode 100644 index 00000000..b4a44f38 --- /dev/null +++ b/common/androidx-test/androidx/test/services/storage/1.5.0-alpha02/storage-1.5.0-alpha02-sources.jar 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 Binary files differnew file mode 100644 index 00000000..fbb51caf --- /dev/null +++ b/common/androidx-test/androidx/test/services/storage/1.5.0-alpha02/storage-1.5.0-alpha02.aar 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 index 8685d29a..a50ad75e 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> + <artifactId>annotation</artifactId> + <version>1.1.0-alpha02</version> <scope>compile</scope> + </dependency> <dependency> <groupId>androidx.test</groupId> - <artifactId>annotation</artifactId> - <version>1.0.1</version> + <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 Binary files differdeleted file mode 100644 index 86aeb402..00000000 --- a/common/androidx-test/androidx/test/services/test-services/1.4.2/test-services-1.4.2.apk +++ /dev/null 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 Binary files differnew file mode 100644 index 00000000..48a63a5a --- /dev/null +++ b/common/androidx-test/androidx/test/services/test-services/1.5.0-alpha02/test-services-1.5.0-alpha02.apk 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 index b01b811f..b6dddb09 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 da6d25a2..9123286d 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 3f114f7e..dc53bf6b 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 b04d2b64..279abbd0 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 602c3d31..03488c6b 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 82f8cb05..cd5c1f6a 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 7a501297..d64ec841 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 4794b778..6ea99344 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 e258c4c7..5d55d2e6 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 ed2316c9..3b7c4223 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 910000ac..2ba183e0 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 2cffb5c6..a4fc11f1 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 654fd761..9aecef94 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 11755b38..94f4a6cd 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 7fdecc51..1b55ef18 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 8c4065d8..28b48899 100644 --- a/common/androidx-test/prepend-license.txt +++ b/common/androidx-test/prepend-license.txt @@ -4,8 +4,9 @@ package { 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 650b4b66..7618ca8f 100755 --- a/common/androidx-test/update-from-gmaven.py +++ b/common/androidx-test/update-from-gmaven.py @@ -18,15 +18,16 @@ import os 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" +orchestratorVersion="1.5.0-alpha03" +servicesVersion="1.5.0-alpha02" jankTestHelperVersion="1.0.1" mavenToBpPatternMap = { @@ -130,6 +131,7 @@ downloadArtifact("androidx.test.ext", "truth", extTruthVersion) downloadArtifact("androidx.test.janktesthelper", "janktesthelper", jankTestHelperVersion) downloadArtifact("androidx.test.services", "storage", servicesVersion) downloadApk("androidx.test.services", "test-services", servicesVersion) +downloadApk("androidx.test", "orchestrator", orchestratorVersion) atxRewriteStr = "" @@ -145,6 +147,7 @@ cmd("pom2bp " + atxRewriteStr + "-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 +155,7 @@ cmd("pom2bp " + atxRewriteStr + "-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 737af6b8..55a9e485 100644 --- a/common/atf/Android.bp +++ b/common/atf/Android.bp @@ -35,14 +35,14 @@ java_library_host { } 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 8b192dfc..7af8ddda 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 Binary files differdeleted file mode 100644 index 778c09ad..00000000 --- a/common/atf/atf_classes_502584086.jar +++ /dev/null diff --git a/common/atf/atf_classes_557133692.jar b/common/atf/atf_classes_557133692.jar Binary files differnew file mode 100644 index 00000000..29e3d834 --- /dev/null +++ b/common/atf/atf_classes_557133692.jar diff --git a/common/flickerlib/Android.bp b/common/flickerlib/Android.bp new file mode 100644 index 00000000..e3f31404 --- /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 00000000..7cfbe892 --- /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 Binary files differnew file mode 100755 index 00000000..a582926b --- /dev/null +++ b/common/flickerlib/trace_processor_shell/trace_processor_shell_aarch64 diff --git a/common/flickerlib/trace_processor_shell/trace_processor_shell_x86 b/common/flickerlib/trace_processor_shell/trace_processor_shell_x86 Binary files differnew file mode 100755 index 00000000..a168157b --- /dev/null +++ b/common/flickerlib/trace_processor_shell/trace_processor_shell_x86 diff --git a/common/flickerlib/trace_processor_shell/trace_processor_shell_x86_64 b/common/flickerlib/trace_processor_shell/trace_processor_shell_x86_64 Binary files differnew file mode 100755 index 00000000..a857ccdc --- /dev/null +++ b/common/flickerlib/trace_processor_shell/trace_processor_shell_x86_64 diff --git a/common/jacoco/Android.bp b/common/jacoco/Android.bp index b7fc3300..f85d428c 100644 --- a/common/jacoco/Android.bp +++ b/common/jacoco/Android.bp @@ -33,7 +33,7 @@ java_import_host { 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 ae2fb4dd..6c5ae453 100644 --- a/common/jacoco/build.gradle +++ b/common/jacoco/build.gradle @@ -3,9 +3,18 @@ apply plugin: 'java' 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 336f1f70..0656a7a6 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 @@ Third Party Content 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 @@ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 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 @@ Google Code Prettify is subject to the terms and conditions of the following lic 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 bad94cde..e40fa555 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 Binary files differindex e1b0fa00..7799b3c0 100644 --- a/common/jacoco/lib/jacocoagent.jar +++ b/common/jacoco/lib/jacocoagent.jar 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 Binary files differdeleted file mode 100644 index 55335c21..00000000 --- a/common/jacoco/lib/org.jacoco.core-0.8.0.201801022044.jar +++ /dev/null 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 Binary files differnew file mode 100644 index 00000000..bbccce10 --- /dev/null +++ b/common/jacoco/lib/org.jacoco.core-0.8.8.202204050719.jar 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 Binary files differdeleted file mode 100644 index f02e4a5e..00000000 --- a/common/jacoco/lib/org.jacoco.report-0.8.0.201801022044.jar +++ /dev/null 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 Binary files differnew file mode 100644 index 00000000..ccb60c8e --- /dev/null +++ b/common/jacoco/lib/org.jacoco.report-0.8.8.202204050719.jar 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 9b5be53a..e4e8134e 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.MultiReportVisitor; 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 @@ public class ReportGenerator { 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 808b00bb..57fe5935 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 Binary files differindex b8d9900e..5a965624 100644 --- a/common/layoutlib_api/layoutlib_api-prebuilt.jar +++ b/common/layoutlib_api/layoutlib_api-prebuilt.jar diff --git a/common/layoutlib_api/layoutlib_api-sources.jar b/common/layoutlib_api/layoutlib_api-sources.jar Binary files differindex 3face8e8..0e000941 100644 --- a/common/layoutlib_api/layoutlib_api-sources.jar +++ b/common/layoutlib_api/layoutlib_api-sources.jar diff --git a/common/ninepatch/PREBUILT b/common/ninepatch/PREBUILT index e9ffb8ae..70eee2a3 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 Binary files differindex d8f864f2..dce3b044 100644 --- a/common/ninepatch/ninepatch-prebuilt-sources.jar +++ b/common/ninepatch/ninepatch-prebuilt-sources.jar diff --git a/common/ninepatch/ninepatch-prebuilt.jar b/common/ninepatch/ninepatch-prebuilt.jar Binary files differindex 3cc32313..c6d19407 100644 --- a/common/ninepatch/ninepatch-prebuilt.jar +++ b/common/ninepatch/ninepatch-prebuilt.jar diff --git a/common/robolectric-native-prebuilt/resources/native/linux/x86_64/librobolectric-nativeruntime.so b/common/robolectric-native-prebuilt/resources/native/linux/x86_64/librobolectric-nativeruntime.so Binary files differindex 0d54be32..b547797c 100644 --- a/common/robolectric-native-prebuilt/resources/native/linux/x86_64/librobolectric-nativeruntime.so +++ b/common/robolectric-native-prebuilt/resources/native/linux/x86_64/librobolectric-nativeruntime.so diff --git a/common/sdk-common/PREBUILT b/common/sdk-common/PREBUILT index 61e06fe8..ba552ba3 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 Binary files differindex 04af9c73..ac3f4925 100644 --- a/common/sdk-common/sdk-common-sources.jar +++ b/common/sdk-common/sdk-common-sources.jar diff --git a/common/sdk-common/sdk-common.jar b/common/sdk-common/sdk-common.jar Binary files differindex ad268aba..e0b6c5cd 100644 --- a/common/sdk-common/sdk-common.jar +++ b/common/sdk-common/sdk-common.jar diff --git a/common/tools-common/PREBUILT b/common/tools-common/PREBUILT index 60243d6b..90672b7e 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 Binary files differindex b8aab23e..267e7c33 100644 --- a/common/tools-common/tools-common-prebuilt-sources.jar +++ b/common/tools-common/tools-common-prebuilt-sources.jar diff --git a/common/tools-common/tools-common-prebuilt.jar b/common/tools-common/tools-common-prebuilt.jar Binary files differindex 0746c361..ab4026ae 100644 --- a/common/tools-common/tools-common-prebuilt.jar +++ b/common/tools-common/tools-common-prebuilt.jar |