fix(Expo): use correct string to identify MainApplication.kt in SDK 55 (#100)

* fix(Expo): use correct string to identify MainApplication.kt in SDK 55

* fix(CLI): loosen regex for identifying MainApplication.kt in RN 0.82 during init command

Author: floydkim

cli/commands/initCommand/initAndroid.ts

@@ -44,7 +44,7 @@ export function modifyMainApplicationKt(mainApplicationContent: string) {
 }
 
 function addJsBundleFilePathArgument(mainApplicationContent: string) {
-    const packageListArgumentPattern = /(packageList\s*=\s*\n\s*PackageList\(this\)[\s\S]+?\},\s*\n)/;
+    const packageListArgumentPattern = /(packageList\s*=\s*\n\s*PackageList\(this\)[\s\S]+?\},?\s*\n)/;
 
     if (!packageListArgumentPattern.test(mainApplicationContent)) {
         console.log('log: Could not find packageList argument while updating MainApplication.kt.');

expo/plugin/withCodePushAndroid.js

@@ -1,7 +1,7 @@
 const { withMainApplication, WarningAggregator } = require('expo/config-plugins');
 
 const IMPORT_CODE_PUSH = 'import com.microsoft.codepush.react.CodePush';
-const RN_082_MARKER = '  getDefaultReactHost(';
+const RN_082_MARKER = 'ExpoReactHostFactory.getDefaultReactHost(';
 const JS_BUNDLE_FILE_PATH_ARGUMENT = 'jsBundleFilePath = CodePush.getJSBundleFile()';
 
 function androidMainApplicationApplyImplementation(mainApplication, find, add, reverse = false) {
@@ -32,7 +32,7 @@ function addJsBundleFilePathArgument(mainApplication) {
     return mainApplication;
   }
 
-  const packageListArgumentPattern = /(packageList\s*=\s*\n\s*PackageList\(this\)[\s\S]+?\},\s*\n)/;
+  const packageListArgumentPattern = /(packageList\s*=\s*\n\s*PackageList\(this\)[\s\S]+?\},?\s*\n)/;
 
   if (!packageListArgumentPattern.test(mainApplication)) {
     WarningAggregator.addWarningAndroid(