From b639d8015937855ea64006863aedce896b5cd6e9 Mon Sep 17 00:00:00 2001
From: enahum <nahumhbl@gmail.com>
Date: Mon, 4 Dec 2017 12:04:38 -0300
Subject: [PATCH] update java package when preparing for release (#1240)

* update java package when preparing for release

* Fix unsigned build
---
 Makefile          |  4 +--
 fastlane/Fastfile | 73 ++++++++---------------------------------------
 2 files changed, 14 insertions(+), 63 deletions(-)

diff --git a/Makefile b/Makefile
index 6cd654fb0..e7120e34e 100644
--- a/Makefile
+++ b/Makefile
@@ -213,9 +213,9 @@ do-unsigned-android:
 	@cd fastlane && NODE_ENV=production bundle exec fastlane android unsigned
 	@mv android/app/build/outputs/apk/app-unsigned-unsigned.apk ./Mattermost-unsigned.apk
 
-unsigned-android: pre-run check-style start-packager do-unsigned-android stop-packager
+unsigned-android: pre-run check-style start-build-packager do-unsigned-android stop-packager
 
-unsigned-ios: pre-run check-style start-packager do-unsigned-ios stop-packager
+unsigned-ios: pre-run check-style start-build-packager do-unsigned-ios stop-packager
 
 alpha:
 	@:
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index abb7db7e2..44ed3de1b 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -372,7 +372,10 @@ platform :android do
     android_change_string_app_name(newName: 'Mattermost', stringsFile: './android/app/src/main/res/values/strings.xml')
     android_update_application_id(app_folder_name: 'android/app', application_id: 'com.mattermost.rn')
 
-    sh 'mv ../android/app/src/main/java/com/mattermost/rnbeta/ ../android/app/src/main/java/com/mattermost/rn/'
+    beta_dir = '../android/app/src/main/java/com/mattermost/rnbeta/'
+    release_dir = '../android/app/src/main/java/com/mattermost/rn/'
+
+    sh "mv #{beta_dir} #{release_dir}"
     sh 'cp -R ../assets/release/icons/android/* ../android/app/src/main/res/'
 
     find_replace_string(
@@ -381,66 +384,6 @@ platform :android do
         new_string: 'return false;'
     )
 
-    find_replace_string(
-        path_to_file: './android/app/src/main/java/com/mattermost/rn/MainApplication.java',
-        old_string: 'package com.mattermost.rnbeta;',
-        new_string: 'package com.mattermost.rn;'
-    )
-
-    find_replace_string(
-        path_to_file: './android/app/src/main/java/com/mattermost/rn/CustomPushNotification.java',
-        old_string: 'package com.mattermost.rnbeta;',
-        new_string: 'package com.mattermost.rn;'
-    )
-
-    find_replace_string(
-        path_to_file: './android/app/src/main/java/com/mattermost/rn/MainActivity.java',
-        old_string: 'package com.mattermost.rnbeta;',
-        new_string: 'package com.mattermost.rn;'
-    )
-
-    find_replace_string(
-        path_to_file: './android/app/src/main/java/com/mattermost/rn/NotificationsLifecycleFacade.java',
-        old_string: 'package com.mattermost.rnbeta;',
-        new_string: 'package com.mattermost.rn;'
-    )
-
-    find_replace_string(
-        path_to_file: './android/app/src/main/java/com/mattermost/rn/NotificationDismissService.java',
-        old_string: 'package com.mattermost.rnbeta;',
-        new_string: 'package com.mattermost.rn;'
-    )
-
-    find_replace_string(
-        path_to_file: './android/app/src/main/java/com/mattermost/rn/NotificationReplyService.java',
-        old_string: 'package com.mattermost.rnbeta;',
-        new_string: 'package com.mattermost.rn;'
-    )
-
-    find_replace_string(
-        path_to_file: './android/app/src/main/java/com/mattermost/rn/NotificationPreferencesModule.java',
-        old_string: 'package com.mattermost.rnbeta;',
-        new_string: 'package com.mattermost.rn;'
-    )
-
-    find_replace_string(
-        path_to_file: './android/app/src/main/java/com/mattermost/rn/NotificationPreferences.java',
-        old_string: 'package com.mattermost.rnbeta;',
-        new_string: 'package com.mattermost.rn;'
-    )
-
-    find_replace_string(
-        path_to_file: './android/app/src/main/java/com/mattermost/rn/MattermostManagedModule.java',
-        old_string: 'package com.mattermost.rnbeta;',
-        new_string: 'package com.mattermost.rn;'
-    )
-
-    find_replace_string(
-        path_to_file: './android/app/src/main/java/com/mattermost/rn/MattermostPackage.java',
-        old_string: 'package com.mattermost.rnbeta;',
-        new_string: 'package com.mattermost.rn;'
-    )
-
     find_replace_string(
         path_to_file: './android/app/BUCK',
         old_string: 'package com.mattermost.rnbeta;',
@@ -453,6 +396,14 @@ platform :android do
         new_string: 'Mattermost'
     )
 
+    Dir.glob("#{release_dir}*.java") do |item|
+      find_replace_string(
+          path_to_file: item[1..-1],
+          old_string: 'package com.mattermost.rnbeta;',
+          new_string: 'package com.mattermost.rn;'
+      )
+    end
+
     configure_from_env()
   end