From 56325851dcba7e6b6bdce78cac04f73e9bd9bd98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Sun, 28 Dec 2014 21:48:49 +0100 Subject: [PATCH] Remove necessity to prepare tests via shell script --- .travis.yml | 1 - README.md | 7 +++---- prepare-tests.sh | 30 ------------------------------ 3 files changed, 3 insertions(+), 35 deletions(-) delete mode 100755 prepare-tests.sh diff --git a/.travis.yml b/.travis.yml index 81ef10638..3c477322f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,6 @@ before_install: # Install required Android components. #- echo "y" | android update sdk -a --filter build-tools-19.1.0,android-19,platform-tools,extra-android-support,extra-android-m2repository --no-ui --force - ( sleep 5 && while [ 1 ]; do sleep 1; echo y; done ) | android update sdk --no-ui --all --force --filter build-tools-21.1.1,build-tools-19.1.0,android-21,android-19,platform-tools,extra-android-support,extra-android-m2repository - - ./prepare-tests.sh install: echo "Installation done" script: - ./gradlew assemble -S -q diff --git a/README.md b/README.md index 7338f1071..10d07747c 100644 --- a/README.md +++ b/README.md @@ -33,17 +33,16 @@ Development mailinglist at http://groups.google.com/d/forum/openpgp-keychain-dev 1. Get all external submodules with ``git submodule update --init --recursive`` 2. Have Android SDK "tools", "platform-tools", and "build-tools" directories in your PATH (http://developer.android.com/sdk/index.html) 3. Open the Android SDK Manager (shell command: ``android``). -Expand the Tools directory and select "Android SDK Build-tools (Version 19.1)". +Expand the Tools directory and select "Android SDK Build-tools (Version 21.1.1)". Expand the Extras directory and install "Android Support Repository" -Select everything for the newest SDK Platform (API-Level 19) +Select everything for the newest SDK Platform (API-Level 21) 4. Export ANDROID_HOME pointing to your Android SDK 5. Execute ``./gradlew build`` 6. You can install the app with ``adb install -r OpenKeychain/build/outputs/apk/OpenKeychain-debug-unaligned.apk`` ### Run Tests 1. Use OpenJDK instead of Oracle JDK -2. Execute ``./prepare-tests.sh`` -3. Execute ``./gradlew build`` +3. Execute ``./gradlew test`` ### Build API Demo with Gradle diff --git a/prepare-tests.sh b/prepare-tests.sh deleted file mode 100755 index 623c4a233..000000000 --- a/prepare-tests.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash - -# This script installs a plugin which is necessary to run OpenKeychain's tests -# into the local maven repository, then puts a line to include the -Test -# subproject into settings.gradle - -echo "checking jdk runtime.." -if ! java -version 2>&1 | grep OpenJDK; then - echo "tests will only run on openjdk, see readme for details!" >&2 - return -fi - -#tmpdir="$(mktemp -d)" -#( -# cd "$tmpdir"; -# git clone https://github.com/nenick/gradle-android-test-plugin.git -# cd gradle-android-test-plugin -# echo "rootProject.name = 'gradle-android-test-plugin-parent'" > settings.gradle -# echo "include ':gradle-android-test-plugin'" >> settings.gradle -# ./gradlew :gradle-android-test-plugin:install -#) -#rm -rf "$tmpdir" - -echo -n "ok, adding tests to include list.. " -if grep OpenKeychain-Test settings.gradle >/dev/null ; then - echo " already in." -else - echo "include ':OpenKeychain-Test'" >> settings.gradle - echo "ok" -fi