diff options
author | Brett Chabot <brettchabot@google.com> | 2019-02-18 21:38:56 -0800 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-02-18 21:38:56 -0800 |
commit | b1ebd4b963279034c01dddf8e51aea23f45de5b4 (patch) | |
tree | d3299f5e038fda83154a3f8f5b70605ab23e9a0e | |
parent | d4394180b7773a97d8e13e5d3dd58a0b669cd5ff (diff) | |
parent | 3f4697d30655239f78d91f9b5e59bbf4a696a2e3 (diff) | |
download | misc-b1ebd4b963279034c01dddf8e51aea23f45de5b4.tar.gz |
Merge "Add androidx.test variants of uiautomator and janktesthelper" am: d16cc82d09
am: 3f4697d306
Change-Id: I4b0d5acaabf30ea5e87f3d6a8652437a4d3ff56b
8 files changed, 168 insertions, 1 deletions
diff --git a/common/androidx-test/Android.bp b/common/androidx-test/Android.bp index 9399cb3d..d7b43abb 100644 --- a/common/androidx-test/Android.bp +++ b/common/androidx-test/Android.bp @@ -1,5 +1,5 @@ // Automatically generated with: -// pom2bp -rewrite 'androidx.test:=androidx.test.' -rewrite 'androidx.test.espresso:espresso-=androidx.test.espresso.' -rewrite 'androidx.test.ext:=androidx.test.ext.' -rewrite 'com.google.truth:truth=truth-prebuilt' -rewrite 'net.sf.kxml:kxml2=kxml2-android' -rewrite 'androidx.lifecycle:lifecycle-common=androidx.lifecycle_lifecycle-common' -rewrite 'androidx.annotation:annotation=androidx.annotation_annotation' -rewrite 'org.hamcrest:hamcrest-integration=hamcrest' -rewrite 'javax.inject:javax.inject=jsr330' -rewrite 'com.google.android.material:material=com.google.android.material_material' -rewrite 'androidx.drawerlayout:drawerlayout=androidx.drawerlayout_drawerlayout' -rewrite 'androidx.viewpager:viewpager=androidx.viewpager_viewpager' -rewrite 'androidx.recyclerview:recyclerview=androidx.recyclerview_recyclerview' -rewrite 'androidx.core:core=androidx.core_core' -rewrite 'androidx.legacy:legacy-support-core-utils=androidx.legacy_legacy-support-core-utils' -sdk-version current . +// pom2bp -rewrite 'androidx.test.janktesthelper:janktesthelper=androidx.test.janktesthelper' -rewrite 'androidx.test.uiautomator:uiautomator=androidx.test.uiautomator' -rewrite 'androidx.test.espresso:espresso-=androidx.test.espresso.' -rewrite 'androidx.test:=androidx.test.' -rewrite 'androidx.test.ext:=androidx.test.ext.' -rewrite 'com.google.truth:truth=truth-prebuilt' -rewrite 'net.sf.kxml:kxml2=kxml2-android' -rewrite 'androidx.lifecycle:lifecycle-common=androidx.lifecycle_lifecycle-common' -rewrite 'androidx.annotation:annotation=androidx.annotation_annotation' -rewrite 'org.hamcrest:hamcrest-integration=hamcrest' -rewrite 'javax.inject:javax.inject=jsr330' -rewrite 'com.google.android.material:material=com.google.android.material_material' -rewrite 'androidx.drawerlayout:drawerlayout=androidx.drawerlayout_drawerlayout' -rewrite 'androidx.viewpager:viewpager=androidx.viewpager_viewpager' -rewrite 'androidx.recyclerview:recyclerview=androidx.recyclerview_recyclerview' -rewrite 'androidx.core:core=androidx.core_core' -rewrite 'androidx.legacy:legacy-support-core-utils=androidx.legacy_legacy-support-core-utils' -sdk-version current . android_library_import { name: "androidx.test.core-nodeps", @@ -207,6 +207,30 @@ android_library { } android_library_import { + name: "androidx.test.janktesthelper-nodeps", + aars: ["androidx/test/janktesthelper/janktesthelper/1.0.1/janktesthelper-1.0.1.aar"], + sdk_version: "current", + min_sdk_version: "23", + static_libs: [ + "androidx.test.runner", + "androidx.test.rules", + ], +} + +android_library { + name: "androidx.test.janktesthelper", + sdk_version: "current", + min_sdk_version: "23", + manifest: "manifests/androidx.test.janktesthelper/AndroidManifest.xml", + static_libs: [ + "androidx.test.janktesthelper-nodeps", + "androidx.test.runner", + "androidx.test.rules", + ], + java_version: "1.7", +} + +android_library_import { name: "androidx.test.monitor-nodeps", aars: ["androidx/test/monitor/1.1.2-alpha01/monitor-1.1.2-alpha01.aar"], sdk_version: "current", @@ -273,3 +297,23 @@ android_library { ], java_version: "1.7", } + +android_library_import { + name: "androidx.test.uiautomator-nodeps", + aars: ["androidx/test/uiautomator/uiautomator/2.2.0/uiautomator-2.2.0.aar"], + sdk_version: "current", + min_sdk_version: "18", + static_libs: [ + ], +} + +android_library { + name: "androidx.test.uiautomator", + sdk_version: "current", + min_sdk_version: "18", + manifest: "manifests/androidx.test.uiautomator/AndroidManifest.xml", + static_libs: [ + "androidx.test.uiautomator-nodeps", + ], + java_version: "1.7", +} diff --git a/common/androidx-test/androidx/test/janktesthelper/janktesthelper/1.0.1/janktesthelper-1.0.1.aar b/common/androidx-test/androidx/test/janktesthelper/janktesthelper/1.0.1/janktesthelper-1.0.1.aar Binary files differnew file mode 100644 index 00000000..6e95f9c9 --- /dev/null +++ b/common/androidx-test/androidx/test/janktesthelper/janktesthelper/1.0.1/janktesthelper-1.0.1.aar diff --git a/common/androidx-test/androidx/test/janktesthelper/janktesthelper/1.0.1/janktesthelper-1.0.1.pom b/common/androidx-test/androidx/test/janktesthelper/janktesthelper/1.0.1/janktesthelper-1.0.1.pom new file mode 100644 index 00000000..0ee23327 --- /dev/null +++ b/common/androidx-test/androidx/test/janktesthelper/janktesthelper/1.0.1/janktesthelper-1.0.1.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.janktesthelper</groupId> + <artifactId>janktesthelper</artifactId> + <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> + <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.1.0</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>androidx.test</groupId> + <artifactId>rules</artifactId> + <version>1.1.0</version> + <scope>compile</scope> + </dependency> + </dependencies> +</project> diff --git a/common/androidx-test/androidx/test/uiautomator/uiautomator/2.2.0/uiautomator-2.2.0.aar b/common/androidx-test/androidx/test/uiautomator/uiautomator/2.2.0/uiautomator-2.2.0.aar Binary files differnew file mode 100644 index 00000000..0de0b200 --- /dev/null +++ b/common/androidx-test/androidx/test/uiautomator/uiautomator/2.2.0/uiautomator-2.2.0.aar diff --git a/common/androidx-test/androidx/test/uiautomator/uiautomator/2.2.0/uiautomator-2.2.0.pom b/common/androidx-test/androidx/test/uiautomator/uiautomator/2.2.0/uiautomator-2.2.0.pom new file mode 100644 index 00000000..7138ebe2 --- /dev/null +++ b/common/androidx-test/androidx/test/uiautomator/uiautomator/2.2.0/uiautomator-2.2.0.pom @@ -0,0 +1,29 @@ +<?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.uiautomator</groupId> + <artifactId>uiautomator</artifactId> + <version>2.2.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> + + </dependencies> +</project> diff --git a/common/androidx-test/manifests/androidx.test.janktesthelper/AndroidManifest.xml b/common/androidx-test/manifests/androidx.test.janktesthelper/AndroidManifest.xml new file mode 100644 index 00000000..7443ef6d --- /dev/null +++ b/common/androidx-test/manifests/androidx.test.janktesthelper/AndroidManifest.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2014 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. +--> +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="android_libs.ub_janktesthelper" > + + <uses-sdk android:minSdkVersion="23" /> + + <application /> + +</manifest>
\ No newline at end of file diff --git a/common/androidx-test/manifests/androidx.test.uiautomator/AndroidManifest.xml b/common/androidx-test/manifests/androidx.test.uiautomator/AndroidManifest.xml new file mode 100644 index 00000000..71d498b0 --- /dev/null +++ b/common/androidx-test/manifests/androidx.test.uiautomator/AndroidManifest.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2014 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. +--> +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="android_libs.ub_uiautomator" > + + <uses-sdk android:minSdkVersion="18" /> + + <application /> + +</manifest>
\ No newline at end of file diff --git a/common/androidx-test/update-from-gmaven.py b/common/androidx-test/update-from-gmaven.py index 849cb531..b7881301 100755 --- a/common/androidx-test/update-from-gmaven.py +++ b/common/androidx-test/update-from-gmaven.py @@ -24,11 +24,15 @@ espressoVersion="3.1.2-alpha01" coreVersion="1.1.1-alpha01" extJUnitVersion="1.1.1-alpha01" extTruthVersion="1.1.1-alpha01" +jankTestHelperVersion="1.0.1" +uiAutomatorVersion="2.2.0" mavenToBpPatternMap = { "androidx.test:" : "androidx.test.", "androidx.test.ext:": "androidx.test.ext.", "androidx.test.espresso:espresso-":"androidx.test.espresso.", + "androidx.test.janktesthelper:janktesthelper":"androidx.test.janktesthelper", + "androidx.test.uiautomator:uiautomator":"androidx.test.uiautomator", } def cmd(args): @@ -97,6 +101,8 @@ downloadArtifact("androidx.test", "rules", rulesVersion) downloadArtifact("androidx.test", "runner", runnerVersion) downloadArtifact("androidx.test.ext", "junit", extJUnitVersion) downloadArtifact("androidx.test.ext", "truth", extTruthVersion) +downloadArtifact("androidx.test.janktesthelper", "janktesthelper", jankTestHelperVersion) +downloadArtifact("androidx.test.uiautomator", "uiautomator", uiAutomatorVersion) atxRewriteStr = "" for name in mavenToBpPatternMap: |