Merge branch 'develop'0.5.1

1 files changed, 22 insertions, 9 deletions

diff --git a/app/build.gradle b/app/build.gradle
index d59533ea..4795488d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'android'
 
 android {
     compileSdkVersion 19
-    buildToolsVersion "19.0.1"
+    buildToolsVersion "19.0.3"
 
     defaultConfig {
         minSdkVersion 14
@@ -12,28 +12,41 @@ android {
         testInstrumentationRunner "android.test.InstrumentationTestRunner"
     }
 
+    signingConfigs {
+        release {
+		storeFile project.hasProperty('storeFileProperty') ? file(storeFileProperty) : null
+		storePassword project.hasProperty('storePasswordProperty') ?  storePasswordProperty : ""
+		keyAlias project.hasProperty('keyAliasProperty') ?  keyAliasProperty : ""
+		keyPassword project.hasProperty('keyPasswordProperty') ?  keyPasswordProperty : ""
+	}
+    }
+
     buildTypes {
         release {
-            runProguard false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+            //runProguard true
+	    signingConfig signingConfigs.release.isSigningReady() ? signingConfigs.release : signingConfigs.debug
         }
     }
 
     lintOptions {
-    		abortOnError false
+      abortOnError false
     }
-
+    
     sourceSets {
-    	main
-	{
+    	main {
 	  assets.srcDirs = ['assets', 'ovpnlibs/assets']
 	  jniLibs.srcDirs = ['ovpnlibs/jniLibs']
 	  jni.srcDirs = [] //disable automatic ndk-build
+        }
+	debug {
+ 	  assets.srcDirs = ['src/debug/assets']
 	}
     }
-}
+
+    check.dependsOn connectedCheck
+ }
 
 dependencies {
     androidTestCompile 'com.android.support:support-v4:+'
     androidTestCompile 'com.jayway.android.robotium:robotium-solo:4.3.1'
-}
+}
\ No newline at end of file