diff options
| author | Kevin Jin <kjin@google.com> | 2016-03-14 13:58:19 -0700 |
|---|---|---|
| committer | Kevin Jin <kjin@google.com> | 2016-03-14 14:18:16 -0700 |
| commit | ae6ae8f16b46e25b3c24818ababa848e43518aeb (patch) | |
| tree | dd8695b1a1d5c4d5b206758b9a2c897940403e12 /manualtest | |
| parent | 3d5506feee049cc6f5cb8975053e991f6702a365 (diff) | |
| download | droiddriver-ae6ae8f16b46e25b3c24818ababa848e43518aeb.tar.gz | |
Remove Android.mk files
Update manualtest/build.gradle for new Gradle plugin
Change-Id: I447802519ce738fb2c5063b9a68ad871106e40b1
Diffstat (limited to 'manualtest')
| -rw-r--r-- | manualtest/Android.mk | 17 | ||||
| -rw-r--r-- | manualtest/build.gradle | 11 | ||||
| -rw-r--r-- | manualtest/src/io/appium/droiddriver/manualtest/ManualTest.java | 4 |
3 files changed, 6 insertions, 26 deletions
diff --git a/manualtest/Android.mk b/manualtest/Android.mk deleted file mode 100644 index 6b52b73..0000000 --- a/manualtest/Android.mk +++ /dev/null @@ -1,17 +0,0 @@ -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) -LOCAL_PACKAGE_NAME := ManualDD - -LOCAL_MODULE_TAGS := optional -LOCAL_PROGUARD_ENABLED := disabled - -LOCAL_SRC_FILES := \ - $(call all-java-files-under, src) - -LOCAL_STATIC_JAVA_LIBRARIES := \ - droiddriver - -LOCAL_SDK_VERSION := 19 - -include $(BUILD_PACKAGE) - diff --git a/manualtest/build.gradle b/manualtest/build.gradle index a732fe3..e6ce4e1 100644 --- a/manualtest/build.gradle +++ b/manualtest/build.gradle @@ -3,8 +3,7 @@ buildscript { jcenter() } dependencies { - // this requires Gradle 2 - classpath 'com.android.tools.build:gradle:1.0.1' + classpath 'com.android.tools.build:gradle:1.3.0' } } @@ -14,15 +13,11 @@ apply plugin: 'com.android.application' android { compileSdkVersion 21 buildToolsVersion '21.1.2' - defaultConfig { minSdkVersion 8 targetSdkVersion 21 - // Force remove the suffix '.test' - testApplicationId 'io.appium.droiddriver.manualtest' testInstrumentationRunner 'io.appium.droiddriver.runner.TestRunner' } - sourceSets { main { manifest.srcFile 'AndroidManifest.xml' @@ -31,6 +26,8 @@ android { java.srcDirs = ['src'] } } + productFlavors { + } } // Building with droiddriver source. Common tests should use droiddriver from jcenter by having @@ -39,7 +36,7 @@ android { // jcenter() // } // dependencies { -// androidTestCompile 'io.appium:droiddriver:0.9.1-BETA' // or another version +// androidTestCompile 'io.appium:droiddriver:1.0.0-BETA1' // or another version // } dependencies { androidTestCompile project(':droiddriver') diff --git a/manualtest/src/io/appium/droiddriver/manualtest/ManualTest.java b/manualtest/src/io/appium/droiddriver/manualtest/ManualTest.java index 83966f7..59beac4 100644 --- a/manualtest/src/io/appium/droiddriver/manualtest/ManualTest.java +++ b/manualtest/src/io/appium/droiddriver/manualtest/ManualTest.java @@ -16,10 +16,10 @@ import io.appium.droiddriver.uiautomation.UiAutomationDriver; * {@link #testSetTextForPassword} assumes the password_edit field is displayed * on screen. * <p> - * Run it as (optionally with -e debug true) + * Run it with * * <pre> - * adb shell am instrument -w io.appium.droiddriver.manualtest/io.appium.droiddriver.runner.TestRunner + * ../gradlew :connectedAndroidTest * </pre> */ public class ManualTest extends BaseDroidDriverTest<Activity> { |