diff options
| author | Robin Lee <rgl@google.com> | 2023-04-12 19:00:06 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2023-04-12 19:00:06 +0000 |
| commit | c4afe7ebbeeb78e4c0fde58be9f3d46e95456730 (patch) | |
| tree | 7397cf49ee57a366981bd08f75ff86f537669aee | |
| parent | 9082e81576492b826274284b964b75f250ffbd16 (diff) | |
| download | misc-c4afe7ebbeeb78e4c0fde58be9f3d46e95456730.tar.gz | |
Revert "Update to androidx.test libraries released on 03.21.2023."
This reverts commit 9082e81576492b826274284b964b75f250ffbd16.
Reason for revert: b/276843259
Change-Id: I9b47abb3560119b762d7808d35de4275ad817ad0
76 files changed, 308 insertions, 519 deletions
diff --git a/common/androidx-test/Android.bp b/common/androidx-test/Android.bp index 6a6e25a6..07695dce 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-prebuilt' -rewrite 'net.sf.kxml:kxml2=kxml2-android' -rewrite 'androidx.lifecycle:lifecycle-common=androidx.lifecycle_lifecycle-common' -rewrite 'androidx.annotation:annotation=androidx.annotation_annotation' -rewrite 'org.hamcrest:hamcrest-integration=hamcrest' -rewrite '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 . +// 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-prebuilt' -rewrite 'net.sf.kxml:kxml2=kxml2-android' -rewrite 'androidx.lifecycle:lifecycle-common=androidx.lifecycle_lifecycle-common' -rewrite 'androidx.annotation:annotation=androidx.annotation_annotation' -rewrite 'org.hamcrest:hamcrest-integration=hamcrest' -rewrite 'javax.inject:javax.inject=jsr330' -rewrite 'com.google.android.material:material=com.google.android.material_material' -rewrite 'androidx.drawerlayout:drawerlayout=androidx.drawerlayout_drawerlayout' -rewrite 'androidx.viewpager:viewpager=androidx.viewpager_viewpager' -rewrite 'androidx.recyclerview:recyclerview=androidx.recyclerview_recyclerview' -rewrite 'androidx.core:core=androidx.core_core' -rewrite 'androidx.legacy:legacy-support-core-utils=androidx.legacy_legacy-support-core-utils' -sdk-version current -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.5.0-alpha01/test-services-1.5.0-alpha01.apk"], - path: "androidx/test/services/test-services/1.5.0-alpha01", + srcs: ["androidx/test/services/test-services/1.4.2/test-services-1.4.2.apk"], + path: "androidx/test/services/test-services/1.4.2", visibility: [ "//tools/tradefederation/core:__pkg__", ], @@ -16,7 +16,7 @@ filegroup { android_library_import { name: "androidx.test.annotation-nodeps", - aars: ["androidx/test/annotation/1.1.0-alpha01/annotation-1.1.0-alpha01.aar"], + aars: ["androidx/test/annotation/1.0.1/annotation-1.0.1.aar"], sdk_version: "current", apex_available: [ "//apex_available:platform", @@ -24,8 +24,8 @@ android_library_import { ], min_sdk_version: "14", static_libs: [ - "androidx.annotation_annotation-experimental", "androidx.annotation_annotation", + "androidx.annotation_annotation-experimental", ], } @@ -40,15 +40,15 @@ android_library { manifest: "manifests/androidx.test.annotation/AndroidManifest.xml", static_libs: [ "androidx.test.annotation-nodeps", - "androidx.annotation_annotation-experimental", "androidx.annotation_annotation", + "androidx.annotation_annotation-experimental", ], java_version: "1.7", } android_library_import { name: "androidx.test.core-nodeps", - aars: ["androidx/test/core/1.6.0-alpha01/core-1.6.0-alpha01.aar"], + aars: ["androidx/test/core/1.5.0/core-1.5.0.aar"], sdk_version: "current", apex_available: [ "//apex_available:platform", @@ -57,14 +57,13 @@ android_library_import { min_sdk_version: "14", static_libs: [ "androidx.annotation_annotation", - "androidx.concurrent_concurrent-futures", "androidx.lifecycle_lifecycle-common", "androidx.tracing_tracing", "guava-listenablefuture-prebuilt-jar", "kotlin-stdlib", - "androidx.test.services.storage", - "androidx.test.annotation", + "androidx.concurrent_concurrent-futures", "androidx.test.monitor", + "androidx.test.services.storage", ], } @@ -80,14 +79,13 @@ 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.test.services.storage", - "androidx.test.annotation", + "androidx.concurrent_concurrent-futures", "androidx.test.monitor", + "androidx.test.services.storage", ], java_version: "1.7", } @@ -126,7 +124,7 @@ android_library { android_library_import { name: "androidx.test.espresso.contrib-nodeps", - aars: ["androidx/test/espresso/espresso-contrib/3.6.0-alpha01/espresso-contrib-3.6.0-alpha01.aar"], + aars: ["androidx/test/espresso/espresso-contrib/3.5.1/espresso-contrib-3.5.1.aar"], sdk_version: "current", apex_available: [ "//apex_available:platform", @@ -134,17 +132,15 @@ android_library_import { ], min_sdk_version: "14", static_libs: [ - "androidx.appcompat_appcompat", - "androidx.core_core", - "androidx.drawerlayout_drawerlayout", + "com.google.android.material_material", "androidx.recyclerview_recyclerview", + "androidx.drawerlayout_drawerlayout", "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.monitor", + "androidx.test.espresso.idling-resource", ], } @@ -159,24 +155,22 @@ android_library { manifest: "manifests/androidx.test.espresso.contrib/AndroidManifest.xml", static_libs: [ "androidx.test.espresso.contrib-nodeps", - "androidx.appcompat_appcompat", - "androidx.core_core", - "androidx.drawerlayout_drawerlayout", + "com.google.android.material_material", "androidx.recyclerview_recyclerview", + "androidx.drawerlayout_drawerlayout", "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.monitor", + "androidx.test.espresso.idling-resource", ], java_version: "1.7", } android_library_import { name: "androidx.test.espresso.core-nodeps", - aars: ["androidx/test/espresso/espresso-core/3.6.0-alpha01/espresso-core-3.6.0-alpha01.aar"], + aars: ["androidx/test/espresso/espresso-core/3.5.1/espresso-core-3.5.1.aar"], sdk_version: "current", apex_available: [ "//apex_available:platform", @@ -185,21 +179,16 @@ android_library_import { min_sdk_version: "14", static_libs: [ "androidx.annotation_annotation", - "androidx.concurrent_concurrent-futures", - "jsr305", - "error_prone_annotations", - "guava-listenablefuture-prebuilt-jar", + "javawriter", "jsr330", - "junit", - "hamcrest", "hamcrest-library", + "hamcrest", + "jsr305", "kotlin-stdlib", - "androidx.test.espresso.idling-resource", - "androidx.test.services.storage", - "androidx.test.annotation", "androidx.test.core", - "androidx.test.monitor", "androidx.test.runner", + "androidx.test.espresso.idling-resource", + "androidx.test.annotation", ], } @@ -215,28 +204,23 @@ android_library { static_libs: [ "androidx.test.espresso.core-nodeps", "androidx.annotation_annotation", - "androidx.concurrent_concurrent-futures", - "jsr305", - "error_prone_annotations", - "guava-listenablefuture-prebuilt-jar", + "javawriter", "jsr330", - "junit", - "hamcrest", "hamcrest-library", + "hamcrest", + "jsr305", "kotlin-stdlib", - "androidx.test.espresso.idling-resource", - "androidx.test.services.storage", - "androidx.test.annotation", "androidx.test.core", - "androidx.test.monitor", "androidx.test.runner", + "androidx.test.espresso.idling-resource", + "androidx.test.annotation", ], java_version: "1.7", } android_library_import { name: "androidx.test.espresso.idling-resource-nodeps", - aars: ["androidx/test/espresso/espresso-idling-resource/3.6.0-alpha01/espresso-idling-resource-3.6.0-alpha01.aar"], + aars: ["androidx/test/espresso/espresso-idling-resource/3.5.1/espresso-idling-resource-3.5.1.aar"], sdk_version: "current", apex_available: [ "//apex_available:platform", @@ -264,7 +248,7 @@ android_library { android_library_import { name: "androidx.test.espresso.intents-nodeps", - aars: ["androidx/test/espresso/espresso-intents/3.6.0-alpha01/espresso-intents-3.6.0-alpha01.aar"], + aars: ["androidx/test/espresso/espresso-intents/3.5.1/espresso-intents-3.5.1.aar"], sdk_version: "current", apex_available: [ "//apex_available:platform", @@ -272,17 +256,11 @@ android_library_import { ], min_sdk_version: "14", 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.runner", + "androidx.test.annotation", ], } @@ -297,24 +275,18 @@ 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.runner", + "androidx.test.annotation", ], java_version: "1.7", } android_library_import { name: "androidx.test.espresso.web-nodeps", - aars: ["androidx/test/espresso/espresso-web/3.6.0-alpha01/espresso-web-3.6.0-alpha01.aar"], + aars: ["androidx/test/espresso/espresso-web/3.5.1/espresso-web-3.5.1.aar"], sdk_version: "current", apex_available: [ "//apex_available:platform", @@ -323,17 +295,8 @@ android_library_import { min_sdk_version: "14", 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", ], } @@ -349,24 +312,15 @@ 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", } android_library_import { name: "androidx.test.ext.junit-nodeps", - aars: ["androidx/test/ext/junit/1.2.0-alpha01/junit-1.2.0-alpha01.aar"], + aars: ["androidx/test/ext/junit/1.1.5/junit-1.1.5.aar"], sdk_version: "current", apex_available: [ "//apex_available:platform", @@ -374,9 +328,8 @@ android_library_import { ], min_sdk_version: "14", static_libs: [ - "androidx.annotation_annotation", "junit", - "androidx.test.services.storage", + "androidx.annotation_annotation", "androidx.test.core", "androidx.test.monitor", ], @@ -393,9 +346,8 @@ android_library { manifest: "manifests/androidx.test.ext.junit/AndroidManifest.xml", static_libs: [ "androidx.test.ext.junit-nodeps", - "androidx.annotation_annotation", "junit", - "androidx.test.services.storage", + "androidx.annotation_annotation", "androidx.test.core", "androidx.test.monitor", ], @@ -404,7 +356,7 @@ android_library { android_library_import { name: "androidx.test.ext.truth-nodeps", - aars: ["androidx/test/ext/truth/1.6.0-alpha01/truth-1.6.0-alpha01.aar"], + aars: ["androidx/test/ext/truth/1.5.0/truth-1.5.0.aar"], sdk_version: "current", apex_available: [ "//apex_available:platform", @@ -412,11 +364,11 @@ android_library_import { ], min_sdk_version: "14", static_libs: [ - "androidx.annotation_annotation", "guava", "truth-prebuilt", - "androidx.test.annotation", + "androidx.annotation_annotation", "androidx.test.core", + "androidx.test.annotation", ], } @@ -431,11 +383,11 @@ android_library { manifest: "manifests/androidx.test.ext.truth/AndroidManifest.xml", static_libs: [ "androidx.test.ext.truth-nodeps", - "androidx.annotation_annotation", "guava", "truth-prebuilt", - "androidx.test.annotation", + "androidx.annotation_annotation", "androidx.test.core", + "androidx.test.annotation", ], java_version: "1.7", } @@ -474,7 +426,7 @@ android_library { android_library_import { name: "androidx.test.monitor-nodeps", - aars: ["androidx/test/monitor/1.7.0-alpha01/monitor-1.7.0-alpha01.aar"], + aars: ["androidx/test/monitor/1.6.1/monitor-1.6.1.aar"], sdk_version: "current", apex_available: [ "//apex_available:platform", @@ -484,7 +436,6 @@ android_library_import { static_libs: [ "androidx.annotation_annotation", "androidx.tracing_tracing", - "kotlin-stdlib", "androidx.test.annotation", ], } @@ -502,7 +453,6 @@ android_library { "androidx.test.monitor-nodeps", "androidx.annotation_annotation", "androidx.tracing_tracing", - "kotlin-stdlib", "androidx.test.annotation", ], java_version: "1.7", @@ -510,7 +460,7 @@ android_library { android_library_import { name: "androidx.test.rules-nodeps", - aars: ["androidx/test/rules/1.6.0-alpha01/rules-1.6.0-alpha01.aar"], + aars: ["androidx/test/rules/1.5.0/rules-1.5.0.aar"], sdk_version: "current", apex_available: [ "//apex_available:platform", @@ -518,10 +468,8 @@ android_library_import { ], min_sdk_version: "14", static_libs: [ - "androidx.annotation_annotation", - "junit", - "androidx.test.annotation", "androidx.test.runner", + "androidx.test.annotation", ], libs: [ "android.test.base", @@ -539,10 +487,8 @@ android_library { manifest: "manifests/androidx.test.rules/AndroidManifest.xml", static_libs: [ "androidx.test.rules-nodeps", - "androidx.annotation_annotation", - "junit", - "androidx.test.annotation", "androidx.test.runner", + "androidx.test.annotation", ], libs: [ "android.test.base", @@ -552,7 +498,7 @@ android_library { android_library_import { name: "androidx.test.runner-nodeps", - aars: ["androidx/test/runner/1.6.0-alpha01/runner-1.6.0-alpha01.aar"], + aars: ["androidx/test/runner/1.5.3-alpha01/runner-1.5.3-alpha01.aar"], sdk_version: "current", apex_available: [ "//apex_available:platform", @@ -563,9 +509,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", ], } @@ -583,16 +529,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", } android_library_import { name: "androidx.test.services.storage-nodeps", - aars: ["androidx/test/services/storage/1.5.0-alpha01/storage-1.5.0-alpha01.aar"], + aars: ["androidx/test/services/storage/1.4.2/storage-1.4.2.aar"], sdk_version: "current", apex_available: [ "//apex_available:platform", @@ -601,8 +547,9 @@ android_library_import { min_sdk_version: "14", static_libs: [ "androidx.annotation_annotation", - "androidx.test.annotation", + "jsr305", "androidx.test.monitor", + "androidx.test.annotation", ], } @@ -618,15 +565,16 @@ android_library { static_libs: [ "androidx.test.services.storage-nodeps", "androidx.annotation_annotation", - "androidx.test.annotation", + "jsr305", "androidx.test.monitor", + "androidx.test.annotation", ], java_version: "1.7", } android_app_import { name: "androidx.test.services.test-services", - apk: "androidx/test/services/test-services/1.5.0-alpha01/test-services-1.5.0-alpha01.apk", + apk: "androidx/test/services/test-services/1.4.2/test-services-1.4.2.apk", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", diff --git a/common/androidx-test/androidx/test/annotation/1.0.1/annotation-1.0.1-sources.jar b/common/androidx-test/androidx/test/annotation/1.0.1/annotation-1.0.1-sources.jar Binary files differnew file mode 100644 index 00000000..32dbe2ac --- /dev/null +++ b/common/androidx-test/androidx/test/annotation/1.0.1/annotation-1.0.1-sources.jar 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 differnew file mode 100644 index 00000000..8a9a0585 --- /dev/null +++ b/common/androidx-test/androidx/test/annotation/1.0.1/annotation-1.0.1.aar diff --git a/common/androidx-test/androidx/test/annotation/1.1.0-alpha01/annotation-1.1.0-alpha01.pom b/common/androidx-test/androidx/test/annotation/1.0.1/annotation-1.0.1.pom index 582789b8..6ad42825 100644 --- a/common/androidx-test/androidx/test/annotation/1.1.0-alpha01/annotation-1.1.0-alpha01.pom +++ b/common/androidx-test/androidx/test/annotation/1.0.1/annotation-1.0.1.pom @@ -5,7 +5,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>androidx.test</groupId> <artifactId>annotation</artifactId> - <version>1.1.0-alpha01</version> + <version>1.0.1</version> <packaging>aar</packaging> <name>AndroidX Test Library</name> <description>The AndroidX Test Library provides an extensive framework for testing Android apps</description> @@ -26,14 +26,14 @@ <dependencies> <dependency> <groupId>androidx.annotation</groupId> - <artifactId>annotation-experimental</artifactId> - <version>1.1.0</version> + <artifactId>annotation</artifactId> + <version>1.2.0</version> <scope>compile</scope> </dependency> <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> </dependencies> diff --git a/common/androidx-test/androidx/test/annotation/1.1.0-alpha01/annotation-1.1.0-alpha01-sources.jar b/common/androidx-test/androidx/test/annotation/1.1.0-alpha01/annotation-1.1.0-alpha01-sources.jar Binary files differdeleted file mode 100644 index 5c08af98..00000000 --- a/common/androidx-test/androidx/test/annotation/1.1.0-alpha01/annotation-1.1.0-alpha01-sources.jar +++ /dev/null diff --git a/common/androidx-test/androidx/test/annotation/1.1.0-alpha01/annotation-1.1.0-alpha01.aar b/common/androidx-test/androidx/test/annotation/1.1.0-alpha01/annotation-1.1.0-alpha01.aar Binary files differdeleted file mode 100644 index 4d87c5c5..00000000 --- a/common/androidx-test/androidx/test/annotation/1.1.0-alpha01/annotation-1.1.0-alpha01.aar +++ /dev/null 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 differnew file mode 100644 index 00000000..63564c27 --- /dev/null +++ b/common/androidx-test/androidx/test/core/1.5.0/core-1.5.0-sources.jar 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 differnew file mode 100644 index 00000000..c8d04bad --- /dev/null +++ b/common/androidx-test/androidx/test/core/1.5.0/core-1.5.0.aar diff --git a/common/androidx-test/androidx/test/core/1.6.0-alpha01/core-1.6.0-alpha01.pom b/common/androidx-test/androidx/test/core/1.5.0/core-1.5.0.pom index b2a05371..dc106dc0 100644 --- a/common/androidx-test/androidx/test/core/1.6.0-alpha01/core-1.6.0-alpha01.pom +++ b/common/androidx-test/androidx/test/core/1.5.0/core-1.5.0.pom @@ -5,7 +5,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>androidx.test</groupId> <artifactId>core</artifactId> - <version>1.6.0-alpha01</version> + <version>1.5.0</version> <packaging>aar</packaging> <name>AndroidX Test Library</name> <description>The AndroidX Test Library provides an extensive framework for testing Android apps</description> @@ -31,39 +31,27 @@ <scope>compile</scope> </dependency> <dependency> - <groupId>androidx.concurrent</groupId> - <artifactId>concurrent-futures</artifactId> - <version>1.1.0</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>androidx.lifecycle</groupId> - <artifactId>lifecycle-common</artifactId> - <version>2.3.1</version> + <groupId>androidx.test</groupId> + <artifactId>monitor</artifactId> + <version>1.6.0</version> <scope>compile</scope> </dependency> <dependency> <groupId>androidx.test.services</groupId> <artifactId>storage</artifactId> - <version>1.5.0-alpha01</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>androidx.test</groupId> - <artifactId>annotation</artifactId> - <version>1.1.0-alpha01</version> + <version>1.4.2</version> <scope>compile</scope> </dependency> <dependency> - <groupId>androidx.test</groupId> - <artifactId>monitor</artifactId> - <version>1.7.0-alpha01</version> + <groupId>androidx.lifecycle</groupId> + <artifactId>lifecycle-common</artifactId> + <version>2.3.1</version> <scope>compile</scope> </dependency> <dependency> <groupId>androidx.tracing</groupId> <artifactId>tracing</artifactId> - <version>1.1.0</version> + <version>1.0.0</version> <scope>compile</scope> </dependency> <dependency> @@ -75,7 +63,13 @@ <dependency> <groupId>org.jetbrains.kotlin</groupId> <artifactId>kotlin-stdlib</artifactId> - <version>1.7.22</version> + <version>1.7.10</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>androidx.concurrent</groupId> + <artifactId>concurrent-futures</artifactId> + <version>1.1.0</version> <scope>compile</scope> </dependency> </dependencies> diff --git a/common/androidx-test/androidx/test/core/1.6.0-alpha01/core-1.6.0-alpha01-sources.jar b/common/androidx-test/androidx/test/core/1.6.0-alpha01/core-1.6.0-alpha01-sources.jar Binary files differdeleted file mode 100644 index 5bcbd044..00000000 --- a/common/androidx-test/androidx/test/core/1.6.0-alpha01/core-1.6.0-alpha01-sources.jar +++ /dev/null diff --git a/common/androidx-test/androidx/test/core/1.6.0-alpha01/core-1.6.0-alpha01.aar b/common/androidx-test/androidx/test/core/1.6.0-alpha01/core-1.6.0-alpha01.aar Binary files differdeleted file mode 100644 index 8a0b1688..00000000 --- a/common/androidx-test/androidx/test/core/1.6.0-alpha01/core-1.6.0-alpha01.aar +++ /dev/null diff --git a/common/androidx-test/androidx/test/espresso/espresso-contrib/3.6.0-alpha01/espresso-contrib-3.6.0-alpha01-sources.jar b/common/androidx-test/androidx/test/espresso/espresso-contrib/3.5.1/espresso-contrib-3.5.1-sources.jar Binary files differindex e16b3252..6dcc4300 100644 --- a/common/androidx-test/androidx/test/espresso/espresso-contrib/3.6.0-alpha01/espresso-contrib-3.6.0-alpha01-sources.jar +++ b/common/androidx-test/androidx/test/espresso/espresso-contrib/3.5.1/espresso-contrib-3.5.1-sources.jar 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 differnew file mode 100644 index 00000000..f7943162 --- /dev/null +++ b/common/androidx-test/androidx/test/espresso/espresso-contrib/3.5.1/espresso-contrib-3.5.1.aar diff --git a/common/androidx-test/androidx/test/espresso/espresso-contrib/3.6.0-alpha01/espresso-contrib-3.6.0-alpha01.pom b/common/androidx-test/androidx/test/espresso/espresso-contrib/3.5.1/espresso-contrib-3.5.1.pom index 1742d720..2fee32db 100644 --- a/common/androidx-test/androidx/test/espresso/espresso-contrib/3.6.0-alpha01/espresso-contrib-3.6.0-alpha01.pom +++ b/common/androidx-test/androidx/test/espresso/espresso-contrib/3.5.1/espresso-contrib-3.5.1.pom @@ -5,7 +5,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>androidx.test.espresso</groupId> <artifactId>espresso-contrib</artifactId> - <version>3.6.0-alpha01</version> + <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> @@ -25,21 +25,21 @@ </developers> <dependencies> <dependency> - <groupId>androidx.appcompat</groupId> - <artifactId>appcompat</artifactId> - <version>1.3.1</version> + <groupId>androidx.test.espresso</groupId> + <artifactId>espresso-core</artifactId> + <version>3.5.1</version> <scope>compile</scope> </dependency> <dependency> - <groupId>androidx.core</groupId> - <artifactId>core</artifactId> - <version>1.6.0</version> + <groupId>androidx.test.espresso</groupId> + <artifactId>espresso-idling-resource</artifactId> + <version>3.5.1</version> <scope>compile</scope> </dependency> <dependency> - <groupId>androidx.drawerlayout</groupId> - <artifactId>drawerlayout</artifactId> - <version>1.1.1</version> + <groupId>com.google.android.material</groupId> + <artifactId>material</artifactId> + <version>1.4.0</version> <scope>compile</scope> </dependency> <dependency> @@ -49,15 +49,9 @@ <scope>compile</scope> </dependency> <dependency> - <groupId>androidx.test.espresso</groupId> - <artifactId>espresso-core</artifactId> - <version>3.6.0-alpha01</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>androidx.test</groupId> - <artifactId>monitor</artifactId> - <version>1.7.0-alpha01</version> + <groupId>androidx.drawerlayout</groupId> + <artifactId>drawerlayout</artifactId> + <version>1.1.1</version> <scope>compile</scope> </dependency> <dependency> @@ -67,27 +61,21 @@ <scope>compile</scope> </dependency> <dependency> - <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>com.google.android.material</groupId> - <artifactId>material</artifactId> - <version>1.4.0</version> + <groupId>androidx.core</groupId> + <artifactId>core</artifactId> + <version>1.6.0</version> <scope>compile</scope> </dependency> <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-core</artifactId> - <version>1.3</version> + <groupId>androidx.legacy</groupId> + <artifactId>legacy-support-core-utils</artifactId> + <version>1.0.0</version> <scope>compile</scope> </dependency> <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-library</artifactId> - <version>1.3</version> + <groupId>com.google.android.apps.common.testing.accessibility.framework</groupId> + <artifactId>accessibility-test-framework</artifactId> + <version>3.1.2</version> <scope>compile</scope> </dependency> </dependencies> diff --git a/common/androidx-test/androidx/test/espresso/espresso-contrib/3.6.0-alpha01/espresso-contrib-3.6.0-alpha01.aar b/common/androidx-test/androidx/test/espresso/espresso-contrib/3.6.0-alpha01/espresso-contrib-3.6.0-alpha01.aar Binary files differdeleted file mode 100644 index 19f17a8f..00000000 --- a/common/androidx-test/androidx/test/espresso/espresso-contrib/3.6.0-alpha01/espresso-contrib-3.6.0-alpha01.aar +++ /dev/null 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 differnew file mode 100644 index 00000000..53aec95b --- /dev/null +++ b/common/androidx-test/androidx/test/espresso/espresso-core/3.5.1/espresso-core-3.5.1-sources.jar 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 differnew file mode 100644 index 00000000..11107dcd --- /dev/null +++ b/common/androidx-test/androidx/test/espresso/espresso-core/3.5.1/espresso-core-3.5.1.aar diff --git a/common/androidx-test/androidx/test/espresso/espresso-intents/3.6.0-alpha01/espresso-intents-3.6.0-alpha01.pom b/common/androidx-test/androidx/test/espresso/espresso-core/3.5.1/espresso-core-3.5.1.pom index 0095b34b..b34d79c1 100644 --- a/common/androidx-test/androidx/test/espresso/espresso-intents/3.6.0-alpha01/espresso-intents-3.6.0-alpha01.pom +++ b/common/androidx-test/androidx/test/espresso/espresso-core/3.5.1/espresso-core-3.5.1.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-intents</artifactId> - <version>3.6.0-alpha01</version> + <artifactId>espresso-core</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> @@ -31,63 +31,63 @@ <scope>compile</scope> </dependency> <dependency> - <groupId>androidx.test.espresso</groupId> - <artifactId>espresso-core</artifactId> - <version>3.6.0-alpha01</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>androidx.test</groupId> - <artifactId>annotation</artifactId> - <version>1.1.0-alpha01</version> - <scope>compile</scope> - </dependency> - <dependency> <groupId>androidx.test</groupId> <artifactId>core</artifactId> - <version>1.6.0-alpha01</version> + <version>1.5.0</version> <scope>compile</scope> </dependency> <dependency> <groupId>androidx.test</groupId> - <artifactId>rules</artifactId> - <version>1.6.0-alpha01</version> + <artifactId>runner</artifactId> + <version>1.5.2</version> <scope>compile</scope> </dependency> <dependency> - <groupId>androidx.test</groupId> - <artifactId>runner</artifactId> - <version>1.6.0-alpha01</version> + <groupId>androidx.test.espresso</groupId> + <artifactId>espresso-idling-resource</artifactId> + <version>3.5.1</version> <scope>compile</scope> </dependency> <dependency> - <groupId>com.google.errorprone</groupId> - <artifactId>error_prone_annotations</artifactId> - <version>2.9.0</version> + <groupId>com.squareup</groupId> + <artifactId>javawriter</artifactId> + <version>2.1.1</version> <scope>compile</scope> </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.13.2</version> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + <version>1</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-core</artifactId> + <artifactId>hamcrest-library</artifactId> <version>1.3</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-library</artifactId> + <artifactId>hamcrest-integration</artifactId> <version>1.3</version> <scope>compile</scope> </dependency> <dependency> + <groupId>com.google.code.findbugs</groupId> + <artifactId>jsr305</artifactId> + <version>2.0.2</version> + <scope>compile</scope> + </dependency> + <dependency> <groupId>org.jetbrains.kotlin</groupId> <artifactId>kotlin-stdlib</artifactId> - <version>1.7.22</version> + <version>1.7.10</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>androidx.test</groupId> + <artifactId>annotation</artifactId> + <version>1.0.1</version> <scope>compile</scope> </dependency> </dependencies> diff --git a/common/androidx-test/androidx/test/espresso/espresso-core/3.6.0-alpha01/espresso-core-3.6.0-alpha01-sources.jar b/common/androidx-test/androidx/test/espresso/espresso-core/3.6.0-alpha01/espresso-core-3.6.0-alpha01-sources.jar Binary files differdeleted file mode 100644 index 92f3496d..00000000 --- a/common/androidx-test/androidx/test/espresso/espresso-core/3.6.0-alpha01/espresso-core-3.6.0-alpha01-sources.jar +++ /dev/null diff --git a/common/androidx-test/androidx/test/espresso/espresso-core/3.6.0-alpha01/espresso-core-3.6.0-alpha01.aar b/common/androidx-test/androidx/test/espresso/espresso-core/3.6.0-alpha01/espresso-core-3.6.0-alpha01.aar Binary files differdeleted file mode 100644 index 4feb6351..00000000 --- a/common/androidx-test/androidx/test/espresso/espresso-core/3.6.0-alpha01/espresso-core-3.6.0-alpha01.aar +++ /dev/null diff --git a/common/androidx-test/androidx/test/espresso/espresso-core/3.6.0-alpha01/espresso-core-3.6.0-alpha01.pom b/common/androidx-test/androidx/test/espresso/espresso-core/3.6.0-alpha01/espresso-core-3.6.0-alpha01.pom deleted file mode 100644 index ff48952b..00000000 --- a/common/androidx-test/androidx/test/espresso/espresso-core/3.6.0-alpha01/espresso-core-3.6.0-alpha01.pom +++ /dev/null @@ -1,124 +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-core</artifactId> - <version>3.6.0-alpha01</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.2.0</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-alpha01</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>androidx.test.services</groupId> - <artifactId>storage</artifactId> - <version>1.5.0-alpha01</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>androidx.test</groupId> - <artifactId>annotation</artifactId> - <version>1.1.0-alpha01</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>androidx.test</groupId> - <artifactId>core</artifactId> - <version>1.6.0-alpha01</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>androidx.test</groupId> - <artifactId>monitor</artifactId> - <version>1.7.0-alpha01</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>androidx.test</groupId> - <artifactId>runner</artifactId> - <version>1.6.0-alpha01</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.9.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.7.22</version> - <scope>compile</scope> - </dependency> - </dependencies> -</project> diff --git a/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.6.0-alpha01/espresso-idling-resource-3.6.0-alpha01-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 differindex b9f17de7..7ca56485 100644 --- a/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.6.0-alpha01/espresso-idling-resource-3.6.0-alpha01-sources.jar +++ b/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.5.1/espresso-idling-resource-3.5.1-sources.jar 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 differnew file mode 100644 index 00000000..2a8f39a2 --- /dev/null +++ b/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.5.1/espresso-idling-resource-3.5.1.aar diff --git a/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.6.0-alpha01/espresso-idling-resource-3.6.0-alpha01.pom b/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.5.1/espresso-idling-resource-3.5.1.pom index 872ca5c0..cd475d76 100644 --- a/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.6.0-alpha01/espresso-idling-resource-3.6.0-alpha01.pom +++ b/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.5.1/espresso-idling-resource-3.5.1.pom @@ -5,7 +5,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>androidx.test.espresso</groupId> <artifactId>espresso-idling-resource</artifactId> - <version>3.6.0-alpha01</version> + <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> diff --git a/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.6.0-alpha01/espresso-idling-resource-3.6.0-alpha01.aar b/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.6.0-alpha01/espresso-idling-resource-3.6.0-alpha01.aar Binary files differdeleted file mode 100644 index f2ee0a5f..00000000 --- a/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.6.0-alpha01/espresso-idling-resource-3.6.0-alpha01.aar +++ /dev/null diff --git a/common/androidx-test/androidx/test/espresso/espresso-intents/3.6.0-alpha01/espresso-intents-3.6.0-alpha01-sources.jar b/common/androidx-test/androidx/test/espresso/espresso-intents/3.5.1/espresso-intents-3.5.1-sources.jar Binary files differindex c37b10b5..fb1fd3bc 100644 --- a/common/androidx-test/androidx/test/espresso/espresso-intents/3.6.0-alpha01/espresso-intents-3.6.0-alpha01-sources.jar +++ b/common/androidx-test/androidx/test/espresso/espresso-intents/3.5.1/espresso-intents-3.5.1-sources.jar 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 differnew file mode 100644 index 00000000..864bac9c --- /dev/null +++ b/common/androidx-test/androidx/test/espresso/espresso-intents/3.5.1/espresso-intents-3.5.1.aar diff --git a/common/androidx-test/androidx/test/ext/junit/1.2.0-alpha01/junit-1.2.0-alpha01.pom b/common/androidx-test/androidx/test/espresso/espresso-intents/3.5.1/espresso-intents-3.5.1.pom index 6a70a4dc..ad484304 100644 --- a/common/androidx-test/androidx/test/ext/junit/1.2.0-alpha01/junit-1.2.0-alpha01.pom +++ b/common/androidx-test/androidx/test/espresso/espresso-intents/3.5.1/espresso-intents-3.5.1.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.2.0-alpha01</version> + <groupId>androidx.test.espresso</groupId> + <artifactId>espresso-intents</artifactId> + <version>3.5.1</version> <packaging>aar</packaging> <name>AndroidX Test Library</name> <description>The AndroidX Test Library provides an extensive framework for testing Android apps</description> @@ -25,33 +25,33 @@ </developers> <dependencies> <dependency> - <groupId>androidx.annotation</groupId> - <artifactId>annotation</artifactId> - <version>1.2.0</version> + <groupId>androidx.test.espresso</groupId> + <artifactId>espresso-core</artifactId> + <version>3.5.1</version> <scope>compile</scope> </dependency> <dependency> - <groupId>androidx.test.services</groupId> - <artifactId>storage</artifactId> - <version>1.5.0-alpha01</version> + <groupId>androidx.test</groupId> + <artifactId>core</artifactId> + <version>1.5.0</version> <scope>compile</scope> </dependency> <dependency> <groupId>androidx.test</groupId> - <artifactId>core</artifactId> - <version>1.6.0-alpha01</version> + <artifactId>rules</artifactId> + <version>1.5.0</version> <scope>compile</scope> </dependency> <dependency> <groupId>androidx.test</groupId> - <artifactId>monitor</artifactId> - <version>1.7.0-alpha01</version> + <artifactId>annotation</artifactId> + <version>1.0.1</version> <scope>compile</scope> </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.13.2</version> + <groupId>org.jetbrains.kotlin</groupId> + <artifactId>kotlin-stdlib</artifactId> + <version>1.7.10</version> <scope>compile</scope> </dependency> </dependencies> diff --git a/common/androidx-test/androidx/test/espresso/espresso-intents/3.6.0-alpha01/espresso-intents-3.6.0-alpha01.aar b/common/androidx-test/androidx/test/espresso/espresso-intents/3.6.0-alpha01/espresso-intents-3.6.0-alpha01.aar Binary files differdeleted file mode 100644 index fb2c52d0..00000000 --- a/common/androidx-test/androidx/test/espresso/espresso-intents/3.6.0-alpha01/espresso-intents-3.6.0-alpha01.aar +++ /dev/null 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 differnew file mode 100644 index 00000000..dd47e2b1 --- /dev/null +++ b/common/androidx-test/androidx/test/espresso/espresso-web/3.5.1/espresso-web-3.5.1-sources.jar 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 differnew file mode 100644 index 00000000..4a705cca --- /dev/null +++ b/common/androidx-test/androidx/test/espresso/espresso-web/3.5.1/espresso-web-3.5.1.aar 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 new file mode 100644 index 00000000..1d9ed45d --- /dev/null +++ b/common/androidx-test/androidx/test/espresso/espresso-web/3.5.1/espresso-web-3.5.1.pom @@ -0,0 +1,46 @@ +<?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-alpha01/espresso-web-3.6.0-alpha01-sources.jar b/common/androidx-test/androidx/test/espresso/espresso-web/3.6.0-alpha01/espresso-web-3.6.0-alpha01-sources.jar Binary files differdeleted file mode 100644 index 71db64b2..00000000 --- a/common/androidx-test/androidx/test/espresso/espresso-web/3.6.0-alpha01/espresso-web-3.6.0-alpha01-sources.jar +++ /dev/null diff --git a/common/androidx-test/androidx/test/espresso/espresso-web/3.6.0-alpha01/espresso-web-3.6.0-alpha01.aar b/common/androidx-test/androidx/test/espresso/espresso-web/3.6.0-alpha01/espresso-web-3.6.0-alpha01.aar Binary files differdeleted file mode 100644 index 27eff5c5..00000000 --- a/common/androidx-test/androidx/test/espresso/espresso-web/3.6.0-alpha01/espresso-web-3.6.0-alpha01.aar +++ /dev/null diff --git a/common/androidx-test/androidx/test/espresso/espresso-web/3.6.0-alpha01/espresso-web-3.6.0-alpha01.pom b/common/androidx-test/androidx/test/espresso/espresso-web/3.6.0-alpha01/espresso-web-3.6.0-alpha01.pom deleted file mode 100644 index 4490866c..00000000 --- a/common/androidx-test/androidx/test/espresso/espresso-web/3.6.0-alpha01/espresso-web-3.6.0-alpha01.pom +++ /dev/null @@ -1,100 +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.6.0-alpha01</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.2.0</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-alpha01</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>androidx.test</groupId> - <artifactId>monitor</artifactId> - <version>1.7.0-alpha01</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>androidx.test</groupId> - <artifactId>runner</artifactId> - <version>1.6.0-alpha01</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.9.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.7.22</version> - <scope>compile</scope> - </dependency> - </dependencies> -</project> diff --git a/common/androidx-test/androidx/test/ext/junit/1.2.0-alpha01/junit-1.2.0-alpha01-sources.jar b/common/androidx-test/androidx/test/ext/junit/1.1.5/junit-1.1.5-sources.jar Binary files differindex 6ea376d1..de449bad 100644 --- a/common/androidx-test/androidx/test/ext/junit/1.2.0-alpha01/junit-1.2.0-alpha01-sources.jar +++ b/common/androidx-test/androidx/test/ext/junit/1.1.5/junit-1.1.5-sources.jar 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 differnew file mode 100644 index 00000000..162d864f --- /dev/null +++ b/common/androidx-test/androidx/test/ext/junit/1.1.5/junit-1.1.5.aar diff --git a/common/androidx-test/androidx/test/rules/1.6.0-alpha01/rules-1.6.0-alpha01.pom b/common/androidx-test/androidx/test/ext/junit/1.1.5/junit-1.1.5.pom index e21f5919..7dd12cbd 100644 --- a/common/androidx-test/androidx/test/rules/1.6.0-alpha01/rules-1.6.0-alpha01.pom +++ b/common/androidx-test/androidx/test/ext/junit/1.1.5/junit-1.1.5.pom @@ -3,9 +3,9 @@ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> - <groupId>androidx.test</groupId> - <artifactId>rules</artifactId> - <version>1.6.0-alpha01</version> + <groupId>androidx.test.ext</groupId> + <artifactId>junit</artifactId> + <version>1.1.5</version> <packaging>aar</packaging> <name>AndroidX Test Library</name> <description>The AndroidX Test Library provides an extensive framework for testing Android apps</description> @@ -25,27 +25,27 @@ </developers> <dependencies> <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> <dependency> <groupId>androidx.test</groupId> - <artifactId>annotation</artifactId> - <version>1.1.0-alpha01</version> + <artifactId>core</artifactId> + <version>1.5.0</version> <scope>compile</scope> </dependency> <dependency> <groupId>androidx.test</groupId> - <artifactId>runner</artifactId> - <version>1.6.0-alpha01</version> + <artifactId>monitor</artifactId> + <version>1.6.1</version> <scope>compile</scope> </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.13.2</version> + <groupId>androidx.annotation</groupId> + <artifactId>annotation</artifactId> + <version>1.2.0</version> <scope>compile</scope> </dependency> </dependencies> diff --git a/common/androidx-test/androidx/test/ext/junit/1.2.0-alpha01/junit-1.2.0-alpha01.aar b/common/androidx-test/androidx/test/ext/junit/1.2.0-alpha01/junit-1.2.0-alpha01.aar Binary files differdeleted file mode 100644 index b1b1f248..00000000 --- a/common/androidx-test/androidx/test/ext/junit/1.2.0-alpha01/junit-1.2.0-alpha01.aar +++ /dev/null diff --git a/common/androidx-test/androidx/test/ext/truth/1.6.0-alpha01/truth-1.6.0-alpha01-sources.jar b/common/androidx-test/androidx/test/ext/truth/1.5.0/truth-1.5.0-sources.jar Binary files differindex ec1f4491..709d1abc 100644 --- a/common/androidx-test/androidx/test/ext/truth/1.6.0-alpha01/truth-1.6.0-alpha01-sources.jar +++ b/common/androidx-test/androidx/test/ext/truth/1.5.0/truth-1.5.0-sources.jar 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 differnew file mode 100644 index 00000000..b9e9690b --- /dev/null +++ b/common/androidx-test/androidx/test/ext/truth/1.5.0/truth-1.5.0.aar diff --git a/common/androidx-test/androidx/test/ext/truth/1.6.0-alpha01/truth-1.6.0-alpha01.pom b/common/androidx-test/androidx/test/ext/truth/1.5.0/truth-1.5.0.pom index a57786be..d39c073b 100644 --- a/common/androidx-test/androidx/test/ext/truth/1.6.0-alpha01/truth-1.6.0-alpha01.pom +++ b/common/androidx-test/androidx/test/ext/truth/1.5.0/truth-1.5.0.pom @@ -5,7 +5,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>androidx.test.ext</groupId> <artifactId>truth</artifactId> - <version>1.6.0-alpha01</version> + <version>1.5.0</version> <packaging>aar</packaging> <name>AndroidX Test Library</name> <description>The AndroidX Test Library provides an extensive framework for testing Android apps</description> @@ -25,21 +25,9 @@ </developers> <dependencies> <dependency> - <groupId>androidx.annotation</groupId> - <artifactId>annotation</artifactId> - <version>1.2.0</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>androidx.test</groupId> - <artifactId>annotation</artifactId> - <version>1.1.0-alpha01</version> - <scope>compile</scope> - </dependency> - <dependency> <groupId>androidx.test</groupId> <artifactId>core</artifactId> - <version>1.6.0-alpha01</version> + <version>1.5.0</version> <scope>compile</scope> </dependency> <dependency> @@ -51,7 +39,19 @@ <dependency> <groupId>com.google.truth</groupId> <artifactId>truth</artifactId> - <version>1.0</version> + <version>1.1.3</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>androidx.annotation</groupId> + <artifactId>annotation</artifactId> + <version>1.2.0</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>androidx.test</groupId> + <artifactId>annotation</artifactId> + <version>1.0.1</version> <scope>compile</scope> </dependency> </dependencies> diff --git a/common/androidx-test/androidx/test/ext/truth/1.6.0-alpha01/truth-1.6.0-alpha01.aar b/common/androidx-test/androidx/test/ext/truth/1.6.0-alpha01/truth-1.6.0-alpha01.aar Binary files differdeleted file mode 100644 index e3fca4ee..00000000 --- a/common/androidx-test/androidx/test/ext/truth/1.6.0-alpha01/truth-1.6.0-alpha01.aar +++ /dev/null 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 differnew file mode 100644 index 00000000..4f89266c --- /dev/null +++ b/common/androidx-test/androidx/test/monitor/1.6.1/monitor-1.6.1-sources.jar 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 differnew file mode 100644 index 00000000..116fcbe5 --- /dev/null +++ b/common/androidx-test/androidx/test/monitor/1.6.1/monitor-1.6.1.aar diff --git a/common/androidx-test/androidx/test/monitor/1.7.0-alpha01/monitor-1.7.0-alpha01.pom b/common/androidx-test/androidx/test/monitor/1.6.1/monitor-1.6.1.pom index e72f2a3c..a0ec941c 100644 --- a/common/androidx-test/androidx/test/monitor/1.7.0-alpha01/monitor-1.7.0-alpha01.pom +++ b/common/androidx-test/androidx/test/monitor/1.6.1/monitor-1.6.1.pom @@ -5,7 +5,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>androidx.test</groupId> <artifactId>monitor</artifactId> - <version>1.7.0-alpha01</version> + <version>1.6.1</version> <packaging>aar</packaging> <name>AndroidX Test Library</name> <description>The AndroidX Test Library provides an extensive framework for testing Android apps</description> @@ -33,19 +33,13 @@ <dependency> <groupId>androidx.test</groupId> <artifactId>annotation</artifactId> - <version>1.1.0-alpha01</version> + <version>1.0.1</version> <scope>compile</scope> </dependency> <dependency> <groupId>androidx.tracing</groupId> <artifactId>tracing</artifactId> - <version>1.1.0</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.jetbrains.kotlin</groupId> - <artifactId>kotlin-stdlib</artifactId> - <version>1.7.22</version> + <version>1.0.0</version> <scope>compile</scope> </dependency> </dependencies> diff --git a/common/androidx-test/androidx/test/monitor/1.7.0-alpha01/monitor-1.7.0-alpha01-sources.jar b/common/androidx-test/androidx/test/monitor/1.7.0-alpha01/monitor-1.7.0-alpha01-sources.jar Binary files differdeleted file mode 100644 index 1a43833c..00000000 --- a/common/androidx-test/androidx/test/monitor/1.7.0-alpha01/monitor-1.7.0-alpha01-sources.jar +++ /dev/null diff --git a/common/androidx-test/androidx/test/monitor/1.7.0-alpha01/monitor-1.7.0-alpha01.aar b/common/androidx-test/androidx/test/monitor/1.7.0-alpha01/monitor-1.7.0-alpha01.aar Binary files differdeleted file mode 100644 index 522c6bc4..00000000 --- a/common/androidx-test/androidx/test/monitor/1.7.0-alpha01/monitor-1.7.0-alpha01.aar +++ /dev/null diff --git a/common/androidx-test/androidx/test/rules/1.6.0-alpha01/rules-1.6.0-alpha01-sources.jar b/common/androidx-test/androidx/test/rules/1.5.0/rules-1.5.0-sources.jar Binary files differindex b5b1915c..31a5568b 100644 --- a/common/androidx-test/androidx/test/rules/1.6.0-alpha01/rules-1.6.0-alpha01-sources.jar +++ b/common/androidx-test/androidx/test/rules/1.5.0/rules-1.5.0-sources.jar 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 differnew file mode 100644 index 00000000..b9a4d16e --- /dev/null +++ b/common/androidx-test/androidx/test/rules/1.5.0/rules-1.5.0.aar diff --git a/common/androidx-test/androidx/test/rules/1.5.0/rules-1.5.0.pom b/common/androidx-test/androidx/test/rules/1.5.0/rules-1.5.0.pom new file mode 100644 index 00000000..8c31eca6 --- /dev/null +++ b/common/androidx-test/androidx/test/rules/1.5.0/rules-1.5.0.pom @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <groupId>androidx.test</groupId> + <artifactId>rules</artifactId> + <version>1.5.0</version> + <packaging>aar</packaging> + <name>AndroidX Test Library</name> + <description>The AndroidX Test Library provides an extensive framework for testing Android apps</description> + <url>https://developer.android.com/testing</url> + <inceptionYear>2015</inceptionYear> + <licenses> + <license> + <name>The Apache Software License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo</distribution> + </license> + </licenses> + <developers> + <developer> + <name>The Android Open Source Project</name> + </developer> + </developers> + <dependencies> + <dependency> + <groupId>androidx.test</groupId> + <artifactId>runner</artifactId> + <version>1.5.0</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>androidx.test</groupId> + <artifactId>annotation</artifactId> + <version>1.0.1</version> + <scope>compile</scope> + </dependency> + </dependencies> +</project> diff --git a/common/androidx-test/androidx/test/rules/1.6.0-alpha01/rules-1.6.0-alpha01.aar b/common/androidx-test/androidx/test/rules/1.6.0-alpha01/rules-1.6.0-alpha01.aar Binary files differdeleted file mode 100644 index 229c601e..00000000 --- a/common/androidx-test/androidx/test/rules/1.6.0-alpha01/rules-1.6.0-alpha01.aar +++ /dev/null diff --git a/common/androidx-test/androidx/test/runner/1.6.0-alpha01/runner-1.6.0-alpha01-sources.jar b/common/androidx-test/androidx/test/runner/1.5.3-alpha01/runner-1.5.3-alpha01-sources.jar Binary files differindex 0c43ab0b..090711e2 100644 --- a/common/androidx-test/androidx/test/runner/1.6.0-alpha01/runner-1.6.0-alpha01-sources.jar +++ b/common/androidx-test/androidx/test/runner/1.5.3-alpha01/runner-1.5.3-alpha01-sources.jar 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 differnew file mode 100644 index 00000000..0140d16b --- /dev/null +++ b/common/androidx-test/androidx/test/runner/1.5.3-alpha01/runner-1.5.3-alpha01.aar diff --git a/common/androidx-test/androidx/test/runner/1.6.0-alpha01/runner-1.6.0-alpha01.pom b/common/androidx-test/androidx/test/runner/1.5.3-alpha01/runner-1.5.3-alpha01.pom index 8191cf91..0ae83def 100644 --- a/common/androidx-test/androidx/test/runner/1.6.0-alpha01/runner-1.6.0-alpha01.pom +++ b/common/androidx-test/androidx/test/runner/1.5.3-alpha01/runner-1.5.3-alpha01.pom @@ -5,7 +5,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>androidx.test</groupId> <artifactId>runner</artifactId> - <version>1.6.0-alpha01</version> + <version>1.5.3-alpha01</version> <packaging>aar</packaging> <name>AndroidX Test Library</name> <description>The AndroidX Test Library provides an extensive framework for testing Android apps</description> @@ -31,27 +31,27 @@ <scope>compile</scope> </dependency> <dependency> - <groupId>androidx.test.services</groupId> - <artifactId>storage</artifactId> - <version>1.5.0-alpha01</version> - <scope>compile</scope> - </dependency> - <dependency> <groupId>androidx.test</groupId> <artifactId>annotation</artifactId> - <version>1.1.0-alpha01</version> + <version>1.0.1</version> <scope>compile</scope> </dependency> <dependency> <groupId>androidx.test</groupId> <artifactId>monitor</artifactId> - <version>1.7.0-alpha01</version> + <version>[1.6.1]</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>androidx.test.services</groupId> + <artifactId>storage</artifactId> + <version>[1.4.2]</version> <scope>compile</scope> </dependency> <dependency> <groupId>androidx.tracing</groupId> <artifactId>tracing</artifactId> - <version>1.1.0</version> + <version>1.0.0</version> <scope>compile</scope> </dependency> <dependency> diff --git a/common/androidx-test/androidx/test/runner/1.6.0-alpha01/runner-1.6.0-alpha01.aar b/common/androidx-test/androidx/test/runner/1.6.0-alpha01/runner-1.6.0-alpha01.aar Binary files differdeleted file mode 100644 index 1e276679..00000000 --- a/common/androidx-test/androidx/test/runner/1.6.0-alpha01/runner-1.6.0-alpha01.aar +++ /dev/null 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 differnew file mode 100644 index 00000000..56d815d5 --- /dev/null +++ b/common/androidx-test/androidx/test/services/storage/1.4.2/storage-1.4.2-sources.jar 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 differnew file mode 100644 index 00000000..59a57eac --- /dev/null +++ b/common/androidx-test/androidx/test/services/storage/1.4.2/storage-1.4.2.aar diff --git a/common/androidx-test/androidx/test/services/storage/1.5.0-alpha01/storage-1.5.0-alpha01.pom b/common/androidx-test/androidx/test/services/storage/1.4.2/storage-1.4.2.pom index edd89ab6..8685d29a 100644 --- a/common/androidx-test/androidx/test/services/storage/1.5.0-alpha01/storage-1.5.0-alpha01.pom +++ b/common/androidx-test/androidx/test/services/storage/1.4.2/storage-1.4.2.pom @@ -5,7 +5,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>androidx.test.services</groupId> <artifactId>storage</artifactId> - <version>1.5.0-alpha01</version> + <version>1.4.2</version> <packaging>aar</packaging> <name>AndroidX Test Library</name> <description>The AndroidX Test Library provides an extensive framework for testing Android apps</description> @@ -32,14 +32,20 @@ </dependency> <dependency> <groupId>androidx.test</groupId> - <artifactId>annotation</artifactId> - <version>1.1.0-alpha01</version> + <artifactId>monitor</artifactId> + <version>[1.6.0]</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>com.google.code.findbugs</groupId> + <artifactId>jsr305</artifactId> + <version>2.0.2</version> <scope>compile</scope> </dependency> <dependency> <groupId>androidx.test</groupId> - <artifactId>monitor</artifactId> - <version>1.7.0-alpha01</version> + <artifactId>annotation</artifactId> + <version>1.0.1</version> <scope>compile</scope> </dependency> </dependencies> diff --git a/common/androidx-test/androidx/test/services/storage/1.5.0-alpha01/storage-1.5.0-alpha01-sources.jar b/common/androidx-test/androidx/test/services/storage/1.5.0-alpha01/storage-1.5.0-alpha01-sources.jar Binary files differdeleted file mode 100644 index b4a44f38..00000000 --- a/common/androidx-test/androidx/test/services/storage/1.5.0-alpha01/storage-1.5.0-alpha01-sources.jar +++ /dev/null diff --git a/common/androidx-test/androidx/test/services/storage/1.5.0-alpha01/storage-1.5.0-alpha01.aar b/common/androidx-test/androidx/test/services/storage/1.5.0-alpha01/storage-1.5.0-alpha01.aar Binary files differdeleted file mode 100644 index 27e2660e..00000000 --- a/common/androidx-test/androidx/test/services/storage/1.5.0-alpha01/storage-1.5.0-alpha01.aar +++ /dev/null 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 differnew file mode 100644 index 00000000..86aeb402 --- /dev/null +++ b/common/androidx-test/androidx/test/services/test-services/1.4.2/test-services-1.4.2.apk diff --git a/common/androidx-test/androidx/test/services/test-services/1.5.0-alpha01/test-services-1.5.0-alpha01.pom b/common/androidx-test/androidx/test/services/test-services/1.4.2/test-services-1.4.2.pom index a98c0867..b01b811f 100644 --- a/common/androidx-test/androidx/test/services/test-services/1.5.0-alpha01/test-services-1.5.0-alpha01.pom +++ b/common/androidx-test/androidx/test/services/test-services/1.4.2/test-services-1.4.2.pom @@ -5,7 +5,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>androidx.test.services</groupId> <artifactId>test-services</artifactId> - <version>1.5.0-alpha01</version> + <version>1.4.2</version> <packaging>apk</packaging> <name>AndroidX Test Library</name> <description>The AndroidX Test Library provides an extensive framework for testing Android apps</description> diff --git a/common/androidx-test/androidx/test/services/test-services/1.5.0-alpha01/test-services-1.5.0-alpha01.apk b/common/androidx-test/androidx/test/services/test-services/1.5.0-alpha01/test-services-1.5.0-alpha01.apk Binary files differdeleted file mode 100644 index 036200b2..00000000 --- a/common/androidx-test/androidx/test/services/test-services/1.5.0-alpha01/test-services-1.5.0-alpha01.apk +++ /dev/null diff --git a/common/androidx-test/manifests/androidx.test.annotation/AndroidManifest.xml b/common/androidx-test/manifests/androidx.test.annotation/AndroidManifest.xml index 45d79d1c..da6d25a2 100644 --- a/common/androidx-test/manifests/androidx.test.annotation/AndroidManifest.xml +++ b/common/androidx-test/manifests/androidx.test.annotation/AndroidManifest.xml @@ -19,6 +19,6 @@ <uses-sdk android:minSdkVersion="14" - android:targetSdkVersion="33" /> + android:targetSdkVersion="30" /> </manifest>
\ No newline at end of file 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 1d63b636..602c3d31 100644 --- a/common/androidx-test/manifests/androidx.test.espresso.contrib/AndroidManifest.xml +++ b/common/androidx-test/manifests/androidx.test.espresso.contrib/AndroidManifest.xml @@ -19,7 +19,7 @@ <uses-sdk android:minSdkVersion="14" - android:targetSdkVersion="33" /> + android:targetSdkVersion="28" /> <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 b1480526..82f8cb05 100644 --- a/common/androidx-test/manifests/androidx.test.espresso.core/AndroidManifest.xml +++ b/common/androidx-test/manifests/androidx.test.espresso.core/AndroidManifest.xml @@ -19,6 +19,6 @@ <uses-sdk android:minSdkVersion="14" - android:targetSdkVersion="33" /> + android:targetSdkVersion="28" /> </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 b6594c30..7a501297 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 @@ -19,6 +19,6 @@ <uses-sdk android:minSdkVersion="14" - android:targetSdkVersion="33" /> + android:targetSdkVersion="28" /> </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 a58367af..4794b778 100644 --- a/common/androidx-test/manifests/androidx.test.espresso.intents/AndroidManifest.xml +++ b/common/androidx-test/manifests/androidx.test.espresso.intents/AndroidManifest.xml @@ -19,6 +19,6 @@ <uses-sdk android:minSdkVersion="14" - android:targetSdkVersion="33" /> + android:targetSdkVersion="28" /> </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 35438746..e258c4c7 100644 --- a/common/androidx-test/manifests/androidx.test.espresso.web/AndroidManifest.xml +++ b/common/androidx-test/manifests/androidx.test.espresso.web/AndroidManifest.xml @@ -19,6 +19,6 @@ <uses-sdk android:minSdkVersion="14" - android:targetSdkVersion="33" /> + android:targetSdkVersion="28" /> </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 c3e5aa82..ed2316c9 100644 --- a/common/androidx-test/manifests/androidx.test.ext.junit/AndroidManifest.xml +++ b/common/androidx-test/manifests/androidx.test.ext.junit/AndroidManifest.xml @@ -19,6 +19,6 @@ <uses-sdk android:minSdkVersion="14" - android:targetSdkVersion="33" /> + android:targetSdkVersion="28" /> </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 dbf911eb..910000ac 100644 --- a/common/androidx-test/manifests/androidx.test.ext.truth/AndroidManifest.xml +++ b/common/androidx-test/manifests/androidx.test.ext.truth/AndroidManifest.xml @@ -19,6 +19,6 @@ <uses-sdk android:minSdkVersion="14" - android:targetSdkVersion="33" /> + android:targetSdkVersion="28" /> </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 e4ec0c69..2cffb5c6 100644 --- a/common/androidx-test/manifests/androidx.test.monitor/AndroidManifest.xml +++ b/common/androidx-test/manifests/androidx.test.monitor/AndroidManifest.xml @@ -19,6 +19,6 @@ <uses-sdk android:minSdkVersion="14" - android:targetSdkVersion="33" /> + android:targetSdkVersion="28" /> </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 ee03e47f..654fd761 100644 --- a/common/androidx-test/manifests/androidx.test.rules/AndroidManifest.xml +++ b/common/androidx-test/manifests/androidx.test.rules/AndroidManifest.xml @@ -19,6 +19,6 @@ <uses-sdk android:minSdkVersion="14" - android:targetSdkVersion="33" /> + android:targetSdkVersion="28" /> </manifest>
\ No newline at end of file diff --git a/common/androidx-test/prepend-license.txt b/common/androidx-test/prepend-license.txt index 50401f45..8c4065d8 100644 --- a/common/androidx-test/prepend-license.txt +++ b/common/androidx-test/prepend-license.txt @@ -4,9 +4,8 @@ package { filegroup { name: "test-services.apk", - srcs: - ["androidx/test/services/test-services/1.5.0-alpha01/test-services-1.5.0-alpha01.apk",], - path: "androidx/test/services/test-services/1.5.0-alpha01", + srcs: ["androidx/test/services/test-services/1.4.2/test-services-1.4.2.apk",], + path: "androidx/test/services/test-services/1.4.2", visibility: [ "//tools/tradefederation/core:__pkg__", ], diff --git a/common/androidx-test/update-from-gmaven.py b/common/androidx-test/update-from-gmaven.py index 0620ca03..5e029db1 100755 --- a/common/androidx-test/update-from-gmaven.py +++ b/common/androidx-test/update-from-gmaven.py @@ -18,15 +18,15 @@ import os import subprocess import sys -annotationVersion="1.1.0-alpha01" -monitorVersion="1.7.0-alpha01" -runnerVersion="1.6.0-alpha01" -rulesVersion="1.6.0-alpha01" -espressoVersion="3.6.0-alpha01" -coreVersion="1.6.0-alpha01" -extJUnitVersion="1.2.0-alpha01" -extTruthVersion="1.6.0-alpha01" -servicesVersion="1.5.0-alpha01" +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" jankTestHelperVersion="1.0.1" mavenToBpPatternMap = { @@ -145,7 +145,6 @@ 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 " + @@ -153,7 +152,6 @@ 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 " + |