From e1d505a2910e6b28bde5183d8b6275df62dd3862 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Tue, 15 Jul 2014 17:51:31 +0200 Subject: Update README with build instructions for build --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'README.md') diff --git a/README.md b/README.md index 9a80eaf07..4a2fad2ee 100644 --- a/README.md +++ b/README.md @@ -37,8 +37,10 @@ Expand the Tools directory and select "Android SDK Build-tools (Version 19.1)". Expand the Extras directory and install "Android Support Repository" Select everything for the newest SDK Platform (API-Level 19) 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`` +5. Use OpenJDK 7 instead of Oracle JDK (this is required for OpenKeychain's tests based on Bouncy Castle) +6. Execute ``./install-custom-gradle-test-plugin.sh`` +7. Execute ``./gradlew build`` +8. You can install the app with ``adb install -r OpenKeychain/build/outputs/apk/OpenKeychain-debug-unaligned.apk`` ### Build API Demo with Gradle -- cgit v1.2.3 From 8385c9c9dda37426f22adf744d203e94ff3c2034 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Sat, 19 Jul 2014 15:14:20 +0200 Subject: Update README --- README.md | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'README.md') diff --git a/README.md b/README.md index 4a2fad2ee..c99020ae0 100644 --- a/README.md +++ b/README.md @@ -37,10 +37,13 @@ Expand the Tools directory and select "Android SDK Build-tools (Version 19.1)". Expand the Extras directory and install "Android Support Repository" Select everything for the newest SDK Platform (API-Level 19) 4. Export ANDROID_HOME pointing to your Android SDK -5. Use OpenJDK 7 instead of Oracle JDK (this is required for OpenKeychain's tests based on Bouncy Castle) -6. Execute ``./install-custom-gradle-test-plugin.sh`` -7. Execute ``./gradlew build`` -8. You can install the app with ``adb install -r OpenKeychain/build/outputs/apk/OpenKeychain-debug-unaligned.apk`` +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`` ### Build API Demo with Gradle -- cgit v1.2.3 From 207870af1df0597c7832b9eaf7cd0dbda8050ca1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Sat, 19 Jul 2014 15:15:31 +0200 Subject: Update README.md --- README.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'README.md') diff --git a/README.md b/README.md index c99020ae0..4eed54540 100644 --- a/README.md +++ b/README.md @@ -56,10 +56,7 @@ Select everything for the newest SDK Platform (API-Level 19) I am using the newest [Android Studio](http://developer.android.com/sdk/installing/studio.html) for development. Development with Eclipse is currently not possible because I am using the new [project structure](http://developer.android.com/sdk/installing/studio-tips.html). 1. Clone the project from github -2. From Android Studio: File -> Import Project -> ... - * Select the cloned top folder if you want to develop on the main project - * Select the "OpenKeychain-API" folder if you want to develop on the API example -3. Import project from external model -> choose Gradle +2. From Android Studio: File -> Import Project -> Select the cloned top folder ## OpenKeychain's API -- cgit v1.2.3 From 527c3e93f8c570096f52d8ae5bc3ce68bef96269 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Sat, 19 Jul 2014 15:16:45 +0200 Subject: Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'README.md') diff --git a/README.md b/README.md index 4eed54540..230fd2d6f 100644 --- a/README.md +++ b/README.md @@ -53,9 +53,9 @@ Select everything for the newest SDK Platform (API-Level 19) ### Development with Android Studio -I am using the newest [Android Studio](http://developer.android.com/sdk/installing/studio.html) for development. Development with Eclipse is currently not possible because I am using the new [project structure](http://developer.android.com/sdk/installing/studio-tips.html). +We are using the newest [Android Studio](http://developer.android.com/sdk/installing/studio.html) for development. Development with Eclipse is currently not possible because we are using the new [project structure](http://developer.android.com/sdk/installing/studio-tips.html). -1. Clone the project from github +1. Clone the project from Github 2. From Android Studio: File -> Import Project -> Select the cloned top folder ## OpenKeychain's API -- cgit v1.2.3