From 125c6b59f6eb0e4d8e14c86ab0c77bda60a55d77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakob=20M=C3=B6ller?= <jakob.moeller@sap.com>
Date: Sun, 31 May 2020 16:25:23 +0200
Subject: [PATCH] Minify and Shrink Disabled (#56)

* Release/0.5.5

* Gradle Reset to 0.5.4 (#53)

* Release/0.5.5 (#48)

* Hotfix for resetting Gradle Version (internal pipeline confirmation) (#52)

* Disable minify / shrink

* Dont obfuscate
---
 Corona-Warn-App/build.gradle       | 17 ++++++-----------
 Corona-Warn-App/proguard-rules.pro |  3 ++-
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/Corona-Warn-App/build.gradle b/Corona-Warn-App/build.gradle
index f13e978ff..c81a276df 100644
--- a/Corona-Warn-App/build.gradle
+++ b/Corona-Warn-App/build.gradle
@@ -32,8 +32,8 @@ android {
         applicationId 'de.rki.coronawarnapp'
         minSdkVersion 23
         targetSdkVersion 29
-        versionCode 5
-        versionName "0.5.5"
+        versionCode 6
+        versionName "0.5.6"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         buildConfigField "String", "DOWNLOAD_CDN_URL", "\"$DOWNLOAD_CDN_URL\""
@@ -62,14 +62,14 @@ android {
 
     buildTypes {
         release {
-            minifyEnabled true
-            shrinkResources true
+            minifyEnabled false
+            shrinkResources false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
         releaseForTest {
             applicationIdSuffix '.dev'
-            minifyEnabled true
-            shrinkResources true
+            minifyEnabled false
+            shrinkResources false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
@@ -135,11 +135,6 @@ android {
 
 }
 
-configurations.all {
-    resolutionStrategy.force "org.antlr:antlr4-runtime:4.7.1"
-    resolutionStrategy.force "org.antlr:antlr4-tool:4.7.1"
-}
-
 dependencies {
     api fileTree(dir: 'libs', include: ['play-services-nearby-18.0.2-eap.aar'])
     implementation project(":Server-Protocol-Buffer")
diff --git a/Corona-Warn-App/proguard-rules.pro b/Corona-Warn-App/proguard-rules.pro
index fef7ed685..76f1db035 100644
--- a/Corona-Warn-App/proguard-rules.pro
+++ b/Corona-Warn-App/proguard-rules.pro
@@ -18,8 +18,9 @@
 
 # Uncomment this to preserve the line number information for
 # debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
+-keepattributes SourceFile,LineNumberTable
 
+-dontobfuscate
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
-- 
GitLab