diff --git a/.travis.yml b/.travis.yml index 6934497..2542004 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,16 +3,17 @@ language: android android: components: # The BuildTools version used by your project - - build-tools-22 + - build-tools-22.0.1 # The SDK version used to compile your project - android-22 + # Additional components + - extra-android-m2repository + # command to install dependencies install: - - pip install sauceclient - - pip install Appium-Python-Client - - pip install pytest + - sudo pip install -r requirements.txt # command to build and run tests script: @@ -24,5 +25,5 @@ addons: env: global: - - secure: fJarjAplGGrBQuw8gGiTVnhYK9K1k9g0HBB7OohST9EANHbVUQ/x4umQ2edha1felgleCahGRr4u7Yn0KliLjld4B5cdTdGtDoNy86yiT3nGjJIbgcdPOAuPDZf+1Oy9aWhmVHYmuK26gOBIqOgen5BwOPwvI4mwZePd4DigfkY= - - secure: f/LHDLN6O4ODABk3EHe1X/X7HCBjHZ5QAWkKJVLNZOQCMNLwpMPsHhdSQuqDW/f+rFqjPABuF3JsWaX8jcJqkh8/n9u381AwGxZSY0IDzq2Iluo5UKthoR2E4EekR6vTiJf9mmlWQ1lCG817Jyt+GLgwX1CuWyU9r4LhhBXUOl0= \ No newline at end of file + - secure: A1jbSplRPc7lRcjT6yY3Z33ynAEmiSzub5ADEXys4VtzjhenRCejkYAyLmNLm4ywbWWhmmZqXT70YPJQTBr5tbZlfHx5P2GRU1MtBvcXSUO+5RJ3swc80UOVvllhfHNuiiraqwSNcWl7skPHxDfBPBe8QOLp4A17JpJEJ8nFqpc= + - secure: fFmQjyp/tTloQmWFnNb7CZQsk92kZV7a78J0y0XW1kW+NPauxQ7MHsI9GAsOrEByyGF4xz2eKq37Z+LoMZtvcCgPWz5mt62QFQ2jXDxXckVeYr6JQW6gnXMcCR96V7RYLPHW9HbfOYcchiS2lu5ytogNh3NU35OgAscOTfO0Gtc= \ No newline at end of file diff --git a/README.md b/README.md index a358344..cc64db4 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,10 @@ -DesignOverlay - for developers and designers [![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-DesignOverlay-brightgreen.svg?style=flat)](http://android-arsenal.com/details/3/1654) +DesignOverlay - for developers and designers =============== + +[![Build Status](https://travis-ci.org/Manabu-GT/DesignOverlay-Android.svg?branch=master)](https://travis-ci.org/Manabu-GT/DesignOverlay-Android) +[![Sauce Test Status](https://saucelabs.com/buildstatus/design-overlay)](https://saucelabs.com/u/design-overlay) +[![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-DesignOverlay-brightgreen.svg?style=flat)](http://android-arsenal.com/details/3/1654) + DesignOverlay is an android app which displays a design image with grid lines to facilitate the tedious layout process. The grid is especially useful to align to baseline grids as described in [Android Design Guidelines][1]. diff --git a/build.gradle b/build.gradle index d3c94bd..cf3999e 100644 --- a/build.gradle +++ b/build.gradle @@ -22,13 +22,13 @@ allprojects { // http://www.gradle.org/docs/current/dsl/org.gradle.api.plugins.ExtraPropertiesExtension.html project.ext { ANDROID_BUILD_SDK_VERSION = 22 - ANDROID_BUILD_TOOLS_VERSION = "22" + ANDROID_BUILD_TOOLS_VERSION = "22.0.1" ANDROID_BUILD_MIN_SDK_VERSION = 14 ANDROID_BUILD_TARGET_SDK_VERSION = 22 // Google Stuffs - supportPackageVersion = "21.0.3" + supportPackageVersion = "22.0.0" // APT plugin and Android Annotations daggerVersion = "1.2.1" diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..40da80e --- /dev/null +++ b/requirements.txt @@ -0,0 +1,4 @@ +# requirements.txt for pip install +sauceclient +Appium-Python-Client +pytest \ No newline at end of file diff --git a/run_tests.sh b/run_tests.sh index 87fa12a..792b5a7 100644 --- a/run_tests.sh +++ b/run_tests.sh @@ -2,7 +2,7 @@ echo "Uploading debug apk to SauceLabs..." -res=`curl -w %{http_code} -u $SAUCE_USERNAME:$SAUCE_ACCESS_KEY -X POST "http://saucelabs.com/rest/v1/storage/$SAUCE_USERNAME/design_overlay.apk?overwrite=true" \ +res=`curl -w %{http_code} --output /dev/null -u $SAUCE_USERNAME:$SAUCE_ACCESS_KEY -X POST "http://saucelabs.com/rest/v1/storage/$SAUCE_USERNAME/design_overlay.apk?overwrite=true" \ -H "Content-Type: application/octet-stream" --data-binary @app/build/outputs/apk/app-debug.apk` if [ $res -eq 200 ]