[PLAT-11640] Fix React Native CLI for RN 0.73

packages/react-native-cli/src/lib/Gradle.ts

@@ -33,11 +33,12 @@ export async function getSuggestedBugsnagGradleVersion (projectRoot: string, log
     const versionMatchResult = fileContents.match(/classpath\(["']com.android.tools.build:gradle["']\)/)
     if (versionMatchResult) {
       return '7.+'
-    }
-    logger.warn(`Cannot determine an appropriate version of the Bugsnag Android Gradle plugin for use in this project.
+    } else {
+      logger.warn(`Cannot determine an appropriate version of the Bugsnag Android Gradle plugin for use in this project.
 
 Please see ${DOCS_LINK} for information on Gradle and the Android Gradle Plugin (AGP) compatibility`)
-    return ''
+      return ''
+    }
   }
 }
 

packages/react-native-cli/src/lib/Insert.ts

@@ -106,13 +106,26 @@ export async function insertAndroid (projectRoot: string, logger: Logger): Promi
   let mainApplicationPath
   try {
     const javaDir = path.join(projectRoot, 'android', 'app', 'src', 'main', 'java')
-    const relativeMainApplicationPath = (await asyncGlob('**/*/MainApplication.java', {
+    const relativeMainApplicationPathJava = (await asyncGlob('**/*/MainApplication.java', {
       cwd: javaDir
     }))[0]
-    if (!relativeMainApplicationPath) return logger.warn(FAIL_MSG('MainApplication.java'))
+
+    const relativeMainApplicationPathKotlin = (await asyncGlob('**/*/MainApplication.kt', {
+      cwd: javaDir
+    }))[0]
+
+    const relativeMainApplicationPathOther = (await asyncGlob('**/*/MainApplication', {
+      cwd: javaDir
+    }))[0]
+
+    const relativeMainApplicationPath = relativeMainApplicationPathJava || relativeMainApplicationPathKotlin || relativeMainApplicationPathOther
+
+    if (!relativeMainApplicationPath) {
+      return logger.warn(FAIL_MSG('MainApplication.java, MainApplication.kt or MainApplication'))
+    }
     mainApplicationPath = path.join(javaDir, relativeMainApplicationPath)
   } catch (e) {
-    logger.warn(FAIL_MSG('MainApplication.java'))
+    logger.warn(FAIL_MSG('MainApplication.java, MainApplication.kt or MainApplication'))
     return
   }
 
@@ -127,13 +140,13 @@ export async function insertAndroid (projectRoot: string, logger: Logger): Promi
     const mainApplicationWithImport = mainApplication.replace('import', `${BUGSNAG_JAVA_IMPORT}\nimport`)
     const onCreateRes = JAVA_APP_ON_CREATE_REGEX.exec(mainApplicationWithImport)
     if (!onCreateRes) {
-      logger.warn(FAIL_MSG('MainApplication.java'))
+      logger.warn(FAIL_MSG('MainApplication.java, MainApplication.kt or MainApplication'))
       return
     }
 
     await fs.writeFile(mainApplicationPath, mainApplicationWithImport.replace(onCreateRes[1], `${onCreateRes[1]}${BUGSNAG_JAVA_INIT}${onCreateRes[2]}`), 'utf8')
     logger.success('Done')
   } catch (e) {
-    logger.error(FAIL_MSG('MainApplication.java'))
+    logger.error(FAIL_MSG('MainApplication.java, MainApplication.kt or MainApplication'))
   }
 }

packages/react-native-cli/src/lib/__test__/Insert.test.ts

@@ -265,7 +265,7 @@ test('insertAndroid(): failure to locate file', async () => {
   )
   expect(writeFileMock).not.toHaveBeenCalled()
 
-  expect(logger.error).toHaveBeenCalledWith(expect.stringContaining('Failed to update "MainApplication.java" automatically.'))
+  expect(logger.error).toHaveBeenCalledWith(expect.stringContaining('Failed to update "MainApplication.java, MainApplication.kt or MainApplication" automatically.'))
 })
 
 test('insertAndroid(): failure to locate package directory', async () => {
@@ -279,7 +279,7 @@ test('insertAndroid(): failure to locate package directory', async () => {
   expect(readFileMock).not.toHaveBeenCalled()
   expect(writeFileMock).not.toHaveBeenCalled()
 
-  expect(logger.warn).toHaveBeenCalledWith(expect.stringContaining('Failed to update "MainApplication.java" automatically.'))
+  expect(logger.warn).toHaveBeenCalledWith(expect.stringContaining('Failed to update "MainApplication.java, MainApplication.kt or MainApplication" automatically.'))
 })
 
 test('insertAndroid(): project directory error', async () => {
@@ -293,7 +293,7 @@ test('insertAndroid(): project directory error', async () => {
   expect(readFileMock).not.toHaveBeenCalled()
   expect(writeFileMock).not.toHaveBeenCalled()
 
-  expect(logger.warn).toHaveBeenCalledWith(expect.stringContaining('Failed to update "MainApplication.java" automatically.'))
+  expect(logger.warn).toHaveBeenCalledWith(expect.stringContaining('Failed to update "MainApplication.java, MainApplication.kt or MainApplication" automatically.'))
 })
 
 test('insertAndroid(): no identifiable onCreate method', async () => {
@@ -311,5 +311,5 @@ test('insertAndroid(): no identifiable onCreate method', async () => {
   )
   expect(writeFileMock).not.toHaveBeenCalled()
 
-  expect(logger.warn).toHaveBeenCalledWith(expect.stringContaining('Failed to update "MainApplication.java" automatically.'))
+  expect(logger.warn).toHaveBeenCalledWith(expect.stringContaining('Failed to update "MainApplication.java, MainApplication.kt or MainApplication" automatically.'))
 })