Update iOS runner for RN61+ support

ern-orchestrator/src/buildIosRunner.ts

@@ -1,11 +1,20 @@
 import { log } from 'ern-core'
 import { spawn } from 'child_process'
+import fs from 'fs-extra'
+import path from 'path'
 
 export async function buildIosRunner(pathToIosRunner: string, udid: string) {
   return new Promise((resolve, reject) => {
+    const extraBuildOptions = fs.existsSync(
+      path.join(pathToIosRunner, 'ErnRunner.xcworkspace')
+    )
+      ? [`-workspace`, `ErnRunner.xcworkspace`]
+      : []
+
     const xcodebuildProc = spawn(
       'xcodebuild',
       [
+        ...extraBuildOptions,
         `-scheme`,
         'ErnRunner',
         'build',

ern-runner-gen-ios/src/IosRunnerGenerator.ts

@@ -21,16 +21,26 @@ export default class IosRunerGenerator implements RunnerGenerator {
     const mustacheView = this.createMustacheView({ config })
 
     shell.cp('-R', path.join(runnerHullPath, '*'), config.outDir)
+
     const filesToMustache = [
-      path.join(config.outDir, 'ErnRunner/RunnerConfig.m'),
-      path.join(config.outDir, 'ErnRunner.xcodeproj/project.pbxproj'),
+      'ErnRunner/RunnerConfig.m',
+      'ErnRunner.xcodeproj/project.pbxproj',
     ]
 
+    if ((mustacheView as any).RN_VERSION_LT_61) {
+      // Delete ErnRunner.xcworkspace directory as it is only needed for RN61+
+      shell.rm('-rf', path.join(config.outDir, 'ErnRunner.xcworkspace'))
+    } else {
+      // Otherwise keep it and include the xcworkspaceedata file for mustached
+      // processing as it contains some mustache templace placeholders
+      filesToMustache.push('ErnRunner.xcworkspace/contents.xcworkspacedata')
+    }
+
     for (const file of filesToMustache) {
       await mustacheUtils.mustacheRenderToOutputFileUsingTemplateFile(
-        file,
+        path.join(config.outDir, file),
         mustacheView,
-        file
+        path.join(config.outDir, file)
       )
     }
   }