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 | |
parent | 3d5506feee049cc6f5cb8975053e991f6702a365 (diff) | |
download | droiddriver-ae6ae8f16b46e25b3c24818ababa848e43518aeb.tar.gz |
Remove Android.mk files
Update manualtest/build.gradle for new Gradle plugin
Change-Id: I447802519ce738fb2c5063b9a68ad871106e40b1
-rw-r--r-- | Android.mk | 18 | ||||
-rw-r--r-- | build.gradle | 5 | ||||
-rw-r--r-- | contributing.md | 9 | ||||
-rw-r--r-- | contributing_aosp.md | 20 | ||||
-rw-r--r-- | droiddriver-android_support_test/Android.mk | 19 | ||||
-rw-r--r-- | droiddriver-android_support_test/build.gradle | 2 | ||||
-rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 4 | ||||
-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 |
10 files changed, 18 insertions, 91 deletions
diff --git a/Android.mk b/Android.mk deleted file mode 100644 index e87f611..0000000 --- a/Android.mk +++ /dev/null @@ -1,18 +0,0 @@ -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(call all-java-files-under, src) - -LOCAL_MODULE := droiddriver -LOCAL_MODULE_TAGS := optional -LOCAL_SDK_VERSION := 19 -# Workaround for http://b/27584859 -LOCAL_JAVA_LANGUAGE_VERSION := 1.8 - -LOCAL_JAVACFLAGS += -Xlint:deprecation -Xlint:unchecked - -include $(BUILD_STATIC_JAVA_LIBRARY) - -include $(CLEAR_VARS) - -include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/build.gradle b/build.gradle index 3af6346..5eaae4b 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,6 @@ // sdk.dir for the Android SDK path, you can run // $ ANDROID_HOME=/path/to/android-sdk gradle build -// Gradle >= 2.4 required buildscript { ext.bintrayUser = project.hasProperty('bintrayUser') ? project.bintrayUser : System.getenv('BINTRAY_USER') ext.bintrayKey = project.hasProperty('bintrayKey') ? project.bintrayKey : System.getenv('BINTRAY_KEY') @@ -12,7 +11,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:1.0.1' + classpath 'com.android.tools.build:gradle:1.3.0' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3' classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.0' if (bintrayEnabled) { @@ -30,7 +29,7 @@ apply plugin: 'android-sdk-manager' apply plugin: 'com.android.library' tasks.withType(JavaCompile) { - options.compilerArgs << '-Xlint:deprecation' + options.compilerArgs << '-Xlint:deprecation' << '-Xlint:unchecked' } android { diff --git a/contributing.md b/contributing.md index f8ae829..645ef1b 100644 --- a/contributing.md +++ b/contributing.md @@ -6,18 +6,13 @@ The [`master` branch](https://github.com/appium/droiddriver/tree/master) on GitH Code changes should be [submitted to AOSP](contributing_aosp.md) and then they'll be synced to GitHub once they've passed code reivew on Gerrit. -#### Requirements +#### Build -Gradle 2.2.1 or better is required to be installed on the system. In Android Studio, you'll need to provide the gradle location. - -On Mac OSX with homebrew, `brew install gradle` will install gradle. To locate the path, use `brew info gradle` The homebrew path follows this format: `/usr/local/Cellar/gradle/2.2.1/libexec` - -If you installed gradle using the zip (`gradle-2.2.1-bin.zip`), then the path will be the `gradle-2.2.1` folder. +`./gradlew build` #### Import into Android Studio - Clone from git - Launch Android Studio and select `Open an existing Android Studio project` - Navigate to `droiddriver/build.gradle` and press Choose -- Select `Use local gradle distribution` and enter the Gradle path - Android Studio will now import the project successfully diff --git a/contributing_aosp.md b/contributing_aosp.md index c57a0d1..58bca60 100644 --- a/contributing_aosp.md +++ b/contributing_aosp.md @@ -16,9 +16,12 @@ $ repo sync ``` The code should be downloaded to the current dir. You may see some lines in the output like: -curl: (22) The requested URL returned error: 401 Unauthorized + +`curl: (22) The requested URL returned error: 401 Unauthorized` + These messages seem non-fatal and you should see these dirs after it is done: -build/ external/ frameworks/ Makefile prebuilts/ + +`build/ external/ frameworks/ Makefile prebuilts/` #### Submitting Patches @@ -51,16 +54,3 @@ When commenting on the code, posts will show up as drafts. Drafts are not visibl - `repo upload` The [`repo prune`](https://source.android.com/source/using-repo.html) command can be used to delete already merged branches. - -#### Building - -This sets up environment and some bash functions, particularly "tapas" -(the counterpart of "lunch" for unbundled projects) and "m". - -```bash -$ . build/envsetup.sh -$ tapas droiddriver ManualDD -$ m -``` - -ManualDD is an APK you can use to manually test DroidDriver. diff --git a/droiddriver-android_support_test/Android.mk b/droiddriver-android_support_test/Android.mk deleted file mode 100644 index 22c6c0a..0000000 --- a/droiddriver-android_support_test/Android.mk +++ /dev/null @@ -1,19 +0,0 @@ -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(call all-java-files-under, src) - -LOCAL_MODULE := droiddriver-android_support_test -LOCAL_MODULE_TAGS := optional -LOCAL_SDK_VERSION := 19 - -LOCAL_JAVACFLAGS += -Xlint:deprecation -Xlint:unchecked - -# android-support-test requires /frameworks/testing, /external/junit, /external/hamcrest -LOCAL_JAVA_LIBRARIES := droiddriver android-support-test - -include $(BUILD_STATIC_JAVA_LIBRARY) - -include $(CLEAR_VARS) - -include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/droiddriver-android_support_test/build.gradle b/droiddriver-android_support_test/build.gradle index 3f6120f..24eb724 100644 --- a/droiddriver-android_support_test/build.gradle +++ b/droiddriver-android_support_test/build.gradle @@ -4,7 +4,7 @@ buildscript { } dependencies { // this requires Gradle 2 - classpath 'com.android.tools.build:gradle:1.0.1' + classpath 'com.android.tools.build:gradle:1.3.0' classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.0' } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 22322ac..80b332a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Mar 08 10:10:54 PST 2016 +#Mon Mar 14 09:50:19 PDT 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip 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> { |