add androidtest,fastlane folder and update ios identifier

Author: hslavax

src/config/bundleIdentifiers.js

@@ -15,7 +15,7 @@ export function bundleIdentifiers({ currentAppName, newName, currentBundleID, ne
     {
       regex: `"${currentBundleID}"`,
       replacement: `"${newBundleID}"`,
-      paths: ['android/app/BUCK', 'android/app/_BUCK', 'android/app/build.gradle'],
+      paths: ['android/app/BUCK', 'android/app/_BUCK', 'android/app/build.gradle', 'android/fastlane/Appfile'],
     },
     {
       regex: currentBundleID,

src/config/filesToModifyContent.js

@@ -1,11 +1,11 @@
 // nS - No Space
 // lC - Lowercase
 
-export function filesToModifyContent(currentAppName, newName, bundleID) {
+export function filesToModifyContent(currentAppName, newName, bundleID, existingBundleId) {
   const nS_CurrentAppName = currentAppName.replace(/\s/g, '');
   const nS_NewName = newName.replace(/\s/g, '');
 
-  return [
+  const result = [
     {
       regex: `<string name="app_name">${currentAppName}</string>`,
       replacement: `<string name="app_name">${newName}</string>`,
@@ -26,6 +26,7 @@ export function filesToModifyContent(currentAppName, newName, bundleID) {
         'android/settings.gradle',
         `ios/${nS_NewName}Tests/${nS_NewName}Tests.m`,
         'ios/build/info.plist',
+        'ios/fastlane/Fastfile',
         'ios/Podfile',
         'app.json',
       ],
@@ -40,11 +41,6 @@ export function filesToModifyContent(currentAppName, newName, bundleID) {
       replacement: newName,
       paths: [`ios/${nS_NewName}/Info.plist`],
     },
-    {
-      regex: /\$\(PRODUCT_BUNDLE_IDENTIFIER\)/,
-      replacement: bundleID,
-      paths: [`ios/${nS_NewName}/Info.plist`],
-    },
     {
       regex: `"name": "${nS_CurrentAppName}"`,
       replacement: `"name": "${nS_NewName}"`,
@@ -56,4 +52,14 @@ export function filesToModifyContent(currentAppName, newName, bundleID) {
       paths: ['app.json'],
     },
   ];
+
+  if (bundleID && existingBundleId) {
+    result.push({
+      regex: existingBundleId,
+      replacement: bundleID,
+      paths: [`ios/${nS_NewName}.xcodeproj/project.pbxproj`, 'ios/fastlane/Appfile'],
+    });
+  }
+
+  return result;
 }

src/index.js

@@ -15,7 +15,7 @@ import { filesToModifyContent } from './config/filesToModifyContent';
 import { bundleIdentifiers } from './config/bundleIdentifiers';
 import { loadAppConfig, loadAndroidManifest, __dirname, iosRequiredPaths } from './utils';
 
-const androidEnvs = ['main', 'debug'];
+const androidEnvs = ['main', 'debug', 'androidTest'];
 const projectName = pjson.name;
 const projectVersion = pjson.version;
 const replaceOptions = {
@@ -65,7 +65,10 @@ loadAppConfig()
         const bundleID = program.bundleID ? program.bundleID.toLowerCase() : null;
         let newBundlePath;
         const listOfFoldersAndFiles = foldersAndFiles(currentAppName, newName);
-        const listOfFilesToModifyContent = filesToModifyContent(currentAppName, newName, bundleID);
+        const existingBundleId = shell.exec(
+          'cd ios && echo $(xcodebuild -showBuildSettings | grep PRODUCT_BUNDLE_IDENTIFIER) | sed "s/ //g" | sed "s/PRODUCT_BUNDLE_IDENTIFIER//g" | sed "s/=//g"'
+        ).stdout;
+        const listOfFilesToModifyContent = filesToModifyContent(currentAppName, newName, bundleID, existingBundleId);
 
         if (bundleID) {
           newBundlePath = bundleID.replace(/\./g, '/');