full upgrade IOS project New Expensify

Expensify · Aug 7, 2021 · fa2e8a9 · fa2e8a9
1 parent a248fc3
commit fa2e8a9
Show file tree

Hide file tree

Showing 18 changed files with 53 additions and 61 deletions.
diff --git a/.github/actions/bumpVersion/index.js b/.github/actions/bumpVersion/index.js
@@ -97,8 +97,8 @@ const getBuildVersion = __nccwpck_require__(16);
 const BUILD_GRADLE_PATH = process.env.NODE_ENV === 'test'
     ? path.resolve(__dirname, '../../android/app/build.gradle')
     : './android/app/build.gradle';
-const PLIST_PATH = './ios/ExpensifyCash/Info.plist';
-const PLIST_PATH_TEST = './ios/ExpensifyCashTests/Info.plist';
+const PLIST_PATH = './ios/NewExpensify/Info.plist';
+const PLIST_PATH_TEST = './ios/NewExpensifyTests/Info.plist';
 
 exports.BUILD_GRADLE_PATH = BUILD_GRADLE_PATH;
 exports.PLIST_PATH = PLIST_PATH;
@@ -3322,7 +3322,7 @@ module.exports = require("util");;
 /************************************************************************/
 /******/ 	// The module cache
 /******/ 	var __webpack_module_cache__ = {};
-/******/ 	
+/******/
 /******/ 	// The require function
 /******/ 	function __nccwpck_require__(moduleId) {
 /******/ 		// Check if module is in cache
@@ -3335,7 +3335,7 @@ module.exports = require("util");;
 /******/ 			// no module.loaded needed
 /******/ 			exports: {}
 /******/ 		};
-/******/ 	
+/******/
 /******/ 		// Execute the module function
 /******/ 		var threw = true;
 /******/ 		try {
@@ -3344,14 +3344,14 @@ module.exports = require("util");;
 /******/ 		} finally {
 /******/ 			if(threw) delete __webpack_module_cache__[moduleId];
 /******/ 		}
-/******/ 	
+/******/
 /******/ 		// Return the exports of the module
 /******/ 		return module.exports;
 /******/ 	}
-/******/ 	
+/******/
 /************************************************************************/
 /******/ 	/* webpack/runtime/compat */
-/******/ 	
+/******/
 /******/ 	__nccwpck_require__.ab = __dirname + "/";/************************************************************************/
 /******/ 	// module exports must be returned from runtime so entry inlining is disabled
 /******/ 	// startup

diff --git a/.github/libs/nativeVersionUpdater.js b/.github/libs/nativeVersionUpdater.js
@@ -10,8 +10,8 @@ const getBuildVersion = require('semver/functions/prerelease');
 const BUILD_GRADLE_PATH = process.env.NODE_ENV === 'test'
     ? path.resolve(__dirname, '../../android/app/build.gradle')
     : './android/app/build.gradle';
-const PLIST_PATH = './ios/ExpensifyCash/Info.plist';
-const PLIST_PATH_TEST = './ios/ExpensifyCashTests/Info.plist';
+const PLIST_PATH = './ios/NewExpensify/Info.plist';
+const PLIST_PATH_TEST = './ios/NewExpensifyTests/Info.plist';
 
 exports.BUILD_GRADLE_PATH = BUILD_GRADLE_PATH;
 exports.PLIST_PATH = PLIST_PATH;

diff --git a/.github/workflows/createNewVersion.yml b/.github/workflows/createNewVersion.yml
@@ -50,8 +50,8 @@ jobs:
             ./package.json \
             ./package-lock.json \
             ./android/app/build.gradle \
-            ./ios/ExpensifyCash/Info.plist \
-            ./ios/ExpensifyCashTests/Info.plist
+            ./ios/NewExpensify/Info.plist \
+            ./ios/NewExpensifyTests/Info.plist
           git commit -m "Update version to ${{ steps.bumpVersion.outputs.NEW_VERSION }}"
           git push origin ${{ env.VERSION_BRANCH }}
 

diff --git a/.github/workflows/updateProtectedBranch.yml b/.github/workflows/updateProtectedBranch.yml
@@ -97,7 +97,7 @@ jobs:
           pr-number: ${{ steps.createPullRequest.outputs.pr_number }}
 
       - name: Validate changed files
-        if: ${{ github.event.inputs.TARGET_BRANCH == 'main' && (steps.changedFiles.outputs.files_updated != 'android/app/build.gradle ios/ExpensifyCash/Info.plist ios/ExpensifyCashTests/Info.plist package-lock.json package.json' || steps.changedFiles.outputs.files_created != '' || steps.changedFiles.outputs.files_deleted != '') }}
+        if: ${{ github.event.inputs.TARGET_BRANCH == 'main' && (steps.changedFiles.outputs.files_updated != 'android/app/build.gradle ios/NewExpensify/Info.plist ios/NewExpensifyTests/Info.plist package-lock.json package.json' || steps.changedFiles.outputs.files_created != '' || steps.changedFiles.outputs.files_deleted != '') }}
         run: exit 1
 
       - name: Check for an auto approve

diff --git a/android/app/src/main/java/com/expensify/chat/MainActivity.java b/android/app/src/main/java/com/expensify/chat/MainActivity.java
@@ -12,7 +12,7 @@ public class MainActivity extends ReactActivity {
    */
   @Override
   protected String getMainComponentName() {
-    return "ExpensifyCash";
+    return "NewExpensify";
   }
 
   @Override

diff --git a/android/settings.gradle b/android/settings.gradle
@@ -1,4 +1,4 @@
-rootProject.name = 'ExpensifyCash'
+rootProject.name = 'NewExpensify'
 apply from: '../node_modules/react-native-unimodules/gradle.groovy'; includeUnimodulesProjects()
 include ':react-native-config'
 project(':react-native-config').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-config/android')

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
@@ -75,8 +75,8 @@ platform :ios do
     ENV["ENVFILE"]=".env.production"
 
     build_app(
-        workspace: "./ios/ExpensifyCash.xcworkspace",
-        scheme: "ExpensifyCash"
+        workspace: "./ios/NewExpensify.xcworkspace",
+        scheme: "NewExpensify"
     )
   end
 
@@ -107,8 +107,8 @@ platform :ios do
     )
 
     build_app(
-        workspace: "./ios/ExpensifyCash.xcworkspace",
-        scheme: "ExpensifyCash"
+        workspace: "./ios/NewExpensify.xcworkspace",
+        scheme: "NewExpensify"
     )
 
     upload_to_testflight(

diff --git a/ios/BridgingFile.swift b/ios/BridgingFile.swift
@@ -1,8 +1,8 @@
 //
 //  BridgingFile.swift
-//  ExpensifyCash
+//  NewExpensify
 //
 // Needed because iOS implementation is written in Swift.
 //
 
-import Foundation
+import Foundation
diff --git a/ios/EnvironmentChecker.h b/ios/EnvironmentChecker.h
@@ -1,6 +1,6 @@
 //
 //  EnvironmentChecker.h
-//  ExpensifyCash
+//  NewExpensify
 //
 
 #ifndef EnvironmentChecker_h

diff --git a/ios/EnvironmentChecker.m b/ios/EnvironmentChecker.m
@@ -1,6 +1,6 @@
 //
 //  EnvironmentChecker.m
-//  ExpensifyCash
+//  NewExpensify
 //
 // Source:
 // https://github.com/react-native-device-info/react-native-device-info/issues/228#issuecomment-420703355