From 6b9897d32281b1ed08ee2d43a315c46b6b8e0596 Mon Sep 17 00:00:00 2001
From: Lennart Goedhart <lennart@omnibase.com.au>
Date: Mon, 24 Jul 2017 10:16:25 +0800
Subject: [PATCH] - Disable minify on release (ProGuard isn't set up properly)
 - Rename APK artefact before release deployment

---
 .travis.yml      | 4 ++--
 app/build.gradle | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index cb1167c..91b5c63 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -52,7 +52,7 @@ script:
 - ./gradlew clean build connectedCheck -PdisablePreDex --stacktrace
 
 before_deploy:
-- find . -name "*.apk"
+- mv app/build/outputs/apk/app-release.apk app/build/outputs/apk/600-series-ns-uploader.apk
 
 deploy:
   skip_cleanup: true
@@ -60,7 +60,7 @@ deploy:
   api_key:
     secure: "z1DxcbyRZKwIAV6/EeJgKwU/RYDoxnL/IoMtBlGCVe80C/tDfiv9D5DeDhLGQp/MKK8pIec35aj5EMrAacF6sgXzpooXuWNlfNdZJhLnpa8mCr9/Wpr9ll82Wc5EPIPEHf/k0e83gXzPiQuwTdBnHRlNfqylmWcwduA595e5GJZW88IzDJY0fS2p2R+4e6QJgX4Tp7KlLMMirXzTo1FjGUwuD8sM2Eh1imLnwSMO5oeXptUcd4deQqgRVTCgrNVcSRAlQsJNK0sAbkWC54SOLeMM/8CUoKbfpTMlEflpJ2V/n+EiomB2PFZYi7G7rx/Kcpw39thFMUbNSOInrmU3nHqTGACjbkjluufhw92S/05kA/qNDZeMH/8UHrArgpvXZIQbaJPhEbAk4lG5YfMoI1fs+k3kcmbtkOI4+ve/IOPHOuFGVAJZot66t6/kETdD59edS7uVjW+oPD9cSgLG0IAKPzF8jBpPw8olPaviGvjHvJVElg8EhCHMKqrcpix0LbxyC9gNc8Js6Y/JVj7rseApCTREIuSi8ug4mTOVWoLqUKIfMVCGGgKWTVCTbJTADFl+zFiQZj5Y1t+YEWKq2Qz6T36ISVsUBnYTmyu2zUTRBzZKHWS0qgxHZpKppi80pYyw299c99YVeXfb4yGmHLSoO6e80sPjTgaT2DQs6E0="
   file:
-    - app/build/outputs/apk/app-release.apk
+    - app/build/outputs/apk/600-series-ns-uploader.apk
   on:
     repo: pazaan/600SeriesAndroidUploader
     tags: true
diff --git a/app/build.gradle b/app/build.gradle
index 45d7ea6..ac4ed16 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -81,7 +81,7 @@ android {
 
     buildTypes {
         release {
-            minifyEnabled true
+            minifyEnabled false // Set to true once we set up proguard-rules without breaking anything
             zipAlignEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
             ext.enableCrashlytics = file("fabric.properties").exists()
-- 
GitLab