Do a unsigned build if not on master

2 files changed, 16 insertions, 5 deletions

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 523a1334c..63a9ed6c9 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -31,12 +31,19 @@ platform :android do
   end
   lane :playstore do
     sh("cd ..;bash scripts/build_android.sh")
-    
-    gradle(
-      task: 'assemble',
-      build_type: 'Release'
-    )
     isOnMasterBranch = currentBranch() == "master"
+    
+    if isOnMasterBranch
+      gradle(
+        task: 'assemble',
+        build_type: 'Release'
+      )
+    else
+      gradle(
+        task: 'assemble',
+        build_type: 'nonmaster'
+      )
+    end
     if isOnMasterBranch
       upload_to_play_store( track: 'beta', 
       						json_key: 'key.json', 
diff --git a/navit/android/build.gradle b/navit/android/build.gradle
index 11af35b83..bde381777 100644
--- a/navit/android/build.gradle
+++ b/navit/android/build.gradle
@@ -36,6 +36,10 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             signingConfig signingConfigs.release
         }
+        nonmaster {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
     }
     lintOptions {
         disable 'UnusedResources'