Merge branch 'develop'

rapidpro · Nov 15, 2016 · 90184f2 · 90184f2
2 parents e597b4a + f55fbdd
commit 90184f2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -13,13 +13,16 @@ apply plugin: 'io.fabric'
 apply plugin: 'com.google.gms.google-services'
 apply plugin: 'me.tatarka.retrolambda'
 
+Properties localProperties = new Properties()
+localProperties.load(project.rootProject.file('local.properties').newDataInputStream())
+
 android {
     signingConfigs {
         signature {
-            keyAlias 'ureport'
-            keyPassword 'htaq3XVfSucCEbS'
-            storeFile file('/Users/john-mac/Documents/Ilhasoft/U-report/signature/ureport.jks')
-            storePassword 'htaq3XVfSucCEbS'
+            keyAlias localProperties.getProperty('signature.keyAlias')
+            keyPassword localProperties.getProperty('signature.keyPassword')
+            storeFile file(localProperties.getProperty('signature.storeFile'))
+            storePassword localProperties.getProperty('signature.storePassword')
         }
     }
     lintOptions {

diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath 'me.tatarka:gradle-retrolambda:3.3.0-beta4'
-        classpath 'com.android.tools.build:gradle:2.2.0'
+        classpath 'com.android.tools.build:gradle:2.2.2'
         classpath 'com.google.gms:google-services:1.3.0'
 
         // NOTE: Do not place your application dependencies here; they belong