update gradle, description,...

1 files changed, 26 insertions, 22 deletions

diff --git a/OpenPGP-Keychain/build.gradle b/OpenPGP-Keychain/build.gradle
index a1bf3b783..a8523a6c8 100644
--- a/OpenPGP-Keychain/build.gradle
+++ b/OpenPGP-Keychain/build.gradle
@@ -16,8 +16,9 @@ repositories {
 
 dependencies {
     compile fileTree(dir: 'libs', includes: ['*.jar'], excludes: ['android-support-v4.jar'])
-    compile 'com.android.support:support-v4:13.0.+'
+    //compile 'com.android.support:support-v4:18.0.+' // already in actionbarsherlock
     compile 'com.actionbarsherlock:actionbarsherlock:4.4.+@aar'
+    compile project(':libraries:HtmlTextView')
 }
 
 android {
@@ -26,7 +27,7 @@ android {
 
     defaultConfig {
         minSdkVersion 8
-        targetSdkVersion 18
+        targetSdkVersion 17
     }
 
     sourceSets {
@@ -43,28 +44,31 @@ android {
         instrumentTest.setRoot('tests')
     }
 
-    if (project.hasProperty('signingStoreLocation')) {
-      /*
-       * To sign release build, create file gradle.properties in .gradle/ with this content:
-       *
-       * signingStoreLocation=/home/key.store
-       * signingStorePassword=xxx
-       * signingKeyAlias=alias
-       * signingKeyPassword=xxx
-       */
-      signingConfigs {
-          myConfig {
-              storeFile file(signingStoreLocation)
-              storePassword signingStorePassword
-              keyAlias signingKeyAlias
-              keyPassword signingKeyPassword
-          }
-      }
-
-        buildTypes {
+    /*
+     * To sign release build, create file gradle.properties in ~/.gradle/ with this content:
+     *
+     * signingStoreLocation=/home/key.store
+     * signingStorePassword=xxx
+     * signingKeyAlias=alias
+     * signingKeyPassword=xxx
+     */
+    if (project.hasProperty('signingStoreLocation') &&
+            project.hasProperty('signingStorePassword') &&
+            project.hasProperty('signingKeyAlias') &&
+            project.hasProperty('signingKeyPassword')) {
+        println "Found sign properties in gradle.properties! Signing build…"
+        
+        signingConfigs {
             release {
-                signingConfig signingConfigs.myConfig
+                storeFile file(signingStoreLocation)
+                storePassword signingStorePassword
+                keyAlias signingKeyAlias
+                keyPassword signingKeyPassword
             }
         }
+
+        buildTypes.release.signingConfig = signingConfigs.release
+    } else {
+        buildTypes.release.signingConfig = null
     }
 }