Use locally generated keystore

Refactoring of the build files broke this behavior, reintroducing it.

Author: Iain McGinniss

app/build.gradle

@@ -1,6 +1,7 @@
 apply plugin: 'com.android.application'
 apply plugin: 'checkstyle'
 apply from: '../config/android-common.gradle'
+apply from: '../config/keystore.gradle'
 
 android {
     defaultConfig {
@@ -14,6 +15,24 @@ android {
                 'appAuthRedirectScheme': 'com.googleusercontent.apps.YOUR-ID'
         ]
     }
+
+    signingConfigs {
+        debugAndRelease {
+            storeFile file("${rootDir}/appauth.keystore")
+            storePassword "appauth"
+            keyAlias "appauth"
+            keyPassword "appauth"
+        }
+    }
+
+    buildTypes {
+        debug {
+            signingConfig signingConfigs.debugAndRelease
+        }
+        release {
+            signingConfig signingConfigs.debugAndRelease
+        }
+    }
 }
 
 dependencies {

build.gradle

@@ -23,6 +23,8 @@ subprojects {
     }
 }
 
+ext.verifyKeystore()
+
 def grgit = org.ajoberstar.grgit.Grgit.open(dir: '.')
 def lastCommit = grgit.head()
 
@@ -38,8 +40,10 @@ project.ext.compileSdkVersion = 25
 project.ext.buildToolsVersion = '25.0.1'
 project.ext.supportLibVersion = '25.1.0'
 
-task showVersion << {
-    logger.lifecycle("Version ID: " + project.versionNum)
-    logger.lifecycle("Version Name: " + project.versionName)
-    logger.lifecycle("Version Date: " + project.versionDate)
+task showVersion {
+    doLast {
+        logger.lifecycle("Version ID: " + project.versionNum)
+        logger.lifecycle("Version Name: " + project.versionName)
+        logger.lifecycle("Version Date: " + project.versionDate)
+    }
 }

config/keystore.gradle

@@ -3,7 +3,7 @@
 def generateKeystore = { keystoreFile ->
     exec {
         executable "keytool"
-        args [
+        args(
                 "-genkey",
                 "-keystore", "appauth.keystore",
                 "-alias", "appauth",
@@ -13,14 +13,14 @@ def generateKeystore = { keystoreFile ->
                 "-keypass", "appauth",
                 "-storepass", "appauth",
                 "-dname", "CN=appauth"
-                ]
+                )
     }
 }
 
 // checks that a keystore exists in the expected location, and generates one
 // if it does not.
 ext.verifyKeystore = {
-    def keystoreFile = file(new File(projectDir, "appauth.keystore"))
+    def keystoreFile = file("${rootDir}/appauth.keystore")
     if (!keystoreFile.exists()) {
         logger.lifecycle("appauth.keystore missing - creating one")
         generateKeystore(keystoreFile)