From 04a50f79ea65a5c4d2254c96bc7693612f2ffb05 Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Wed, 2 Nov 2022 12:20:41 +0200
Subject: [PATCH] [v1] fix Fastfile for android release (#6725)

* fix Fastfile for android release

* bump gradle heap memory
---
 android/gradle.properties |  2 +-
 fastlane/Fastfile         | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/android/gradle.properties b/android/gradle.properties
index 5bb2974a3..7b404d8c1 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -10,7 +10,7 @@
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 # Default value: -Xmx512m -XX:MaxMetaspaceSize=256m
-org.gradle.jvmargs=-Xmx1024m -XX:MaxMetaspaceSize=512m
+org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index ae0938291..13bdabff5 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -661,14 +661,6 @@ platform :android do
 
     beta_dir = './android/app/src/main/java/com/mattermost/rnbeta/'
     release_dir = "./android/app/src/main/java/#{package_id.gsub '.', '/'}/"
-    if ENV['BUILD_FOR_RELEASE'] == 'true'
-      find_replace_string(
-          path_to_file: "#{beta_dir}MainApplication.java",
-          old_string: 'return BuildConfig.DEBUG;',
-          new_string: 'return false;'
-      )
-    end
-
     if release_dir != beta_dir
       unless Dir.exist?(".#{release_dir}")
         FileUtils.mkdir_p ".#{release_dir}"
@@ -689,6 +681,14 @@ platform :android do
             new_string: "package #{package_id};"
         )
       end
+      
+      Dir.glob('../android/app/src/main/java/com/mattermost/newarchitecture/*.java') do |item|
+        find_replace_string(
+            path_to_file: item[1..-1],
+            old_string: 'import com.mattermost.rnbeta.BuildConfig;',
+            new_string: "import #{package_id}.BuildConfig;"
+        )
+      end
 
       Dir.glob('../android/app/src/main/java/com/mattermost/share/*.java') do |item|
         find_replace_string(