Keystore objects.

Replaces keystore attributes on build types and flavors with a
SigningKeystore object that can be accessed by reference from
those types. Eliminates the debugSigning attribute in favor
of a default debug keystore that's automatically configured
for all projects.

Change-Id: Icbfc66487e26068ae6edff8395ebc29d0d28f46c

3 files changed, 19 insertions, 24 deletions

diff --git a/tests/basic/build.gradle b/tests/basic/build.gradle
index 6f824f8..ed7a107 100644
--- a/tests/basic/build.gradle
+++ b/tests/basic/build.gradle
@@ -15,17 +15,22 @@ android {
     target "android-15"
     testBuildType "debug"
 
+    keystores {
+        myKeystore {
+            storeLocation "debug.keystore"
+            storePassword "android"
+            keyAlias "androiddebugkey"
+            keyPassword "android"
+        }
+    }
+
     defaultConfig {
         versionCode 12
         versionName "2.0"
         minSdkVersion 16
         targetSdkVersion 16
+        keystore keystores.myKeystore
 
-        signingStoreLocation "$rootDir/debug.keystore"
-        signingStorePassword "android"
-        signingKeyAlias "androiddebugkey"
-        signingKeyPassword "android"
- 
         buildConfig "private final static boolean DEFAULT = true;", \
                     "private final static String FOO = \"foo\";"
     }
diff --git a/tests/dependencies/build.gradle b/tests/dependencies/build.gradle
index 2a0ca62..062b493 100644
--- a/tests/dependencies/build.gradle
+++ b/tests/dependencies/build.gradle
@@ -25,16 +25,13 @@ android {
     target "android-15"
     testBuildType "blah"
 
-	defaultConfig {
-		signingStoreLocation "$rootDir/debug.keystore"
-		signingStorePassword "android"
-		signingKeyAlias "androiddebugkey"
-		signingKeyPassword "android"
-	}
+    defaultConfig {
+    }
 
-	buildTypes {
-		blah {
-			packageNameSuffix ".blah"
-		}
-	}
+    buildTypes {
+        blah {
+            packageNameSuffix ".blah"
+            keystore this.android.keystores.debug
+        }
+    }
 }
\ No newline at end of file
diff --git a/tests/flavored/build.gradle b/tests/flavored/build.gradle
index d1d1bbe..8cc7e57 100644
--- a/tests/flavored/build.gradle
+++ b/tests/flavored/build.gradle
@@ -14,17 +14,10 @@ apply plugin: 'android'
 android {
     target = "android-15"
     testBuildType = "staging"
-    
 
     defaultConfig {
-        signingStoreLocation = "$rootDir/debug.keystore"
-        signingStorePassword = "android"
-        signingKeyAlias = "androiddebugkey"
-        signingKeyPassword = "android"
-
         buildConfig "private final static boolean DEFAULT = true;", \
                     "private final static String FOO = \"foo\";"
-
     }
 
     productFlavors {
@@ -49,7 +42,7 @@ android {
         staging {
             packageNameSuffix = ".staging"
             versionNameSuffix = ".S"
-            debugSigned = true
+            keystore this.android.keystores.debug
         }
     }
 }
\ No newline at end of file