From e018b63b9b33a9a3c5ce656ceb9558bdc43b2242 Mon Sep 17 00:00:00 2001
From: Slesarew <33295157+Slesarew@users.noreply.github.com>
Date: Fri, 16 Jul 2021 12:08:10 +0300
Subject: [PATCH] fix: rn build android (#785)

* fix: disable broken minification with proguard

* revert: cat in ci
---
 .gitlab-ci.yml            | 2 +-
 android/app/build.gradle  | 6 +++---
 android/gradle.properties | 1 -
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 53c4a849f2..0f6a36b241 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -32,7 +32,7 @@ android-build-release:
     paths:
       - signer-app-release-signed.apk
   script:
-    - echo "$KEYSTORE_DATA" | base64 -d > /tmp/gitlab-ci.keystore
+    - cat "$KEYSTORE_DATA" | base64 -d > /tmp/gitlab-ci.keystore
     - wc /tmp/gitlab-ci.keystore
     - ./scripts/build-release.sh /tmp/gitlab-ci.keystore "$KEYSTORE_ALIAS" "$KEYSTORE_PASS"
   tags:
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 4394247be8..4044c7a801 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -168,10 +168,10 @@ android {
             // Caution! In production, you need to generate your own keystore file.
             // see https://facebook.github.io/react-native/docs/signed-apk-android.
             // signingConfig signingConfigs.debug
-             minifyEnabled enableProguardInReleaseBuilds
-             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
+            // minifyEnabled enableProguardInReleaseBuilds
+            // proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
             // Detox-specific additions to pro-guard, uncomment following line if pro-guard is enabled.
-             proguardFile "${rootProject.projectDir}/../node_modules/detox/android/detox/proguard-rules-app.pro"
+            // proguardFile "${rootProject.projectDir}/../node_modules/detox/android/detox/proguard-rules-app.pro"
         }
     }
     splits {
diff --git a/android/gradle.properties b/android/gradle.properties
index c3809d6a8a..84063b43bb 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -21,6 +21,5 @@ MYAPP_RELEASE_STORE_FILE=apk.keystore
 MYAPP_RELEASE_KEY_ALIAS=testing
 MYAPP_RELEASE_STORE_PASSWORD=testing
 MYAPP_RELEASE_KEY_PASSWORD=testing
-android.enableR8=false
 android.useAndroidX=true
 android.enableJetifier=true