Merge branch 'master' of https://github.com/openpgp-keychain/openpgp-keychain into datefix

8 files changed, 44 insertions, 9 deletions

diff --git a/libraries/Android-AppMsg/library/build.gradle b/libraries/Android-AppMsg/library/build.gradle
index 934cf1cb1..f77f1a098 100644
--- a/libraries/Android-AppMsg/library/build.gradle
+++ b/libraries/Android-AppMsg/library/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'android-library'
 
 android {
     compileSdkVersion 19
-    buildToolsVersion '19.0.1'
+    buildToolsVersion '19.0.3'
 
     defaultConfig {
         minSdkVersion 4
diff --git a/libraries/AndroidBootstrap/build.gradle b/libraries/AndroidBootstrap/build.gradle
index 7724c6d9c..220613132 100644
--- a/libraries/AndroidBootstrap/build.gradle
+++ b/libraries/AndroidBootstrap/build.gradle
@@ -2,10 +2,10 @@ apply plugin: 'android-library'
 
 android {
     compileSdkVersion 19
-    buildToolsVersion "19.0.1"
+    buildToolsVersion "19.0.3"
     defaultConfig {
         minSdkVersion 7
-        targetSdkVersion 17
+        targetSdkVersion 19
     }
     sourceSets {
         main {
diff --git a/libraries/HtmlTextView/build.gradle b/libraries/HtmlTextView/build.gradle
index a0b9b1bc6..d1b26d2bd 100644
--- a/libraries/HtmlTextView/build.gradle
+++ b/libraries/HtmlTextView/build.gradle
@@ -2,8 +2,8 @@ apply plugin: 'android-library'
 
 
 android {
-    compileSdkVersion 17
-    buildToolsVersion '19.0.1'
+    compileSdkVersion 19
+    buildToolsVersion '19.0.3'
 
     sourceSets {
         main {
diff --git a/libraries/HtmlTextView/project.properties b/libraries/HtmlTextView/project.properties
index 484dab075..91d2b0246 100644
--- a/libraries/HtmlTextView/project.properties
+++ b/libraries/HtmlTextView/project.properties
@@ -11,5 +11,5 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-17
+target=android-19
 android.library=true
diff --git a/libraries/StickyListHeaders/library/build.gradle b/libraries/StickyListHeaders/library/build.gradle
index a92c4d80e..b67172c12 100644
--- a/libraries/StickyListHeaders/library/build.gradle
+++ b/libraries/StickyListHeaders/library/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'android-library'
 
 android {
     compileSdkVersion 19
-    buildToolsVersion '19.0.1'
+    buildToolsVersion '19.0.3'
 
     sourceSets {
         main {
diff --git a/libraries/keychain-api-library/build.gradle b/libraries/keychain-api-library/build.gradle
new file mode 100644
index 000000000..7c923e7f6
--- /dev/null
+++ b/libraries/keychain-api-library/build.gradle
@@ -0,0 +1,35 @@
+// please leave this here, so this library builds on its own
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.8.3'
+    }
+}
+
+apply plugin: 'android-library'
+
+android {
+    compileSdkVersion 19
+    buildToolsVersion '19.0.3'
+    
+    // NOTE: We are using the old folder structure to also support Eclipse
+    sourceSets {
+        main {
+            manifest.srcFile 'AndroidManifest.xml'
+            java.srcDirs = ['src']
+            resources.srcDirs = ['src']
+            aidl.srcDirs = ['src']
+            renderscript.srcDirs = ['src']
+            res.srcDirs = ['res']
+            assets.srcDirs = ['assets']
+        }
+    }
+    
+    // Do not abort build if lint finds errors
+    lintOptions {
+        abortOnError false
+    }
+}
diff --git a/libraries/zxing-android-integration/build.gradle b/libraries/zxing-android-integration/build.gradle
index a92c4d80e..b67172c12 100644
--- a/libraries/zxing-android-integration/build.gradle
+++ b/libraries/zxing-android-integration/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'android-library'
 
 android {
     compileSdkVersion 19
-    buildToolsVersion '19.0.1'
+    buildToolsVersion '19.0.3'
 
     sourceSets {
         main {
diff --git a/libraries/zxing/build.gradle b/libraries/zxing/build.gradle
index a92c4d80e..b67172c12 100644
--- a/libraries/zxing/build.gradle
+++ b/libraries/zxing/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'android-library'
 
 android {
     compileSdkVersion 19
-    buildToolsVersion '19.0.1'
+    buildToolsVersion '19.0.3'
 
     sourceSets {
         main {